appService

src/server/crowi/express-init.js

@@ -69,7 +69,7 @@ module.exports = function(crowi, app) {
     req.csrfToken = null;
 
     res.locals.req = req;
-    res.locals.baseUrl = crowi.siteUrlService.getSiteUrl();
+    res.locals.baseUrl = crowi.appService.getSiteUrl();
     // res.locals.config = config;
     res.locals.env = env;
     res.locals.now = now;

src/server/crowi/index.js

@@ -41,7 +41,7 @@ function Crowi(rootdir) {
   this.slackNotificationService = null;
   this.xssService = null;
   this.aclService = null;
-  this.siteUrlService = null;
+  this.appService = null;
   this.restQiitaAPIService = null;
   this.cdnResourcesService = new CdnResourcesService();
   this.interceptorManager = new InterceptorManager();
@@ -90,7 +90,7 @@ Crowi.prototype.init = async function() {
     this.setUpSlacklNotification(),
     this.setUpXss(),
     this.setUpAcl(),
-    this.setUpSiteUrl(),
+    this.setUpApp(),
     this.setUpRestQiitaAPI(),
   ]);
 };
@@ -452,7 +452,7 @@ Crowi.prototype.setUpGlobalNotification = function() {
 Crowi.prototype.setUpSlacklNotification = function() {
   const SlackNotificationService = require('../service/slack-notification');
   if (this.slackNotificationService == null) {
-    this.slackNotificationService = new SlackNotificationService(this);
+    this.slackNotificationService = new SlackNotificationService(this.configManager);
   }
 };
 
@@ -462,7 +462,7 @@ Crowi.prototype.setUpSlacklNotification = function() {
 Crowi.prototype.setUpXss = function() {
   const XssService = require('../service/xss');
   if (this.xssService == null) {
-    this.xssService = new XssService(this);
+    this.xssService = new XssService(this.configManager);
   }
 };
 
@@ -472,17 +472,17 @@ Crowi.prototype.setUpXss = function() {
 Crowi.prototype.setUpAcl = function() {
   const AclService = require('../service/acl');
   if (this.aclService == null) {
-    this.aclService = new AclService(this);
+    this.aclService = new AclService(this.configManager);
   }
 };
 
 /**
- * setup SiteUrlService
+ * setup AppService
  */
-Crowi.prototype.setUpSiteUrl = function() {
-  const SiteUrlService = require('../service/site-url');
-  if (this.siteUrlService == null) {
-    this.siteUrlService = new SiteUrlService(this);
+Crowi.prototype.setUpApp = function() {
+  const AppService = require('../service/app');
+  if (this.appService == null) {
+    this.appService = new AppService(this.configManager);
   }
 };
 

src/server/models/config.js

@@ -610,7 +610,7 @@ module.exports = function(crowi) {
     const localConfig = {
       crowi: {
         title: Config.appTitle(crowi),
-        url: crowi.siteUrlService.getSiteUrl(),
+        url: crowi.appService.getSiteUrl(),
       },
       upload: {
         image: crowi.configManager.getIsUploadable(),

src/server/service/site-url.js → src/server/service/app.js

@@ -4,10 +4,10 @@ const { pathUtils } = require('growi-commons');
 /**
  * the service class of GlobalNotificationSetting
  */
-class SiteUrl {
+class AppService {
 
-  constructor(crowi) {
-    this.crowi = crowi;
+  constructor(configManager) {
+    this.configManager = configManager;
   }
 
   /**
@@ -21,7 +21,7 @@ class SiteUrl {
    */
   /* eslint-disable no-else-return */
   getSiteUrl() {
-    const siteUrl = this.crowi.configManager.getConfig('crowi', 'app:siteUrl');
+    const siteUrl = this.configManager.getConfig('crowi', 'app:siteUrl');
     if (siteUrl != null) {
       return pathUtils.removeTrailingSlash(siteUrl);
     }
@@ -33,4 +33,4 @@ class SiteUrl {
 
 }
 
-module.exports = SiteUrl;
+module.exports = AppService;