Forráskód Böngészése

update import of err-apiv3

Yohei-Shiina 3 éve
szülő
commit
7bcc7a97ff
24 módosított fájl, 44 hozzáadás és 41 törlés
  1. 2 3
      packages/app/src/server/routes/apiv3/app-settings.js
  2. 2 2
      packages/app/src/server/routes/apiv3/attachment.js
  3. 2 2
      packages/app/src/server/routes/apiv3/customize-setting.js
  4. 2 1
      packages/app/src/server/routes/apiv3/healthcheck.js
  5. 1 2
      packages/app/src/server/routes/apiv3/import.js
  6. 2 2
      packages/app/src/server/routes/apiv3/markdown-setting.js
  7. 2 2
      packages/app/src/server/routes/apiv3/notification-setting.js
  8. 1 1
      packages/app/src/server/routes/apiv3/page-listing.ts
  9. 1 1
      packages/app/src/server/routes/apiv3/page.js
  10. 2 2
      packages/app/src/server/routes/apiv3/pages.js
  11. 2 1
      packages/app/src/server/routes/apiv3/response.js
  12. 3 2
      packages/app/src/server/routes/apiv3/revisions.js
  13. 2 2
      packages/app/src/server/routes/apiv3/search.js
  14. 2 2
      packages/app/src/server/routes/apiv3/security-setting.js
  15. 2 2
      packages/app/src/server/routes/apiv3/share-links.js
  16. 2 2
      packages/app/src/server/routes/apiv3/slack-integration-legacy-settings.js
  17. 1 2
      packages/app/src/server/routes/apiv3/slack-integration-settings.js
  18. 1 2
      packages/app/src/server/routes/apiv3/slack-integration.js
  19. 2 1
      packages/app/src/server/routes/apiv3/user-activation.ts
  20. 2 1
      packages/app/src/server/routes/apiv3/user-group-relation.js
  21. 2 1
      packages/app/src/server/routes/apiv3/user-group.js
  22. 2 3
      packages/app/src/server/routes/apiv3/user-ui-settings.ts
  23. 2 1
      packages/app/src/server/routes/apiv3/users.js
  24. 2 1
      packages/app/src/server/routes/login-passport.js

+ 2 - 3
packages/app/src/server/routes/apiv3/app-settings.js

@@ -1,3 +1,4 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import { body } from 'express-validator';
 
 import { i18n } from '^/config/next-i18next.config';
@@ -11,14 +12,12 @@ import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 
 const logger = loggerFactory('growi:routes:apiv3:app-settings');
 
+const { pathUtils } = require('@growi/core');
 const debug = require('debug')('growi:routes:admin');
 const express = require('express');
-const { pathUtils } = require('@growi/core');
 
 const router = express.Router();
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 /**
  * @swagger
  *  tags:

+ 2 - 2
packages/app/src/server/routes/apiv3/attachment.js

@@ -1,16 +1,16 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import loggerFactory from '~/utils/logger';
 
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 
 const logger = loggerFactory('growi:routes:apiv3:attachment'); // eslint-disable-line no-unused-vars
-
 const express = require('express');
 
 const router = express.Router();
 const { query } = require('express-validator');
 
 const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 /**
  * @swagger

+ 2 - 2
packages/app/src/server/routes/apiv3/customize-setting.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-unused-vars */
 
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import { AttachmentType } from '~/server/interfaces/attachment';
 import loggerFactory from '~/utils/logger';
