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

fix non-autofixable biome errors

Futa Arai 4 месяцев назад
Родитель
Сommit
8f34a0f167

+ 1 - 0
apps/app/src/server/middlewares/access-token-parser/access-token.integ.ts

@@ -14,6 +14,7 @@ import type { AccessTokenParserReq } from './interfaces';
 vi.mock('@growi/core/dist/models/serializers', { spy: true });
 vi.mock('@growi/core/dist/models/serializers', { spy: true });
 
 
 describe('access-token-parser middleware for access token with scopes', () => {
 describe('access-token-parser middleware for access token with scopes', () => {
+  // biome-ignore lint/suspicious/noImplicitAnyLet: ignore
   let User;
   let User;
 
 
   beforeAll(async () => {
   beforeAll(async () => {

+ 1 - 0
apps/app/src/server/middlewares/access-token-parser/api-token.integ.ts

@@ -12,6 +12,7 @@ import type { AccessTokenParserReq } from './interfaces';
 vi.mock('@growi/core/dist/models/serializers', { spy: true });
 vi.mock('@growi/core/dist/models/serializers', { spy: true });
 
 
 describe('access-token-parser middleware', () => {
 describe('access-token-parser middleware', () => {
+  // biome-ignore lint/suspicious/noImplicitAnyLet: ignore
   let User;
   let User;
 
 
   beforeAll(async () => {
   beforeAll(async () => {

+ 2 - 1
apps/app/src/server/middlewares/apiv1-form-validator.ts

@@ -14,7 +14,8 @@ export default (req: Request, res: Response, next: NextFunction): void => {
 
 
   const errObjArray = validationResult(req);
   const errObjArray = validationResult(req);
   if (errObjArray.isEmpty()) {
   if (errObjArray.isEmpty()) {
-    return next();
+    next();
+    return;
   }
   }
 
 
   const errs = errObjArray.array().map((err) => {
   const errs = errObjArray.array().map((err) => {

+ 3 - 2
apps/app/src/server/middlewares/apiv3-form-validator.ts

@@ -17,7 +17,8 @@ export const apiV3FormValidator = (
 
 
   const errObjArray = validationResult(req);
   const errObjArray = validationResult(req);
   if (errObjArray.isEmpty()) {
   if (errObjArray.isEmpty()) {
-    return next();
+    next();
+    return;
   }
   }
 
 
   const errs = errObjArray.array().map((err) => {
   const errs = errObjArray.array().map((err) => {
@@ -25,5 +26,5 @@ export const apiV3FormValidator = (
     return new ErrorV3(`${err.param}: ${err.msg}`, 'validation_failed');
     return new ErrorV3(`${err.param}: ${err.msg}`, 'validation_failed');
   });
   });
 
 
-  return res.apiv3Err(errs);
+  res.apiv3Err(errs);
 };
 };

+ 5 - 3
apps/app/src/server/middlewares/application-not-installed.ts

@@ -41,7 +41,8 @@ export const handleAsApiError = (
   next: NextFunction,
   next: NextFunction,
 ): void => {
 ): void => {
   if (error == null) {
   if (error == null) {
-    return next();
+    next();
+    return;
   }
   }
 
 
   if (isHttpError(error)) {
   if (isHttpError(error)) {
@@ -63,7 +64,8 @@ export const redirectToTopOnError = (
   next: NextFunction,
   next: NextFunction,
 ): void => {
 ): void => {
   if (error != null) {
   if (error != null) {
-    return res.redirect('/');
+    res.redirect('/');
+    return;
   }
   }
-  return next();
+  next();
 };
 };

+ 4 - 2
apps/app/src/server/middlewares/certify-origin.ts

@@ -30,13 +30,15 @@ const certifyOrigin = (
   if (!isSameOriginReq && req.headers.origin != null && isSimpleRequest(req)) {
   if (!isSameOriginReq && req.headers.origin != null && isSimpleRequest(req)) {
     const message = 'Invalid request (origin check failed but simple request)';
     const message = 'Invalid request (origin check failed but simple request)';
     logger.error(message);
     logger.error(message);
-    return res.apiv3Err(new ErrorV3(message));
+    res.apiv3Err(new ErrorV3(message));
+    return;
   }
   }
 
 
   if (!isSameOriginReq && accessToken == null && !isSimpleRequest(req)) {
   if (!isSameOriginReq && accessToken == null && !isSimpleRequest(req)) {
     const message = 'Invalid request (origin check failed and no access token)';
     const message = 'Invalid request (origin check failed and no access token)';
     logger.error(message);
     logger.error(message);
-    return res.apiv3Err(new ErrorV3(message));
+    res.apiv3Err(new ErrorV3(message));
+    return;
   }
   }
 
 
   next();
   next();

+ 8 - 6
apps/app/src/server/middlewares/exclude-read-only-user.spec.ts

@@ -1,20 +1,22 @@
 import { ErrorV3 } from '@growi/core/dist/models';
 import { ErrorV3 } from '@growi/core/dist/models';
+import type { NextFunction, Response } from 'express';
+import type { Request } from 'express-validator/src/base';
 
 
 import { excludeReadOnlyUser } from './exclude-read-only-user';
 import { excludeReadOnlyUser } from './exclude-read-only-user';
 
 
 describe('excludeReadOnlyUser', () => {
 describe('excludeReadOnlyUser', () => {
-  let req;
-  let res;
-  let next;
+  let req: Request;
+  let res: Response & { apiv3Err: ReturnType<typeof vi.fn> };
+  let next: NextFunction;
 
 
   beforeEach(() => {
   beforeEach(() => {
     req = {
     req = {
       user: {},
       user: {},
-    };
+    } as unknown as Request;
     res = {
     res = {
       apiv3Err: vi.fn(),
       apiv3Err: vi.fn(),
-    };
-    next = vi.fn();
+    } as unknown as Response & { apiv3Err: ReturnType<typeof vi.fn> };
+    next = vi.fn() as unknown as NextFunction;
   });
   });
 
 
   test('should call next if user is not found', () => {
   test('should call next if user is not found', () => {

+ 14 - 10
apps/app/src/server/middlewares/exclude-read-only-user.ts

@@ -11,30 +11,32 @@ const logger = loggerFactory('growi:middleware:exclude-read-only-user');
 export const excludeReadOnlyUser = (
 export const excludeReadOnlyUser = (
   req: Request,
   req: Request,
   res: Response & { apiv3Err },
   res: Response & { apiv3Err },
-  next: () => NextFunction,
-): NextFunction => {
+  next: NextFunction,
+): void => {
   const user = req.user;
   const user = req.user;
 
 
   if (user == null) {
   if (user == null) {
     logger.warn('req.user is null');
     logger.warn('req.user is null');
-    return next();
+    next();
+    return;
   }
   }
 
 
   if (user.readOnly) {
   if (user.readOnly) {
     const message = 'This user is read only user';
     const message = 'This user is read only user';
     logger.warn(message);
     logger.warn(message);
 
 
-    return res.apiv3Err(new ErrorV3(message, 'validation_failed'));
+    res.apiv3Err(new ErrorV3(message, 'validation_failed'));
+    return;
   }
   }
 
 
-  return next();
+  next();
 };
 };
 
 
 export const excludeReadOnlyUserIfCommentNotAllowed = (
 export const excludeReadOnlyUserIfCommentNotAllowed = (
   req: Request,
   req: Request,
   res: Response & { apiv3Err },
   res: Response & { apiv3Err },
-  next: () => NextFunction,
-): NextFunction => {
+  next: NextFunction,
+): void => {
   const user = req.user;
   const user = req.user;
 
 
   const isRomUserAllowedToComment = configManager.getConfig(
   const isRomUserAllowedToComment = configManager.getConfig(
@@ -43,15 +45,17 @@ export const excludeReadOnlyUserIfCommentNotAllowed = (
 
 
   if (user == null) {
   if (user == null) {
     logger.warn('req.user is null');
     logger.warn('req.user is null');
-    return next();
+    next();
+    return;
   }
   }
 
 
   if (user.readOnly && !isRomUserAllowedToComment) {
   if (user.readOnly && !isRomUserAllowedToComment) {
     const message = 'This user is read only user and comment is not allowed';
     const message = 'This user is read only user and comment is not allowed';
     logger.warn(message);
     logger.warn(message);
 
 
-    return res.apiv3Err(new ErrorV3(message, 'validation_failed'));
+    res.apiv3Err(new ErrorV3(message, 'validation_failed'));
+    return;
   }
   }
 
 
-  return next();
+  next();
 };
 };