abolish appTitle

src/server/models/config.js

@@ -302,11 +302,6 @@ module.exports = function(crowi) {
   //     });
   // };
 
-  configSchema.statics.appTitle = function() {
-    const key = 'app:title';
-    return getValueForCrowiNS(null, key) || 'GROWI';
-  };
-
   configSchema.statics.globalLang = function(config) {
     const key = 'app:globalLang';
     return getValueForCrowiNS(config, key);
@@ -470,12 +465,11 @@ module.exports = function(crowi) {
   };
 
   configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
-    const Config = this;
     const env = process.env;
 
     const localConfig = {
       crowi: {
-        title: Config.appTitle(crowi),
+        title: crowi.appService.getAppTitle(),
         url: crowi.appService.getSiteUrl(),
       },
       upload: {

src/server/service/app.js

@@ -39,13 +39,13 @@ class AppService {
    * Execute only once for installing application
    */
   async initDB(globalLang) {
-    const initialConfig = this.configModel.getConfigsObjectForInstalling();
+    const initialConfig = this.configManager.configModel.getConfigsObjectForInstalling();
     initialConfig['app:globalLang'] = globalLang;
-    await this.updateConfigsInTheSameNamespace('crowi', initialConfig);
+    await this.configManager.updateConfigsInTheSameNamespace('crowi', initialConfig);
   }
 
   async isDBInitialized() {
-    const appInstalled = await this.getConfigFromDB('crowi', 'app:installed');
+    const appInstalled = await this.configManager.getConfigFromDB('crowi', 'app:installed');
     return appInstalled;
   }
 

src/server/service/global-notification.js

@@ -7,12 +7,10 @@ class GlobalNotificationService {
 
   constructor(crowi) {
     this.crowi = crowi;
-    this.config = crowi.getConfig();
     this.mailer = crowi.getMailer();
     this.GlobalNotification = crowi.model('GlobalNotificationSetting');
     this.User = crowi.model('User');
-    this.Config = crowi.model('Config');
-    this.appTitle = this.Config.appTitle(this.config);
+    this.appTitle = crowi.appService.getAppTitle();
   }
 
   notifyByMail(notification, mailOption) {

src/server/util/mailer.js

@@ -7,8 +7,7 @@ module.exports = function(crowi) {
   const nodemailer = require('nodemailer');
   const swig = require('swig-templates');
 
-  const Config = crowi.model('Config');
-  const configManager = crowi.configManager;
+  const { configManager, appService } = crowi;
 
   const mailConfig = {};
   let mailer = {};
@@ -74,7 +73,7 @@ module.exports = function(crowi) {
     }
 
     mailConfig.from = configManager.getConfig('crowi', 'mail:from');
-    mailConfig.subject = `${Config.appTitle()}からのメール`;
+    mailConfig.subject = `${appService.getAppTitle()}からのメール`;
 
     debug('mailer initialized');
   }

src/server/util/swigFunctions.js

@@ -4,7 +4,12 @@ module.exports = function(crowi, app, req, locals) {
   const Page = crowi.model('Page');
   const Config = crowi.model('Config');
   const User = crowi.model('User');
-  const { passportService, cdnResourcesService, configManager } = crowi;
+  const {
+    configManager,
+    cdnResourcesService,
+    passportService,
+    appService,
+  } = crowi;
   debug('initializing swigFunctions');
 
   locals.nodeVersion = function() {
@@ -55,12 +60,9 @@ module.exports = function(crowi, app, req, locals) {
   locals.getConfigFromEnvVars = configManager.getConfigFromEnvVars.bind(configManager);
 
   /**
-   * return app title
+   * pass service class to swig
    */
-  locals.appTitle = function() {
-    const config = crowi.getConfig();
-    return crowi.xss.process(Config.appTitle(config));
-  };
+  locals.appService = appService;
 
   /**
    * return app-global language

src/server/views/installer.html

@@ -10,7 +10,7 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
-  <meta name="apple-mobile-web-app-title" content="{{ appTitle() }}">
+  <meta name="apple-mobile-web-app-title" content="{{ appService.appTitle() }}">
 
   {% include './widget/headers/favicon.html' %}
   {% include './widget/headers/ie11-polyfills.html' %}

src/server/views/layout/layout.html

@@ -10,7 +10,7 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
-  <meta name="apple-mobile-web-app-title" content="{{ appTitle() }}">
+  <meta name="apple-mobile-web-app-title" content="{{ appService.appTitle() }}">
 
   {{ customHeader() }}
 
@@ -87,7 +87,7 @@
             <div class="logo-mark">{% include '../widget/logo.html' %}</div>
           </b>
           <span class="hidden-xs" style="color: black">
-            {% set appTitle = appTitle() %}
+            {% set appTitle = appService.appTitle() %}
             {% set appTitleFontSize = getAppTitleFontSize(appTitle) %}
             <span class="logo-text">
               <svg xmlns="http://www.w3.org/2000/svg">

src/server/views/login.html

@@ -27,7 +27,7 @@
   <div class="row">
     <div class="login-header col-sm-offset-4 col-sm-4">
       <div class="logo">{% include 'widget/logo.html' %}</div>
-      <h1>{{ appTitle() }}</h1>
+      <h1>{{ appService.appTitle() }}</h1>
 
       <div class="login-form-errors">
         {% if isLdapSetupFailed() %}