Explorar o código

BugFix: use new Config API in user.js

Yuki Takei %!s(int64=6) %!d(string=hai) anos
pai
achega
9ce34f868e
Modificáronse 1 ficheiros con 12 adicións e 11 borrados
  1. 12 11
      src/server/models/user.js

+ 12 - 11
src/server/models/user.js

@@ -79,16 +79,16 @@ module.exports = function(crowi) {
     validateCrowi();
 
     const Config = crowi.model('Config');
+    const configManager = crowi.configManager;
 
-
-    const config = crowi.getConfig();
-
-    if (!config.crowi) {
+    const isInstalled = configManager.getConfig('crowi', 'app:installed');
+    if (!isInstalled) {
       return STATUS_ACTIVE; // is this ok?
     }
 
     // status decided depends on registrationMode
-    switch (config.crowi['security:registrationMode']) {
+    const registrationMode = configManager.getConfig('crowi', 'security:registrationMode');
+    switch (registrationMode) {
       case Config.SECURITY_REGISTRATION_MODE_OPEN:
         return STATUS_ACTIVE;
       case Config.SECURITY_REGISTRATION_MODE_RESTRICTED:
@@ -620,10 +620,11 @@ module.exports = function(crowi) {
   userSchema.statics.createUsersByInvitation = function(emailList, toSendEmail, callback) {
     validateCrowi();
 
+    const Config = crowi.model('Config');
+    const configManager = crowi.configManager;
+
     const User = this;
     const createdUserList = [];
-    const Config = crowi.model('Config');
-    const config = crowi.getConfig();
 
     const mailer = crowi.getMailer();
     if (!Array.isArray(emailList)) {
@@ -665,7 +666,7 @@ module.exports = function(crowi) {
           newUser.createdAt = Date.now();
           newUser.status = STATUS_INVITED;
 
-          const globalLang = Config.globalLang(config);
+          const globalLang = configManager.getConfig('crowi', 'globalLang');
           if (globalLang != null) {
             newUser.lang = globalLang;
           }
@@ -759,9 +760,9 @@ module.exports = function(crowi) {
       newUser.setPassword(password);
     }
 
-    const Config = crowi.model('Config');
-    const config = crowi.getConfig();
-    const globalLang = Config.globalLang(config);
+    const configManager = crowi.configManager;
+
+    const globalLang = configManager.getConfig('crowi', 'globalLang');
     if (globalLang != null) {
       newUser.lang = globalLang;
     }