Merge pull request #545 from curveball/return-refresh-token

Return refresh token from access-token endpoint.
curveball · Oct 28, 2024 · aae9fd5 · aae9fd5
2 parents a31c935 + d827e06
commit aae9fd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.26.4 (????-??-??)
+-------------------
+
+* New: access-token endpoint now returns refresh token.
+
+
 0.26.3 (2024-10-28)
 -------------------
 

diff --git a/src/oauth2/controller/user-access-token.ts b/src/oauth2/controller/user-access-token.ts
@@ -6,6 +6,7 @@ import log from '../../log/service.js';
 import { EventType } from '../../log/types.js';
 import { PrincipalService } from '../../principal/service.js';
 import * as oauth2Service from '../service.js';
+import { tokenResponse } from '../formats/json.js';
 
 class UserAccessTokenController extends Controller {
 
@@ -22,11 +23,7 @@ class UserAccessTokenController extends Controller {
       principal: user,
     });
 
-    ctx.response.body = {
-      access_token: token.accessToken,
-      token_type: token.tokenType,
-      expires_in: token.accessTokenExpires - Math.round(Date.now() / 1000),
-    };
+    ctx.response.body = tokenResponse(token);
     log(EventType.generateAccessToken, ctx.ip()!, user.id, ctx.request.headers.get('User-Agent'));
 
   }