mizozobu 7 лет назад
Родитель
Сommit
df15f2acf1
3 измененных файлов с 13 добавлено и 4 удалено
  1. 6 1
      src/server/models/config.js
  2. 1 2
      src/server/service/passport.js
  3. 6 1
      src/server/util/swigFunctions.js

+ 6 - 1
src/server/models/config.js

@@ -282,6 +282,11 @@ module.exports = function(crowi) {
     return getValueForCrowiNS(config, key);
     return getValueForCrowiNS(config, key);
   };
   };
 
 
+  configSchema.statics.isEnabledPassportSaml = function(config) {
+    const key = 'security:passport-saml:isEnabled';
+    return getValueForCrowiNS(config, key);
+  };
+
   configSchema.statics.isEnabledPassportGoogle = function(config) {
   configSchema.statics.isEnabledPassportGoogle = function(config) {
     const key = 'security:passport-google:isEnabled';
     const key = 'security:passport-google:isEnabled';
     return getValueForCrowiNS(config, key);
     return getValueForCrowiNS(config, key);
@@ -292,7 +297,7 @@ module.exports = function(crowi) {
     return getValueForCrowiNS(config, key);
     return getValueForCrowiNS(config, key);
   };
   };
 
 
-   configSchema.statics.isEnabledPassportTwitter = function(config) {
+  configSchema.statics.isEnabledPassportTwitter = function(config) {
     const key = 'security:passport-twitter:isEnabled';
     const key = 'security:passport-twitter:isEnabled';
     return getValueForCrowiNS(config, key);
     return getValueForCrowiNS(config, key);
   };
   };

+ 1 - 2
src/server/service/passport.js

@@ -422,8 +422,7 @@ class PassportService {
 
 
     const config = this.crowi.config;
     const config = this.crowi.config;
     const Config = this.crowi.model('Config');
     const Config = this.crowi.model('Config');
-    // const isSamlEnabled = Config.isEnabledPassportSaml(config);
-    const isSamlEnabled = true;
+    const isSamlEnabled = Config.isEnabledPassportSaml(config);
 
 
     // when disabled
     // when disabled
     if (!isSamlEnabled) {
     if (!isSamlEnabled) {

+ 6 - 1
src/server/util/swigFunctions.js

@@ -81,6 +81,11 @@ module.exports = function(crowi, app, req, locals) {
     return Config.isEnabledPassport(config) && Config.isEnabledPassportLdap(config) && !passportService.isLdapStrategySetup;
     return Config.isEnabledPassport(config) && Config.isEnabledPassportLdap(config) && !passportService.isLdapStrategySetup;
   };
   };
 
 
+  locals.passportSamlLoginEnabled = function() {
+    let config = crowi.getConfig();
+    return locals.isEnabledPassport() && config.crowi['security:passport-saml:isEnabled'];
+  };
+
   locals.googleLoginEnabled = function() {
   locals.googleLoginEnabled = function() {
     // return false if Passport is enabled
     // return false if Passport is enabled
     // because official crowi mechanism is not used.
     // because official crowi mechanism is not used.
@@ -103,7 +108,7 @@ module.exports = function(crowi, app, req, locals) {
   };
   };
 
 
   locals.passportTwitterLoginEnabled = function() {
   locals.passportTwitterLoginEnabled = function() {
-    var config = crowi.getConfig();
+    let config = crowi.getConfig();
     return locals.isEnabledPassport() && config.crowi['security:passport-twitter:isEnabled'];
     return locals.isEnabledPassport() && config.crowi['security:passport-twitter:isEnabled'];
   };
   };