@@ -17,8 +19,6 @@ const router = express.Router();
 const { body, query } = require('express-validator');
 const multer = require('multer');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 
 /**
  * @swagger

+ 2 - 1
packages/app/src/server/routes/apiv3/healthcheck.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:routes:apiv3:healthcheck'); // eslint-disable-line no-unused-vars
@@ -7,7 +9,6 @@ const express = require('express');
 const router = express.Router();
 
 const noCache = require('nocache');
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 /**
  * @swagger

+ 1 - 2
packages/app/src/server/routes/apiv3/import.js

@@ -1,3 +1,4 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import mongoose from 'mongoose';
 
 import { SupportedAction } from '~/interfaces/activity';
@@ -16,8 +17,6 @@ const multer = require('multer');
 
 const GrowiArchiveImportOption = require('~/models/admin/growi-archive-import-option');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 
 const router = express.Router();
 

+ 2 - 2
packages/app/src/server/routes/apiv3/markdown-setting.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
 
@@ -13,8 +15,6 @@ const router = express.Router();
 
 const { body } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const validator = {
   lineBreak: [
     body('isEnabledLinebreaks').isBoolean(),

+ 2 - 2
packages/app/src/server/routes/apiv3/notification-setting.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
 import { removeNullPropertyFromObject } from '~/utils/object-utils';
@@ -16,8 +18,6 @@ const router = express.Router();
 
 const { body } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const validator = {
   userNotification: [
     body('pathPattern').isString().trim(),

+ 1 - 1
packages/app/src/server/routes/apiv3/page-listing.ts

@@ -1,3 +1,4 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import express, { Request, Router } from 'express';
 import { query, oneOf } from 'express-validator';
 import mongoose from 'mongoose';
@@ -9,7 +10,6 @@ import loggerFactory from '~/utils/logger';
 import Crowi from '../../crowi';
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 import { PageModel } from '../../models/page';
-import ErrorV3 from '../../models/vo/error-apiv3';
 import PageService from '../../service/page';
 
 import { ApiV3Response } from './interfaces/apiv3-response';

+ 1 - 1
packages/app/src/server/routes/apiv3/page.js

@@ -1,4 +1,5 @@
 import { pagePathUtils, AllSubscriptionStatusType, SubscriptionStatusType } from '@growi/core';
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 
 import { SupportedAction, SupportedTargetModel } from '~/interfaces/activity';
 import { generateAddActivityMiddleware } from '~/server/middlewares/add-activity';
@@ -15,7 +16,6 @@ const { body, query, param } = require('express-validator');
 
 const router = express.Router();
 const { convertToNewAffiliationPath, isTopPage } = pagePathUtils;
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 /**
  * @swagger

+ 2 - 2
packages/app/src/server/routes/apiv3/pages.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedTargetModel, SupportedAction } from '~/interfaces/activity';
 import { subscribeRuleNames } from '~/interfaces/in-app-notification';
 import loggerFactory from '~/utils/logger';
@@ -13,8 +15,6 @@ const { body } = require('express-validator');
 const { query } = require('express-validator');
 const mongoose = require('mongoose');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const { isCreatablePage } = pagePathUtils;
 
 const router = express.Router();

+ 2 - 1
packages/app/src/server/routes/apiv3/response.js

@@ -1,6 +1,7 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { toArrayIfNot } from '~/utils/array-utils';
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const addCustomFunctionToResponse = (express, crowi) => {
 

+ 3 - 2
packages/app/src/server/routes/apiv3/revisions.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import loggerFactory from '~/utils/logger';
 
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
@@ -5,10 +7,9 @@ import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 const logger = loggerFactory('growi:routes:apiv3:pages');
 
 const express = require('express');
-
 const { query, param } = require('express-validator');
+
 const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const router = express.Router();
 

+ 2 - 2
packages/app/src/server/routes/apiv3/search.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
 
@@ -14,8 +16,6 @@ const router = express.Router();
 
 const noCache = require('nocache');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 /**
  * @swagger
  *  tags:

+ 2 - 2
packages/app/src/server/routes/apiv3/security-setting.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import { PageDeleteConfigValue } from '~/interfaces/page-delete-config';
 import loggerFactory from '~/utils/logger';
@@ -16,8 +18,6 @@ const router = express.Router();
 
 const { body } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const validator = {
   generalSetting: [
     body('sessionMaxAge').optional({ checkFalsy: true }).trim().isInt(),

+ 2 - 2
packages/app/src/server/routes/apiv3/share-links.js

@@ -1,5 +1,7 @@
 // TODO remove this setting after implemented all
 /* eslint-disable no-unused-vars */
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import { generateAddActivityMiddleware } from '~/server/middlewares/add-activity';
 import loggerFactory from '~/utils/logger';
@@ -15,8 +17,6 @@ const router = express.Router();
 
 const { body, query, param } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const validator = {};
 
 const today = new Date();

+ 2 - 2
packages/app/src/server/routes/apiv3/slack-integration-legacy-settings.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
 
