itizawa 6 lat temu
rodzic
commit
b8e0005d39
1 zmienionych plików z 8 dodań i 0 usunięć
  1. 8 0
      src/server/routes/apiv3/security-setting.js

+ 8 - 0
src/server/routes/apiv3/security-setting.js

@@ -227,13 +227,21 @@ module.exports = (crowi) => {
       },
       },
       samlAuth: {
       samlAuth: {
         samlDbEntryPoint: await crowi.configManager.getConfig('crowi', 'security:passport-saml:entryPoint'),
         samlDbEntryPoint: await crowi.configManager.getConfig('crowi', 'security:passport-saml:entryPoint'),
+        samlEnvVarEntryPoint: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:entryPoint'),
         samlDbIssuer: await crowi.configManager.getConfig('crowi', 'security:passport-saml:issuer'),
         samlDbIssuer: await crowi.configManager.getConfig('crowi', 'security:passport-saml:issuer'),
+        samlEnvVarIssuer: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:issuer'),
         samlDbCert: await crowi.configManager.getConfig('crowi', 'security:passport-saml:cert'),
         samlDbCert: await crowi.configManager.getConfig('crowi', 'security:passport-saml:cert'),
+        samlEnvVarCert: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:cert'),
         samlDbAttrMapId: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapId'),
         samlDbAttrMapId: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapId'),
+        samlEnvVarAttrMapId: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapId'),
         samlDbAttrMapUserName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapUsername'),
         samlDbAttrMapUserName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapUsername'),
+        samlEnvVarAttrMapUserName: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapUsername'),
         samlDbAttrMapMail: await crowi.configManager.getConfig('crowi', 'security:passport-saml:entryPoint'),
         samlDbAttrMapMail: await crowi.configManager.getConfig('crowi', 'security:passport-saml:entryPoint'),
+        samlEnvVarAttrMapMail: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:entryPoint'),
         samlDbAttrMapFirstName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapFirstName'),
         samlDbAttrMapFirstName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapFirstName'),
+        samlEnvVarAttrMapFirstName: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapFirstName'),
         samlDbAttrMapLastName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapLastName'),
         samlDbAttrMapLastName: await crowi.configManager.getConfig('crowi', 'security:passport-saml:attrMapLastName'),
+        samlEnvVarAttrMapLastName: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:passport-saml:attrMapLastName'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isSameUsernameTreatedAsIdenticalUser'),
         isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isSameUsernameTreatedAsIdenticalUser'),
         isSameEmailTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isSameEmailTreatedAsIdenticalUser'),
         isSameEmailTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-saml:isSameEmailTreatedAsIdenticalUser'),
       },
       },