فهرست منبع

add missed keys and definitions

Yuki Takei 1 سال پیش
والد
کامیت
7c19f7b2b5

+ 2 - 2
apps/app/src/features/external-user-group/server/routes/apiv3/external-user-group.ts

@@ -362,12 +362,12 @@ module.exports = (crowi: Crowi): Router => {
       const isOidcEnabled = configManager.getConfig('crowi', 'security:passport-oidc:isEnabled');
       const oidcIssuerHost = configManager.getConfig('crowi', 'security:passport-oidc:issuerHost');
 
-      if (isOidcEnabled && regex.test(oidcIssuerHost)) return 'oidc';
+      if (isOidcEnabled && oidcIssuerHost != null && regex.test(oidcIssuerHost)) return 'oidc';
 
       const isSamlEnabled = configManager.getConfig('crowi', 'security:passport-saml:isEnabled');
       const samlEntryPoint = configManager.getConfig('crowi', 'security:passport-saml:entryPoint');
 
-      if (isSamlEnabled && regex.test(samlEntryPoint)) return 'saml';
+      if (isSamlEnabled && samlEntryPoint != null && regex.test(samlEntryPoint)) return 'saml';
 
       return null;
     };

+ 4 - 0
apps/app/src/server/service/config-manager/config-definition.ts

@@ -132,6 +132,7 @@ export const CONFIG_KEYS = [
   'security:passport-github:clientSecret',
   'security:passport-github:isSameUsernameTreatedAsIdenticalUser',
   'security:passport-oidc:isEnabled',
+  'security:passport-oidc:issuerHost',
 
   // File Upload Settings
   'fileUpload:local:useInternalRedirect',
@@ -691,6 +692,9 @@ export const CONFIG_DEFINITIONS = {
   'security:passport-oidc:isEnabled': defineConfig<boolean>({
     defaultValue: false,
   }),
+  'security:passport-oidc:issuerHost': defineConfig<string | undefined>({
+    defaultValue: undefined,
+  }),
 
   // File Upload Settings
   'fileUpload:local:useInternalRedirect': defineConfig<boolean>({