From 29480105c5214016b9673b52973f6c5c9c7407ac Mon Sep 17 00:00:00 2001
From: Erki Aas <eaas@k-space.ee>
Date: Mon, 25 Mar 2024 15:10:26 +0200
Subject: [PATCH] fix(oidc): get all oidc parameters from env

---
 config/prod.js                            | 8 ++++++++
 src/services/auth-oidc/auth-oidc.class.ts | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/prod.js b/config/prod.js
index 480bd4d..b525df9 100644
--- a/config/prod.js
+++ b/config/prod.js
@@ -3,9 +3,17 @@ module.exports = {
     sessionSecret: process.env.SESSION_SECRET,
     oidc: {
         gatewayUri: process.env.OIDC_GATEWAY_URI,
+        gatewayAuthUri: process.env.OIDC_GATEWAY_AUTH_URI,
+        gatewayTokenUri: process.env.OIDC_GATEWAY_TOKEN_URI,
+        gatewayUserinfoUri: process.env.OIDC_GATEWAY_USERINFO_URI,
         clientId: process.env.OIDC_CLIENT_ID,
         clientSecret: process.env.OIDC_CLIENT_SECRET,
         redirectUris: process.env.OIDC_REDIRECT_URIS,
+        scopes: process.env.OIDC_AVAILABLE_SCOPES,
+        grantTypes: process.env.OIDC_GRANT_TYPES,
+        signedResponseAlg: process.env.OIDC_ID_TOKEN_SIGNED_RESPONSE_ALG,
+        responseTypes: process.env.OIDC_RESPONSE_TYPES,
+        authMethod: process.env.OIDC_TOKEN_ENDPOINT_AUTH_METHOD,
     },
     wildDuck: {
         url: process.env.WILDDUCK_URL,
diff --git a/src/services/auth-oidc/auth-oidc.class.ts b/src/services/auth-oidc/auth-oidc.class.ts
index c0cc4d3..f7bcc90 100644
--- a/src/services/auth-oidc/auth-oidc.class.ts
+++ b/src/services/auth-oidc/auth-oidc.class.ts
@@ -29,17 +29,17 @@ export class AuthOidcService<ServiceParams extends AuthOidcParams = AuthOidcPara
             client_id: config.get('oidc.clientId'),
             client_secret: config.get('oidc.clientSecret'),
             redirect_uris: [config.get('oidc.redirectUris')],
-            response_types: ['code'],
+            response_types: [config.get('oidc.responseTypes')],
         });
         const codeVerifier = generators.codeVerifier();
         const codeChallenge = generators.codeChallenge(codeVerifier);
 
         const url = client.authorizationUrl({
             redirect_uri: config.get('clientUrl') + '/auth-oidc/callback',
-            scope: 'openid profile offline_access',
-            response_type: 'code',
+            scope: config.get('oidc.scopes'),
+            response_type: config.get('oidc.responseTypes'),
             code_challenge: codeChallenge,
-            code_challenge_method: 'S256',
+            code_challenge_method: config.get('oidc.signedResponseAlg'),
         });
 
         params.session.codeVerifier = codeVerifier;