From e0473b52e9bcbffec466c3fa8bf5be4d36be5d14 Mon Sep 17 00:00:00 2001 From: benjdlambert Date: Thu, 3 Jul 2025 11:28:11 +0200 Subject: [PATCH] chore: little cleanup Signed-off-by: benjdlambert Signed-off-by: benjdlambert --- plugins/auth-backend/src/database/OidcDatabase.ts | 13 +------------ plugins/auth-backend/src/service/OidcRouter.ts | 8 +++++++- plugins/auth-backend/src/service/OidcService.ts | 8 ++++---- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/plugins/auth-backend/src/database/OidcDatabase.ts b/plugins/auth-backend/src/database/OidcDatabase.ts index 2eeacb7ffe..12554fba57 100644 --- a/plugins/auth-backend/src/database/OidcDatabase.ts +++ b/plugins/auth-backend/src/database/OidcDatabase.ts @@ -106,18 +106,7 @@ export class OidcDatabase { async createClient(client: Omit) { const now = DateTime.now().toString(); - console.log({ - client_id: client.clientId, - client_secret: client.clientSecret, - client_name: client.clientName, - created_at: now, - expires_at: client.expiresAt, - response_types: JSON.stringify(client.responseTypes), - grant_types: JSON.stringify(client.grantTypes), - redirect_uris: JSON.stringify(client.redirectUris), - scope: client.scope, - metadata: JSON.stringify(client.metadata), - }); + await this.db('oidc_clients').insert({ client_id: client.clientId, client_secret: client.clientSecret, diff --git a/plugins/auth-backend/src/service/OidcRouter.ts b/plugins/auth-backend/src/service/OidcRouter.ts index 9706554ba5..0e14b91d79 100644 --- a/plugins/auth-backend/src/service/OidcRouter.ts +++ b/plugins/auth-backend/src/service/OidcRouter.ts @@ -144,7 +144,13 @@ export class OidcRouter { grantType, }); - return res.json(result); + return res.json({ + access_token: result.accessToken, + token_type: result.tokenType, + expires_in: result.expiresIn, + id_token: result.idToken, + scope: result.scope, + }); } catch (error) { const description = isError(error) ? error.message : 'Unknown error'; this.logger.error( diff --git a/plugins/auth-backend/src/service/OidcService.ts b/plugins/auth-backend/src/service/OidcService.ts index 104c2290ae..cc60b2b432 100644 --- a/plugins/auth-backend/src/service/OidcService.ts +++ b/plugins/auth-backend/src/service/OidcService.ts @@ -284,10 +284,10 @@ export class OidcService { }); return { - access_token: token, - token_type: 'Bearer', - expires_in: 3600, - id_token: token, + accessToken: token, + tokenType: 'Bearer', + expiresIn: 3600, + idToken: token, scope: authCode.scope || 'openid', }; }