Merge pull request #773 from weseek/fix/fix-bugs-in-722

Fix/fix bugs in 722

src/server/routes/admin.js

@@ -1082,7 +1082,7 @@ module.exports = function(crowi, app) {
     // reset strategy
     await crowi.passportService.resetSamlStrategy();
     // setup strategy
-    if (crowi.configManager.getConfig('security:passport-saml:isEnabled')) {
+    if (crowi.configManager.getConfig('crowi', 'security:passport-saml:isEnabled')) {
       try {
         await crowi.passportService.setupSamlStrategy(true);
       }

src/server/routes/login-passport.js

@@ -427,8 +427,9 @@ module.exports = function(crowi, app) {
 
   const getOrCreateUser = async(req, res, userInfo, providerId) => {
     // get option
-    const isSameUsernameTreatedAsIdenticalUser = crowi.passportService.isSameUsernameTreatedAsIdenticalUser(config, providerId);
-    const isSameEmailTreatedAsIdenticalUser = crowi.passportService.isSameEmailTreatedAsIdenticalUser(config, providerId);
+    const isSameUsernameTreatedAsIdenticalUser = crowi.passportService.isSameUsernameTreatedAsIdenticalUser(providerId);
+    const isSameEmailTreatedAsIdenticalUser = crowi.passportService.isSameEmailTreatedAsIdenticalUser(providerId);
+
     try {
       // find or register(create) user
       const externalAccount = await ExternalAccount.findOrRegister(

src/server/service/passport.js

@@ -440,7 +440,8 @@ class PassportService {
     }
 
     const config = this.crowi.config;
-    const isSamlEnabled = this.crowi.getConfig('crowi', 'security:passport-saml:isEnabled');
+    const configManager = this.crowi.configManager;
+    const isSamlEnabled = configManager.getConfig('crowi', 'security:passport-saml:isEnabled');
 
     // when disabled
     if (!isSamlEnabled) {
@@ -449,13 +450,13 @@ class PassportService {
 
     debug('SamlStrategy: setting up..');
     passport.use(new SamlStrategy({
-      entryPoint: this.crowi.getConfig('crowi', 'security:passport-saml:entryPoint'),
+      entryPoint: configManager.getConfig('crowi', 'security:passport-saml:entryPoint'),
       callbackUrl:
         (config.crowi['app:siteUrl'] != null)
           ? `${config.crowi['app:siteUrl']}/passport/saml/callback`                 // auto-generated with v3.2.4 and above
-          : this.crowi.getConfig('crowi', 'security:passport-saml:callbackUrl'),    // DEPRECATED: backward compatible with v3.2.3 and below
-      issuer: this.crowi.getConfig('crowi', 'security:passport-saml:issuer'),
-      cert: this.crowi.getConfig('crowi', 'security:passport-saml:cert'),
+          : configManager.getConfig('crowi', 'security:passport-saml:callbackUrl'),    // DEPRECATED: backward compatible with v3.2.3 and below
+      issuer: configManager.getConfig('crowi', 'security:passport-saml:issuer'),
+      cert: configManager.getConfig('crowi', 'security:passport-saml:cert'),
     }, function(profile, done) {
       if (profile) {
         return done(null, profile);