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

+ 0 - 1
apps/app/src/server/middlewares/certify-shared-file/index.ts

@@ -1 +0,0 @@
-export * from './certify-shared-file';

+ 1 - 1
apps/app/src/server/middlewares/certify-shared-file/certify-shared-file.spec.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/certify-shared-page-attachment.spec.ts

@@ -3,7 +3,7 @@ import { mock } from 'vitest-mock-extended';
 
 import { ShareLinkDocument } from '~/server/models/share-link';
 
-import { certifySharedFileMiddleware, type RequestToAllowShareLink } from './certify-shared-file';
+import { certifySharedFileMiddleware, type RequestToAllowShareLink } from './certify-shared-page-attachment';
 import { ValidReferer } from './interfaces';
 
 const mocks = vi.hoisted(() => {

+ 2 - 2
apps/app/src/server/middlewares/certify-shared-file/certify-shared-file.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/certify-shared-page-attachment.ts

@@ -7,14 +7,14 @@ import { validateAttachment } from './validate-attachment';
 import { validateReferer } from './validate-referer';
 
 
-const logger = loggerFactory('growi:middleware:certify-shared-fire');
+const logger = loggerFactory('growi:middleware:certify-shared-page-attachment');
 
 
 export interface RequestToAllowShareLink extends Request {
   isSharedPage?: boolean,
 }
 
-export const certifySharedFileMiddleware = async(req: RequestToAllowShareLink, res: Response, next: NextFunction): Promise<void> => {
+export const certifySharedPageAttachmentMiddleware = async(req: RequestToAllowShareLink, res: Response, next: NextFunction): Promise<void> => {
 
   const fileId: string | undefined = req.params.id;
   const { referer } = req.headers;

+ 1 - 0
apps/app/src/server/middlewares/certify-shared-page-attachment/index.ts

@@ -0,0 +1 @@
+export * from './certify-shared-page-attachment';

+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/interfaces.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/interfaces.ts


+ 1 - 1
apps/app/src/server/middlewares/certify-shared-file/retrieve-valid-share-link.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/retrieve-valid-share-link.ts

@@ -5,7 +5,7 @@ import loggerFactory from '~/utils/logger';
 import type { ValidReferer } from './interfaces';
 
 
-const logger = loggerFactory('growi:middleware:certify-shared-fire:retrieve-valid-share-link');
+const logger = loggerFactory('growi:middleware:certify-shared-page-attachment:retrieve-valid-share-link');
 
 
 export const retrieveValidShareLinkByReferer = async(referer: ValidReferer): Promise<ShareLinkDocument | null> => {

+ 1 - 1
apps/app/src/server/middlewares/certify-shared-file/validate-attachment.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-attachment.ts

@@ -5,7 +5,7 @@ import { getModelSafely } from '~/server/util/mongoose-utils';
 import loggerFactory from '~/utils/logger';
 
 
-const logger = loggerFactory('growi:middleware:certify-shared-fire:validate-attachment');
+const logger = loggerFactory('growi:middleware:certify-shared-page-attachment:validate-attachment');
 
 
 export const validateAttachment = async(fileId: string, shareLink: ShareLinkDocument): Promise<boolean> => {

+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/validate-referer/index.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-referer/index.ts


+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/validate-referer/retrieve-site-url.spec.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-referer/retrieve-site-url.spec.ts


+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/validate-referer/retrieve-site-url.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-referer/retrieve-site-url.ts


+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/validate-referer/validate-referer.spec.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-referer/validate-referer.spec.ts


+ 0 - 0
apps/app/src/server/middlewares/certify-shared-file/validate-referer/validate-referer.ts → apps/app/src/server/middlewares/certify-shared-page-attachment/validate-referer/validate-referer.ts


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

@@ -6,7 +6,7 @@ import { middlewareFactory as rateLimiterFactory } from '~/features/rate-limiter
 import { generateAddActivityMiddleware } from '../middlewares/add-activity';
 import apiV1FormValidator from '../middlewares/apiv1-form-validator';
 import { generateCertifyBrandLogoMiddleware } from '../middlewares/certify-brand-logo';
-import { certifySharedFileMiddleware } from '../middlewares/certify-shared-file';
+import { certifySharedPageAttachmentMiddleware } from '../middlewares/certify-shared-page-attachment';
 import { excludeReadOnlyUser } from '../middlewares/exclude-read-only-user';
 import injectResetOrderByTokenMiddleware from '../middlewares/inject-reset-order-by-token-middleware';
 import injectUserRegistrationOrderByTokenMiddleware from '../middlewares/inject-user-registration-order-by-token-middleware';
@@ -156,7 +156,7 @@ module.exports = function(crowi, app) {
 
   app.get('/me'                                   , loginRequiredStrictly, next.delegateToNext);
   app.get('/me/*'                                 , loginRequiredStrictly, next.delegateToNext);
-  app.get('/attachment/:id([0-9a-z]{24})'         , certifySharedFileMiddleware , loginRequired, attachment.api.get);
+  app.get('/attachment/:id([0-9a-z]{24})'         , certifySharedPageAttachmentMiddleware , loginRequired, attachment.api.get);
   app.get('/attachment/profile/:id([0-9a-z]{24})' , loginRequired, attachment.api.get);
   app.get('/attachment/:pageId/:fileName'       , loginRequired, attachment.api.obsoletedGetForMongoDB); // DEPRECATED: remains for backward compatibility for v3.3.x or below
   app.get('/download/:id([0-9a-z]{24})'         , loginRequired, attachment.api.download);