Browse Source

refactor: remove unused next function parameter from access token parsers

Shun Miyazawa 10 months ago
parent
commit
615623e9af

+ 2 - 2
apps/app/src/server/middlewares/access-token-parser/access-token.ts

@@ -1,6 +1,6 @@
 import type { IUserHasId } from '@growi/core/dist/interfaces';
 import { serializeUserSecurely } from '@growi/core/dist/models/serializers';
-import type { NextFunction, Response } from 'express';
+import type { Response } from 'express';
 
 import type { Scope } from '~/interfaces/scope';
 import { AccessToken } from '~/server/models/access-token';
@@ -11,7 +11,7 @@ import type { AccessTokenParserReq } from './interfaces';
 const logger = loggerFactory('growi:middleware:access-token-parser:access-token');
 
 export const parserForAccessToken = (scopes: Scope[]) => {
-  return async(req: AccessTokenParserReq, res: Response, next: NextFunction): Promise<void> => {
+  return async(req: AccessTokenParserReq, res: Response): Promise<void> => {
 
     const accessToken = req.query.access_token ?? req.body.access_token;
     if (accessToken == null || typeof accessToken !== 'string') {

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

@@ -23,7 +23,7 @@ const extractBearerToken = (authHeader: string | undefined): string | null => {
 };
 
 
-export const parserForApiToken = async(req: AccessTokenParserReq, res: Response, next: NextFunction): Promise<void> => {
+export const parserForApiToken = async(req: AccessTokenParserReq, res: Response): Promise<void> => {
   // Extract token from Authorization header first
   const bearerToken = extractBearerToken(req.headers.authorization);
 

+ 2 - 2
apps/app/src/server/middlewares/access-token-parser/index.ts

@@ -13,10 +13,10 @@ export const accessTokenParser = (scopes?: Scope[], opts?: {acceptLegacy: boolea
       return next();
     }
 
-    await parserForAccessToken(scopes)(req, res, next);
+    await parserForAccessToken(scopes)(req, res);
 
     if (opts?.acceptLegacy) {
-      await parserForApiToken(req, res, next);
+      await parserForApiToken(req, res);
     }
 
     return next();