Fix router authentication in a test context

incubateur-ademe · Nov 25, 2024 · f6030fb · f6030fb
1 parent 2529f8c
commit f6030fb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/backend/src/fiches/count-by-statut/count-by-statut.router.e2e-spec.ts b/backend/src/fiches/count-by-statut/count-by-statut.router.e2e-spec.ts
@@ -1,15 +1,15 @@
+import { AuthenticatedUser } from './../../auth/models/auth.models';
 import { inferProcedureInput } from '@trpc/server';
 import { getYoloDodoUser } from '../../../test/auth/auth-utils';
 import { getTestRouter } from '../../../test/common/app-utils';
-import { User } from '../../auth/models/auth.models';
 import { AppRouter, TrpcRouter } from '../../trpc/trpc.router';
 import { FicheActionStatutsEnumType } from '../models/fiche-action.table';
 
 type Input = inferProcedureInput<AppRouter['plans']['fiches']['countByStatut']>;
 
 describe('CountByStatutRouter', () => {
   let router: TrpcRouter;
-  let yoloDodoUser: User;
+  let yoloDodoUser: AuthenticatedUser;
 
   beforeAll(async () => {
     router = await getTestRouter();

diff --git a/backend/src/indicateurs/controllers/indicateurs.controller.ts b/backend/src/indicateurs/controllers/indicateurs.controller.ts
@@ -35,7 +35,6 @@ export class IndicateursController {
     @Query() request: GetIndicateursValeursRequestClass,
     @TokenInfo() tokenInfo: AuthenticatedUser
   ): Promise<GetIndicateursValeursResponseClass> {
-    console.log('tokenInfo', tokenInfo);
     return this.indicateurService.getIndicateurValeursGroupees(
       request,
       tokenInfo

diff --git a/backend/test/auth/auth-utils.ts b/backend/test/auth/auth-utils.ts
@@ -1,5 +1,9 @@
 import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import { YOLO_DODO_CREDENTIALS } from './test-users.samples';
+import {
+  AuthUser,
+  isAuthenticatedUser,
+} from '../../src/auth/models/auth.models';
 
 let supabase: SupabaseClient;
 
@@ -30,5 +34,15 @@ export async function getYoloDodoUser() {
     expect.fail('Could not authenticated user yolododo');
   }
 
-  return user;
+  const authUser = {
+    id: user.id,
+    role: user.role,
+    isAnonymous: user.is_anonymous,
+  } as AuthUser;
+
+  if (!isAuthenticatedUser(authUser)) {
+    expect.fail('Could not authenticated user yolododo');
+  }
+
+  return authUser;
 }