|
@@ -70,6 +70,12 @@ module.exports = function(crowi, app, req, locals) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
locals.googleLoginEnabled = function() {
|
|
locals.googleLoginEnabled = function() {
|
|
|
|
|
+ // return false if Passport is enabled
|
|
|
|
|
+ // because official crowi mechanism is not used.
|
|
|
|
|
+ if (locals.isEnabledPassport()) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
var config = crowi.getConfig()
|
|
var config = crowi.getConfig()
|
|
|
return config.crowi['google:clientId'] && config.crowi['google:clientSecret'];
|
|
return config.crowi['google:clientId'] && config.crowi['google:clientSecret'];
|
|
|
};
|
|
};
|