Przeglądaj źródła

simprify Crowi class by removing some getter function

Yuki Takei 2 miesięcy temu
rodzic
commit
bc61d89377

+ 18 - 15
apps/app/src/server/crowi/index.js

@@ -1,10 +1,10 @@
 import next from 'next';
 import next from 'next';
+import http from 'node:http';
+import path from 'node:path';
 import { createTerminus } from '@godaddy/terminus';
 import { createTerminus } from '@godaddy/terminus';
 import attachmentRoutes from '@growi/remark-attachment-refs/dist/server';
 import attachmentRoutes from '@growi/remark-attachment-refs/dist/server';
 import lsxRoutes from '@growi/remark-lsx/dist/server/index.cjs';
 import lsxRoutes from '@growi/remark-lsx/dist/server/index.cjs';
-import http from 'http';
 import mongoose from 'mongoose';
 import mongoose from 'mongoose';
-import path from 'path';
 
 
 import { KeycloakUserGroupSyncService } from '~/features/external-user-group/server/service/keycloak-user-group-sync';
 import { KeycloakUserGroupSyncService } from '~/features/external-user-group/server/service/keycloak-user-group-sync';
 import { LdapUserGroupSyncService } from '~/features/external-user-group/server/service/ldap-user-group-sync';
 import { LdapUserGroupSyncService } from '~/features/external-user-group/server/service/ldap-user-group-sync';
@@ -47,11 +47,7 @@ import { SocketIoService } from '../service/socket-io';
 import UserGroupService from '../service/user-group';
 import UserGroupService from '../service/user-group';
 import { UserNotificationService } from '../service/user-notification';
 import { UserNotificationService } from '../service/user-notification';
 import { initializeYjsService } from '../service/yjs';
 import { initializeYjsService } from '../service/yjs';
-import {
-  getModelSafely,
-  getMongoUri,
-  mongoOptions,
-} from '../util/mongoose-utils';
+import { getMongoUri, mongoOptions } from '../util/mongoose-utils';
 import { setupModelsDependentOnCrowi } from './setup-models';
 import { setupModelsDependentOnCrowi } from './setup-models';
 
 
 const logger = loggerFactory('growi:crowi');
 const logger = loggerFactory('growi:crowi');
@@ -117,6 +113,21 @@ class Crowi {
   /** @type UserNotificationService */
   /** @type UserNotificationService */
   userNotificationService;
   userNotificationService;
 
 
+  /** @type {UserGroupService} */
+  userGroupService;
+
+  /** @type {import('~/features/external-user-group/server/service/ldap-user-group-sync').LdapUserGroupSyncService} */
+  ldapUserGroupSyncService;
+
+  /** @type {import('~/features/external-user-group/server/service/keycloak-user-group-sync').KeycloakUserGroupSyncService} */
+  keycloakUserGroupSyncService;
+
+  /** @type {import('../service/global-notification').GlobalNotificationService} */
+  globalNotificationService;
+
+  /** @type {any} */
+  sessionConfig;
+
   constructor() {
   constructor() {
     this.version = getGrowiVersion();
     this.version = getGrowiVersion();
 
 
@@ -379,14 +390,6 @@ Crowi.prototype.getSlackLegacy = function () {
   return this.slackLegacy;
   return this.slackLegacy;
 };
 };
 
 
-Crowi.prototype.getGlobalNotificationService = function () {
-  return this.globalNotificationService;
-};
-
-Crowi.prototype.getUserNotificationService = function () {
-  return this.userNotificationService;
-};
-
 Crowi.prototype.setupPassport = async function () {
 Crowi.prototype.setupPassport = async function () {
   logger.debug('Passport is enabled');
   logger.debug('Passport is enabled');
 
 

+ 4 - 2
apps/app/src/server/routes/apiv3/page/index.ts

@@ -93,7 +93,7 @@ module.exports = (crowi: Crowi) => {
   );
   );
   const addActivity = generateAddActivityMiddleware();
   const addActivity = generateAddActivityMiddleware();
 
 
-  const globalNotificationService = crowi.getGlobalNotificationService();
+  const globalNotificationService = crowi.globalNotificationService;
   const Page = mongoose.model<IPage, PageModel>('Page');
   const Page = mongoose.model<IPage, PageModel>('Page');
   const { pageService, pageGrantService } = crowi;
   const { pageService, pageGrantService } = crowi;
 
 
@@ -1102,7 +1102,9 @@ module.exports = (crowi: Crowi) => {
       }
       }
 
 
       res.set({
       res.set({
-        'Content-Disposition': `attachment;filename*=UTF-8''${encodeURIComponent(fileName)}.${format}`,
+        'Content-Disposition': `attachment;filename*=UTF-8''${encodeURIComponent(
+          fileName,
+        )}.${format}`,
       });
       });
 
 
       const parameters = {
       const parameters = {

+ 1 - 1
apps/app/src/server/routes/apiv3/pages/index.js

@@ -50,7 +50,7 @@ module.exports = (crowi) => {
 
 
   const activityEvent = crowi.events.activity;
   const activityEvent = crowi.events.activity;
 
 
-  const globalNotificationService = crowi.getGlobalNotificationService();
+  const globalNotificationService = crowi.globalNotificationService;
 
 
   const addActivity = generateAddActivityMiddleware(crowi);
   const addActivity = generateAddActivityMiddleware(crowi);
 
 

+ 2 - 2
apps/app/src/server/routes/comment.js

@@ -65,8 +65,8 @@ module.exports = (crowi, _app) => {
 
 
   const activityEvent = crowi.events.activity;
   const activityEvent = crowi.events.activity;
 
 
-  const globalNotificationService = crowi.getGlobalNotificationService();
-  const userNotificationService = crowi.getUserNotificationService();
+  const globalNotificationService = crowi.globalNotificationService;
+  const userNotificationService = crowi.userNotificationService;
 
 
   const { body } = require('express-validator');
   const { body } = require('express-validator');
   const mongoose = require('mongoose');
   const mongoose = require('mongoose');

+ 1 - 1
apps/app/src/server/routes/page.js

@@ -27,7 +27,7 @@ module.exports = (crowi, _app) => {
 
 
   const ApiResponse = require('../util/apiResponse');
   const ApiResponse = require('../util/apiResponse');
 
 
-  const globalNotificationService = crowi.getGlobalNotificationService();
+  const globalNotificationService = crowi.globalNotificationService;
 
 
   const actions = {};
   const actions = {};