@@ -14,8 +16,6 @@ const router = express.Router();
 
 const { body } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const validator = {
   slackConfiguration: [
     body('webhookUrl').if(value => value != null).isString().trim(),

+ 1 - 2
packages/app/src/server/routes/apiv3/slack-integration-settings.js

@@ -1,3 +1,4 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 
 import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
@@ -20,8 +21,6 @@ const { body, query, param } = require('express-validator');
 const mongoose = require('mongoose');
 const urljoin = require('url-join');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 const logger = loggerFactory('growi:routes:apiv3:slack-integration-settings');
 
 const router = express.Router();

+ 1 - 2
packages/app/src/server/routes/apiv3/slack-integration.js

@@ -1,10 +1,9 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import createError from 'http-errors';
 
 import { SlackCommandHandlerError } from '~/server/models/vo/slack-command-handler-error';
 import loggerFactory from '~/utils/logger';
 
-import ErrorV3 from '../../models/vo/error-apiv3';
-
 import {
   markdownSectionBlock, InvalidGrowiCommandError, generateRespondUtil, supportedGrowiCommands,
 } from '@growi/slack';

+ 2 - 1
packages/app/src/server/routes/apiv3/user-activation.ts

@@ -1,7 +1,8 @@
 import path from 'path';
+
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import * as express from 'express';
 import { body, validationResult } from 'express-validator';
-import ErrorV3 from '../../models/vo/error-apiv3';
 
 const PASSOWRD_MINIMUM_NUMBER = 8;
 // validation rules for complete registration form

+ 2 - 1
packages/app/src/server/routes/apiv3/user-group-relation.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:routes:apiv3:user-group-relation'); // eslint-disable-line no-unused-vars
@@ -5,7 +7,6 @@ const logger = loggerFactory('growi:routes:apiv3:user-group-relation'); // eslin
 const express = require('express');
 const { query } = require('express-validator');
 
-const ErrorV3 = require('../../models/vo/error-apiv3');
 const { serializeUserGroupRelationSecurely } = require('../../models/serializers/user-group-relation-serializer');
 
 const router = express.Router();

+ 2 - 1
packages/app/src/server/routes/apiv3/user-group.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import UserGroup from '~/server/models/user-group';
 import { excludeTestIdsFromTargetIds } from '~/server/util/compare-objectId';
@@ -18,7 +20,6 @@ const { sanitizeQuery } = require('express-validator');
 const mongoose = require('mongoose');
 
 const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
-const ErrorV3 = require('../../models/vo/error-apiv3');
 const { toPagingLimit, toPagingOffset } = require('../../util/express-validator/sanitizer');
 
 const { ObjectId } = mongoose.Types;

+ 2 - 3
packages/app/src/server/routes/apiv3/user-ui-settings.ts

@@ -1,13 +1,12 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
 import express from 'express';
 import { body } from 'express-validator';
-import { AllSidebarContentsType } from '~/interfaces/ui';
 
+import { AllSidebarContentsType } from '~/interfaces/ui';
 import loggerFactory from '~/utils/logger';
 
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
-
 import UserUISettings from '../../models/user-ui-settings';
-import ErrorV3 from '../../models/vo/error-apiv3';
 
 const logger = loggerFactory('growi:routes:apiv3:user-ui-settings');
 

+ 2 - 1
packages/app/src/server/routes/apiv3/users.js

@@ -1,3 +1,5 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import Activity from '~/server/models/activity';
 import loggerFactory from '~/utils/logger';
@@ -19,7 +21,6 @@ const { isEmail } = require('validator');
 
 const { serializePageSecurely } = require('../../models/serializers/page-serializer');
 const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
-const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const PAGE_ITEMS = 50;
 

+ 2 - 1
packages/app/src/server/routes/login-passport.js

@@ -1,8 +1,9 @@
+import ErrorV3 from '@growi/core/src/models/vo/error-apiv3';
+
 import { SupportedAction } from '~/interfaces/activity';
 import { NullUsernameToBeRegisteredError } from '~/server/models/errors';
 import loggerFactory from '~/utils/logger';
 
-import ErrorV3 from '../models/vo/error-apiv3';
 
 /* eslint-disable no-use-before-define */