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

reorganize growi-plugin routes

Yuki Takei 2 лет назад
Родитель
Сommit
2c36512ce9

+ 1 - 1
apps/app/src/features/growi-plugin/client/stores/admin-plugins.tsx

@@ -10,7 +10,7 @@ type Plugins = {
 
 
 export const useSWRxAdminPlugins = (): SWRResponse<Plugins, Error> => {
 export const useSWRxAdminPlugins = (): SWRResponse<Plugins, Error> => {
   return useSWR(
   return useSWR(
-    '/admin/plugins',
+    '/plugins',
     async(endpoint) => {
     async(endpoint) => {
       try {
       try {
         const res = await apiv3Get<Plugins>(endpoint);
         const res = await apiv3Get<Plugins>(endpoint);

+ 0 - 24
apps/app/src/features/growi-plugin/client/stores/plugins.tsx

@@ -1,24 +0,0 @@
-import useSWR, { SWRResponse } from 'swr';
-
-import { apiv3Get } from '~/client/util/apiv3-client';
-
-import type { IGrowiPluginHasId } from '../../interfaces';
-
-type Plugins = {
-  plugins: IGrowiPluginHasId[]
-}
-
-export const useSWRxAdminPlugins = (): SWRResponse<Plugins, Error> => {
-  return useSWR(
-    '/plugins',
-    async(endpoint) => {
-      try {
-        const res = await apiv3Get<Plugins>(endpoint);
-        return res.data;
-      }
-      catch (err) {
-        throw new Error(err);
-      }
-    },
-  );
-};

+ 0 - 25
apps/app/src/features/growi-plugin/server/routes/apiv3/index.ts

@@ -1,25 +0,0 @@
-import express, { Request, Router } from 'express';
-
-import Crowi from '~/server/crowi';
-import type { ApiV3Response } from '~/server/routes/apiv3/interfaces/apiv3-response';
-
-import { GrowiPlugin } from '../../models';
-
-
-module.exports = (crowi: Crowi): Router => {
-  const loginRequiredStrictly = require('~/server/middlewares/login-required')(crowi);
-
-  const router = express.Router();
-
-  router.get('/', loginRequiredStrictly, async(req: Request, res: ApiV3Response) => {
-    try {
-      const data = await GrowiPlugin.find({});
-      return res.apiv3({ plugins: data });
-    }
-    catch (err) {
-      return res.apiv3Err(err);
-    }
-  });
-
-  return router;
-};

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

@@ -5,7 +5,7 @@ import express from 'express';
 import { body } from 'express-validator';
 import { body } from 'express-validator';
 import multer from 'multer';
 import multer from 'multer';
 
 
-import { GrowiPlugin } from '~/features/growi-plugin/models';
+import { GrowiPlugin } from '~/features/growi-plugin/server/models';
 import { SupportedAction } from '~/interfaces/activity';
 import { SupportedAction } from '~/interfaces/activity';
 import { AttachmentType } from '~/server/interfaces/attachment';
 import { AttachmentType } from '~/server/interfaces/attachment';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';

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

@@ -1,5 +1,4 @@
-import growiPlugin from '~/features/growi-plugin/server/routes/apiv3';
-import growiPluginAdmin from '~/features/growi-plugin/server/routes/apiv3/admin';
+import growiPlugin from '~/features/growi-plugin/server/routes/apiv3/admin';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
@@ -45,7 +44,7 @@ module.exports = (crowi, app) => {
   routerForAdmin.use('/slack-integration-legacy-settings', require('./slack-integration-legacy-settings')(crowi));
   routerForAdmin.use('/slack-integration-legacy-settings', require('./slack-integration-legacy-settings')(crowi));
   routerForAdmin.use('/activity', require('./activity')(crowi));
   routerForAdmin.use('/activity', require('./activity')(crowi));
   routerForAdmin.use('/g2g-transfer', g2gTransfer(crowi));
   routerForAdmin.use('/g2g-transfer', g2gTransfer(crowi));
-  routerForAdmin.use('/admin/plugins', growiPluginAdmin(crowi));
+  routerForAdmin.use('/plugins', growiPlugin(crowi));
 
 
   // auth
   // auth
   const applicationInstalled = require('../../middlewares/application-installed')(crowi);
   const applicationInstalled = require('../../middlewares/application-installed')(crowi);
@@ -111,8 +110,6 @@ module.exports = (crowi, app) => {
     userActivation.validateCompleteRegistration,
     userActivation.validateCompleteRegistration,
     userActivation.completeRegistrationAction(crowi));
     userActivation.completeRegistrationAction(crowi));
 
 
-  router.use('/plugins', growiPlugin(crowi));
-
   router.use('/user-ui-settings', require('./user-ui-settings')(crowi));
   router.use('/user-ui-settings', require('./user-ui-settings')(crowi));
 
 
   router.use('/bookmark-folder', require('./bookmark-folder')(crowi));
   router.use('/bookmark-folder', require('./bookmark-folder')(crowi));