Shun Miyazawa 10 месяцев назад
Родитель
Сommit
bb554f3d38

+ 6 - 12
apps/app/src/server/middlewares/access-token-parser/access-token.integ.ts

@@ -38,9 +38,8 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
-    await parserForAccessToken([])(reqMock, resMock, nextMock);
+    await parserForAccessToken([])(reqMock, resMock);
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
   });
   });
@@ -51,7 +50,6 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -71,7 +69,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
 
     // act
     // act
     reqMock.query.access_token = token;
     reqMock.query.access_token = token;
-    await parserForAccessToken([])(reqMock, resMock, nextMock);
+    await parserForAccessToken([])(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
@@ -84,7 +82,6 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -105,7 +102,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
 
     // act
     // act
     reqMock.query.access_token = token;
     reqMock.query.access_token = token;
-    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock, nextMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();
@@ -119,7 +116,6 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -141,7 +137,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
 
     // act - try to access with write:user:info scope
     // act - try to access with write:user:info scope
     reqMock.query.access_token = token;
     reqMock.query.access_token = token;
-    await parserForAccessToken([SCOPE.WRITE.USER_SETTINGS.INFO])(reqMock, resMock, nextMock);
+    await parserForAccessToken([SCOPE.WRITE.USER_SETTINGS.INFO])(reqMock, resMock);
 
 
     // // assert
     // // assert
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
@@ -154,7 +150,6 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -175,7 +170,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
 
     // act - try to access with read:user:info scope
     // act - try to access with read:user:info scope
     reqMock.query.access_token = token;
     reqMock.query.access_token = token;
-    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock, nextMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();
@@ -189,7 +184,6 @@ describe('access-token-parser middleware for access token with scopes', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     // prepare a user
     // prepare a user
     const targetUser = await User.create({
     const targetUser = await User.create({
@@ -208,7 +202,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
 
     // act - try to access with read:user:info scope
     // act - try to access with read:user:info scope
     reqMock.query.access_token = token;
     reqMock.query.access_token = token;
-    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO, SCOPE.READ.USER_SETTINGS.API.ACCESS_TOKEN])(reqMock, resMock, nextMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO, SCOPE.READ.USER_SETTINGS.API.ACCESS_TOKEN])(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();

+ 6 - 11
apps/app/src/server/middlewares/access-token-parser/api-token.integ.ts

@@ -38,12 +38,11 @@ describe('access-token-parser middleware', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
     // act
     // act
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
@@ -56,13 +55,12 @@ describe('access-token-parser middleware', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
     // act
     // act
     reqMock.query.access_token = 'invalidToken';
     reqMock.query.access_token = 'invalidToken';
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
@@ -90,7 +88,7 @@ describe('access-token-parser middleware', () => {
 
 
     // act
     // act
     reqMock.query.access_token = targetUser.apiToken;
     reqMock.query.access_token = targetUser.apiToken;
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();
@@ -104,7 +102,6 @@ describe('access-token-parser middleware', () => {
       user: undefined,
       user: undefined,
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -119,7 +116,7 @@ describe('access-token-parser middleware', () => {
 
 
     // act
     // act
     reqMock.body.access_token = targetUser.apiToken;
     reqMock.body.access_token = targetUser.apiToken;
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();
@@ -136,7 +133,6 @@ describe('access-token-parser middleware', () => {
       },
       },
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -151,7 +147,7 @@ describe('access-token-parser middleware', () => {
 
 
     // act
     // act
     reqMock.headers.authorization = `Bearer ${targetUser.apiToken}`;
     reqMock.headers.authorization = `Bearer ${targetUser.apiToken}`;
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeDefined();
     expect(reqMock.user).toBeDefined();
@@ -168,7 +164,6 @@ describe('access-token-parser middleware', () => {
       },
       },
     });
     });
     const resMock = mock<Response>();
     const resMock = mock<Response>();
-    const nextMock = vi.fn();
 
 
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();
 
 
@@ -177,7 +172,7 @@ describe('access-token-parser middleware', () => {
 
 
     // act
     // act
     reqMock.headers.authorization = `Basic ${randomString}`; // Basic auth header with random string
     reqMock.headers.authorization = `Basic ${randomString}`; // Basic auth header with random string
-    await parserForApiToken(reqMock, resMock, nextMock);
+    await parserForApiToken(reqMock, resMock);
 
 
     // assert
     // assert
     expect(reqMock.user).toBeUndefined();
     expect(reqMock.user).toBeUndefined();