Merge branch 'dev' into enhancement/wait-for-http-success-before-dele…

…te-modal-close
CarnegieLearningWeb · Jun 15, 2024 · be190bc · be190bc
2 parents 17b6000 + eca6c01
commit be190bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/backend/packages/Upgrade/src/auth/authorizationChecker.ts b/backend/packages/Upgrade/src/auth/authorizationChecker.ts
@@ -1,7 +1,6 @@
 import { Action } from 'routing-controllers';
 import { Container } from 'typedi';
 import { AuthService } from './AuthService';
-import { env } from '../env';
 import { UpgradeLogger } from '../lib/logger/UpgradeLogger';
 
 export function authorizationChecker(): (action: Action, roles: any[]) => Promise<boolean> | boolean {
@@ -14,11 +13,6 @@ export function authorizationChecker(): (action: Action, roles: any[]) => Promis
     // checker must return either boolean (true or false)
     // either promise that resolves a boolean value
 
-    // for testing don't check authorization
-    if (env.isTest) {
-      return true;
-    }
-
     const authService = Container.get<AuthService>(AuthService);
     const token = authService.parseBasicAuthFromRequest(action.request);
     if (token === undefined) {

diff --git a/backend/packages/Upgrade/test/unit/lib/setup.ts b/backend/packages/Upgrade/test/unit/lib/setup.ts
@@ -1 +1,6 @@
 import 'reflect-metadata';
+
+// Global mocks for authorizationChecker
+jest.mock('../../../src/auth/authorizationChecker', () => ({
+  authorizationChecker: () => async () => true,
+}));