Revert "refactor: clean up access-token-parser integration tests for better readability"

This reverts commit 3796a7694b28254d28609a3febd3d996b8a3db13.

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

@@ -1,9 +1,9 @@
 import { faker } from '@faker-js/faker';
-import { SCOPE } from '@growi/core/dist/interfaces';
 import { serializeUserSecurely } from '@growi/core/dist/models/serializers';
 import type { Response } from 'express';
 import { mock } from 'vitest-mock-extended';
 
+import { SCOPE } from '@growi/core/dist/interfaces';
 import type Crowi from '~/server/crowi';
 import type UserEvent from '~/server/events/user';
 import { AccessToken } from '~/server/models/access-token';
@@ -17,7 +17,6 @@ vi.mock('@growi/core/dist/models/serializers', { spy: true });
 describe('access-token-parser middleware for access token with scopes', () => {
 
   let User;
-  const dummyAccessToken = 'cb51d35793fc5fd4a0aaae354b106045d7a774620ecf8068c147d1780f3573fc';
 
   beforeAll(async() => {
     const crowiMock = mock<Crowi>({
@@ -40,7 +39,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
     });
     const resMock = mock<Response>();
 
-    await parserForAccessToken(dummyAccessToken, [])(reqMock, resMock);
+    await parserForAccessToken([])(reqMock, resMock);
 
     expect(reqMock.user).toBeUndefined();
   });
@@ -70,7 +69,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
     // act
     reqMock.query.access_token = token;
-    await parserForAccessToken(dummyAccessToken, [])(reqMock, resMock);
+    await parserForAccessToken([])(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeUndefined();
@@ -103,7 +102,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
     // act
     reqMock.query.access_token = token;
-    await parserForAccessToken(dummyAccessToken, [SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();
@@ -138,7 +137,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
     // act - try to access with write:user:info scope
     reqMock.query.access_token = token;
-    await parserForAccessToken(dummyAccessToken, [SCOPE.WRITE.USER_SETTINGS.INFO])(reqMock, resMock);
+    await parserForAccessToken([SCOPE.WRITE.USER_SETTINGS.INFO])(reqMock, resMock);
 
     // // assert
     expect(reqMock.user).toBeUndefined();
@@ -171,7 +170,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
     // act - try to access with read:user:info scope
     reqMock.query.access_token = token;
-    await parserForAccessToken(dummyAccessToken, [SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO])(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();
@@ -203,7 +202,7 @@ describe('access-token-parser middleware for access token with scopes', () => {
 
     // act - try to access with read:user:info scope
     reqMock.query.access_token = token;
-    await parserForAccessToken(dummyAccessToken, [SCOPE.READ.USER_SETTINGS.INFO, SCOPE.READ.USER_SETTINGS.API.ACCESS_TOKEN])(reqMock, resMock);
+    await parserForAccessToken([SCOPE.READ.USER_SETTINGS.INFO, SCOPE.READ.USER_SETTINGS.API.ACCESS_TOKEN])(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();

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

@@ -17,7 +17,6 @@ vi.mock('@growi/core/dist/models/serializers', { spy: true });
 describe('access-token-parser middleware', () => {
 
   let User;
-  const dummyAccessToken = 'd4+pf06KZPt71C9RdyekTtgaOPQNvGnYJWVWDowJvp4=';
 
   beforeAll(async() => {
     const crowiMock = mock<Crowi>({
@@ -43,7 +42,7 @@ describe('access-token-parser middleware', () => {
     expect(reqMock.user).toBeUndefined();
 
     // act
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeUndefined();
@@ -61,7 +60,7 @@ describe('access-token-parser middleware', () => {
 
     // act
     reqMock.query.access_token = 'invalidToken';
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeUndefined();
@@ -89,7 +88,7 @@ describe('access-token-parser middleware', () => {
 
     // act
     reqMock.query.access_token = targetUser.apiToken;
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();
@@ -117,7 +116,7 @@ describe('access-token-parser middleware', () => {
 
     // act
     reqMock.body.access_token = targetUser.apiToken;
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();
@@ -148,7 +147,7 @@ describe('access-token-parser middleware', () => {
 
     // act
     reqMock.headers.authorization = `Bearer ${targetUser.apiToken}`;
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeDefined();
@@ -173,7 +172,7 @@ describe('access-token-parser middleware', () => {
 
     // act
     reqMock.headers.authorization = `Basic ${randomString}`; // Basic auth header with random string
-    await parserForApiToken(dummyAccessToken)(reqMock, resMock);
+    await parserForApiToken(reqMock, resMock);
 
     // assert
     expect(reqMock.user).toBeUndefined();