Просмотр исходного кода

refs 124384: move external user group files to features/external-user-group

Futa Arai 2 лет назад
Родитель
Сommit
f122f3ca97

+ 1 - 1
apps/app/src/components/Admin/UserGroup/ExternalUserGroup/LdapGroupSyncSettingsForm.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { toastError, toastSuccess } from '~/client/util/toastr';
-import { LdapGroupMembershipAttributeType, LdapGroupSyncSettings } from '~/interfaces/external-user-group';
+import { LdapGroupMembershipAttributeType, LdapGroupSyncSettings } from '~/features/external-user-group/interfaces/external-user-group';
 import { useSWRxLdapGroupSyncSettings } from '~/stores/external-user-group';
 
 export const LdapGroupSyncSettingsForm: FC = () => {

+ 1 - 1
apps/app/src/interfaces/external-user-group.ts → apps/app/src/features/external-user-group/interfaces/external-user-group.ts

@@ -1,6 +1,6 @@
 import { HasObjectId, IUserGroupRelation, Ref } from '@growi/core';
 
-import { IUserGroup } from './user';
+import { IUserGroup } from '../../../interfaces/user';
 
 export const ExternalGroupProviderType = { ldap: 'ldap' } as const;
 export type ExternalGroupProviderType = typeof ExternalGroupProviderType[keyof typeof ExternalGroupProviderType];

+ 2 - 3
apps/app/src/server/models/external-user-group-relation.ts → apps/app/src/features/external-user-group/server/models/external-user-group-relation.ts

@@ -1,8 +1,7 @@
 import { Schema, Model, Document } from 'mongoose';
 
-import { IExternalUserGroupRelation } from '~/interfaces/external-user-group';
-
-import { getOrCreateModel } from '../util/mongoose-utils';
+import { getOrCreateModel } from '../../../../server/util/mongoose-utils';
+import { IExternalUserGroupRelation } from '../../interfaces/external-user-group';
 
 
 export interface ExternalUserGroupRelationDocument extends IExternalUserGroupRelation, Document {}

+ 2 - 2
apps/app/src/server/models/external-user-group.ts → apps/app/src/features/external-user-group/server/models/external-user-group.ts

@@ -1,8 +1,8 @@
 import { Schema, Model, Document } from 'mongoose';
 
-import { IExternalUserGroup } from '~/interfaces/external-user-group';
+import { getOrCreateModel } from '~/server/util/mongoose-utils';
 
-import { getOrCreateModel } from '../util/mongoose-utils';
+import { IExternalUserGroup } from '../../interfaces/external-user-group';
 
 
 export interface ExternalUserGroupDocument extends IExternalUserGroup, Document {}

+ 3 - 2
apps/app/src/server/routes/apiv3/external-user-group.ts → apps/app/src/features/external-user-group/server/routes/apiv3/external-user-group.ts

@@ -4,9 +4,10 @@ import { body, validationResult } from 'express-validator';
 import Crowi from '~/server/crowi';
 import { ApiV3Response } from '~/server/routes/apiv3/interfaces/apiv3-response';
 import { configManager } from '~/server/service/config-manager';
-import LdapUserGroupSyncService from '~/server/service/external-group/ldap-user-group-sync-service';
 import loggerFactory from '~/utils/logger';
 
+import LdapUserGroupSyncService from '../../service/ldap-user-group-sync-service';
+
 const logger = loggerFactory('growi:routes:apiv3:external-user-group');
 
 const router = Router();
@@ -17,7 +18,7 @@ interface AuthorizedRequest extends Request {
 
 module.exports = (crowi: Crowi): Router => {
   const loginRequiredStrictly = require('~/server/middlewares/login-required')(crowi);
-  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const adminRequired = require('~/server/middlewares/admin-required')(crowi);
 
   const validators = {
     ldapSyncSettings: [

+ 7 - 7
apps/app/src/server/service/external-group/external-user-group-sync-service.ts → apps/app/src/features/external-user-group/server/service/external-user-group-sync-service.ts

@@ -1,15 +1,15 @@
 import mongoose from 'mongoose';
 
-import {
-  ExternalGroupProviderType, ExternalUserGroupTreeNode, ExternalUserInfo, IExternalUserGroupHasId,
-} from '~/interfaces/external-user-group';
 import { IUserHasId } from '~/interfaces/user';
-import ExternalUserGroup from '~/server/models/external-user-group';
-import ExternalUserGroupRelation from '~/server/models/external-user-group-relation';
 import { excludeTestIdsFromTargetIds } from '~/server/util/compare-objectId';
 
-import { configManager } from '../config-manager';
-import { externalAccountService } from '../external-account';
+import { configManager } from '../../../../server/service/config-manager';
+import { externalAccountService } from '../../../../server/service/external-account';
+import {
+  ExternalGroupProviderType, ExternalUserGroupTreeNode, ExternalUserInfo, IExternalUserGroupHasId,
+} from '../../interfaces/external-user-group';
+import ExternalUserGroup from '../models/external-user-group';
+import ExternalUserGroupRelation from '../models/external-user-group-relation';
 
 abstract class ExternalUserGroupSyncService {
 

+ 5 - 5
apps/app/src/server/service/external-group/ldap-user-group-sync-service.ts → apps/app/src/features/external-user-group/server/service/ldap-user-group-sync-service.ts

@@ -1,10 +1,10 @@
+import { configManager } from '~/server/service/config-manager';
+import LdapService, { SearchResultEntry } from '~/server/service/ldap';
+import PassportService from '~/server/service/passport';
+
 import {
   ExternalGroupProviderType, ExternalUserGroupTreeNode, ExternalUserInfo, LdapGroupMembershipAttributeType,
-} from '~/interfaces/external-user-group';
-
-import { configManager } from '../config-manager';
-import LdapService, { SearchResultEntry } from '../ldap';
-import PassportService from '../passport';
+} from '../../interfaces/external-user-group';
 
 import ExternalUserGroupSyncService from './external-user-group-sync-service';
 

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

@@ -34,7 +34,7 @@ module.exports = (crowi, app) => {
   routerForAdmin.use('/notification-setting', require('./notification-setting')(crowi));
   routerForAdmin.use('/users', require('./users')(crowi));
   routerForAdmin.use('/user-groups', require('./user-group')(crowi));
-  routerForAdmin.use('/external-user-groups', require('./external-user-group')(crowi));
+  routerForAdmin.use('/external-user-groups', require('~/features/external-user-group/server/routes/apiv3/external-user-group')(crowi));
   routerForAdmin.use('/export', require('./export')(crowi));
   routerForAdmin.use('/import', importRoute(crowi));
   routerForAdmin.use('/search', require('./search')(crowi));