test fixes and linting

Author: dbarkowsky

apps/backend-services/src/actor/actor.module.ts

@@ -2,8 +2,8 @@ import { Module } from "@nestjs/common";
 import { ApiKeyController } from "./api-key.controller";
 import { ApiKeyService } from "./api-key.service";
 import { ApiKeyDbService } from "./api-key-db.service";
-import { UserDbService } from "./user-db.service";
 import { UserService } from "./user.service";
+import { UserDbService } from "./user-db.service";
 
 @Module({
   imports: [],

apps/backend-services/src/actor/api-key.controller.spec.ts

@@ -23,9 +23,10 @@ describe("ApiKeyController", () => {
       roles: ["admin", "editor"],
     },
     resolvedIdentity: {
-      actorId: "testuser",
+      userId: "testuser",
       isSystemAdmin: false,
       groupRoles: { group123: GroupRole.ADMIN },
+      actorId: "actor-1",
     },
   };
 
@@ -102,7 +103,7 @@ describe("ApiKeyController", () => {
           {
             user: { sub: "testuser" },
             resolvedIdentity: {
-              actorId: "testuser",
+              userId: "testuser",
               isSystemAdmin: false,
               groupRoles: { group123: GroupRole.ADMIN },
             },
@@ -142,7 +143,7 @@ describe("ApiKeyController", () => {
           {
             ...mockRequest,
             resolvedIdentity: {
-              actorId: "testuser",
+              userId: "testuser",
               isSystemAdmin: false,
               groupRoles: {},
             },
@@ -161,7 +162,7 @@ describe("ApiKeyController", () => {
           {
             user: { sub: "testuser" },
             resolvedIdentity: {
-              actorId: "testuser",
+              userId: "testuser",
               isSystemAdmin: false,
               groupRoles: { group123: GroupRole.ADMIN },
             },
@@ -241,9 +242,10 @@ describe("ApiKeyController", () => {
           {
             ...mockRequest,
             resolvedIdentity: {
-              actorId: "testuser",
+              userId: "testuser",
               isSystemAdmin: false,
               groupRoles: {},
+              actorId: "actor-1",
             },
           } as any,
           {
@@ -273,6 +275,7 @@ describe("ApiKeyController", () => {
           actorId: newUserId,
           isSystemAdmin: false,
           groupRoles: { group123: GroupRole.ADMIN },
+          userId: newUserId,
         },
       };
 

apps/backend-services/src/actor/user-db.service.spec.ts

@@ -4,7 +4,6 @@ import { PrismaService } from "@/database/prisma.service";
 import { ApiKeyDbService, type CreateApiKeyData } from "./api-key-db.service";
 import { UserDbService } from "./user-db.service";
 
-
 describe("UserDbService", () => {
   let service: UserDbService;
   let mockUserPrisma: {
@@ -47,7 +46,7 @@ describe("UserDbService", () => {
     expect(service).toBeDefined();
   });
 
-   describe("isUserSystemAdmin", () => {
+  describe("isUserSystemAdmin", () => {
     it("returns true when admin (no tx)", async () => {
       mockPrisma.user.findUnique.mockResolvedValue({ is_system_admin: true });
       expect(await service.isUserSystemAdmin("user-1")).toBe(true);

apps/backend-services/src/actor/user-db.service.ts

@@ -7,7 +7,7 @@ import { PrismaService } from "@/database/prisma.service";
  */
 @Injectable()
 export class UserDbService {
-  constructor(private readonly prismaService: PrismaService) { }
+  constructor(private readonly prismaService: PrismaService) {}
 
   private get prisma(): PrismaClient {
     return this.prismaService.prisma;
@@ -45,10 +45,10 @@ export class UserDbService {
       : await this.prisma.$transaction(async (tx) => await userHelper(tx));
   }
   /**
-     * Checks whether a user is a system admin.
-     * @param userId - The ID of the user to check.
-     * @returns `true` when the user has `is_system_admin` set to `true`, `false` otherwise.
-     */
+   * Checks whether a user is a system admin.
+   * @param userId - The ID of the user to check.
+   * @returns `true` when the user has `is_system_admin` set to `true`, `false` otherwise.
+   */
   async isUserSystemAdmin(
     userId: string,
     tx?: Prisma.TransactionClient,
@@ -61,11 +61,15 @@ export class UserDbService {
     return user?.is_system_admin ?? false;
   }
 
-  async findUser(userId: string, includeGroups: boolean = false, tx?: Prisma.TransactionClient,) {
+  async findUser(
+    userId: string,
+    includeGroups: boolean = false,
+    tx?: Prisma.TransactionClient,
+  ) {
     const client = tx ?? this.prisma;
     return await client.user.findUnique({
       where: { id: userId },
-      include: { userGroups: includeGroups }
-    })
+      include: { userGroups: includeGroups },
+    });
   }
 }

apps/backend-services/src/actor/user.service.ts

@@ -1,28 +1,24 @@
 import { Injectable } from "@nestjs/common";
-import { AppLoggerService } from "@/logging/app-logger.service";
 import { UserDbService } from "./user-db.service";
 
 @Injectable()
 export class UserService {
-  constructor(
-    private readonly userDb: UserDbService,
-    private readonly logger: AppLoggerService,
-  ) {}
+  constructor(private readonly userDb: UserDbService) {}
 
   /**
    * Returns true/false depending no user's system admin status.
    * @param userId A user's id
    * @returns A boolean value indicating user's system admin status
    */
-  async isUserAdmin(userId){
+  async isUserAdmin(userId) {
     return await this.userDb.isUserSystemAdmin(userId);
   }
 
   async upsertUser(sub: string, email: string) {
     return await this.userDb.upsertUser(sub, email);
   }
 
-  async findUserWithGroups(userId){
-    return await this.userDb.findUser(userId, true)
+  async findUserWithGroups(userId) {
+    return await this.userDb.findUser(userId, true);
   }
 }

apps/backend-services/src/app.module.ts

@@ -5,6 +5,7 @@ import { ScheduleModule } from "@nestjs/schedule";
 import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler";
 import { AuditModule } from "@/audit/audit.module";
 import { AzureModule } from "@/azure/azure.module";
+import { ActorModule } from "./actor/actor.module";
 import { AuthModule } from "./auth/auth.module";
 import { BenchmarkModule } from "./benchmark/benchmark.module";
 import { BlobStorageModule } from "./blob-storage/blob-storage.module";
@@ -21,7 +22,6 @@ import { TemporalModule } from "./temporal/temporal.module";
 import { TrainingModule } from "./training/training.module";
 import { UploadModule } from "./upload/upload.module";
 import { WorkflowModule } from "./workflow/workflow.module";
-import { ActorModule } from "./actor/actor.module";
 
 @Module({
   imports: [

apps/backend-services/src/auth/api-key-auth.guard.ts

@@ -9,13 +9,13 @@ import {
 } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
 import { Request } from "express";
+import { ApiKeyService } from "@/actor/api-key.service";
 import {
   API_KEY_FAILED_WINDOW_MS,
   API_KEY_MAX_FAILED_ATTEMPTS,
   API_KEY_SWEEP_INTERVAL_MS,
 } from "./auth.config";
 import { IDENTITY_KEY, IdentityOptions } from "./identity.decorator";
-import { ApiKeyService } from "@/actor/api-key.service";
 
 /**
  * Tracks failed API key validation attempts per IP within a time window.

apps/backend-services/src/auth/auth.controller.ts

@@ -39,9 +39,9 @@ import {
   setAuthCookies,
 } from "./cookie-auth.utils";
 import { MeResponseDto, OAuthCallbackQueryDto, RefreshReturnDto } from "./dto";
+import { Identity } from "./identity.decorator";
 import { Public } from "./public.decorator";
 import { User } from "./types";
-import { Identity } from "./identity.decorator";
 
 /**
  * Thin HTTP layer that exposes the OAuth entrypoints to the frontend.
@@ -280,7 +280,7 @@ export class AuthController {
   })
   @ApiUnauthorizedResponse({ description: "Not authenticated" })
   @ApiForbiddenResponse({ description: "Invalid token" })
-  @Identity({allowApiKey: false})
+  @Identity({ allowApiKey: false })
   async getMe(@Req() req: Request): Promise<MeResponseDto> {
     const user = req.user as User;
     const now = Math.floor(Date.now() / 1000);
@@ -303,4 +303,9 @@ export class AuthController {
       groups,
     };
   }
+
+  @Get("test")
+  async test() {
+    return "hi";
+  }
 }

apps/backend-services/src/auth/auth.module.ts

@@ -2,6 +2,8 @@ import { Module } from "@nestjs/common";
 import { ConfigModule } from "@nestjs/config";
 import { APP_GUARD } from "@nestjs/core";
 import { PassportModule } from "@nestjs/passport";
+import { ActorModule } from "@/actor/actor.module";
+import { UserService } from "@/actor/user.service";
 import { GroupModule } from "../group/group.module";
 import { ApiKeyAuthGuard } from "./api-key-auth.guard";
 import { AuthController } from "./auth.controller";
@@ -10,16 +12,13 @@ import { CsrfGuard } from "./csrf.guard";
 import { IdentityGuard } from "./identity.guard";
 import { JwtAuthGuard } from "./jwt-auth.guard";
 import { KeycloakJwtStrategy } from "./keycloak-jwt.strategy";
-import { ActorModule } from "@/actor/actor.module";
-import { UserService } from "@/actor/user.service";
 
 @Module({
   imports: [
     ConfigModule,
     PassportModule.register({ defaultStrategy: "jwt" }),
     ActorModule,
     GroupModule,
-    UserService
   ],
   controllers: [AuthController],
   providers: [

apps/backend-services/src/auth/guard-composition.spec.ts

@@ -13,9 +13,11 @@ import { Identity } from "@/auth/identity.decorator";
 import { ApiKeyService } from "../actor/api-key.service";
 import { UserService } from "../actor/user.service";
 import { ApiKeyAuthGuard } from "./api-key-auth.guard";
+import { AuthService } from "./auth.service";
 import { CsrfGuard } from "./csrf.guard";
 import { IdentityGuard } from "./identity.guard";
 import { JwtAuthGuard } from "./jwt-auth.guard";
+import { KeycloakJwtStrategy } from "./keycloak-jwt.strategy";
 import { Public } from "./public.decorator";
 
 /**
@@ -140,24 +142,32 @@ describe("Guard Composition Integration", () => {
   };
 
   const mockUserService = {
-    getUserWithGroups: jest.fn().mockResolvedValue({
+    findUserWithGroups: jest.fn().mockResolvedValue({
+      user_id: "user-1",
       userGroups: [],
       is_system_admin: false,
       actor_id: "actor-1",
     }),
   };
 
+  const mockAuthService = {};
+
+  const mockKeycloakJwtStrategy = {};
+
   beforeAll(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [TestGuardController],
       providers: [
         Reflector,
+        // Register guards in the correct order, only once each, using the stub for JwtAuthGuard
         { provide: APP_GUARD, useClass: StubJwtAuthGuard },
         { provide: APP_GUARD, useClass: ApiKeyAuthGuard },
         { provide: APP_GUARD, useClass: IdentityGuard },
         { provide: APP_GUARD, useClass: CsrfGuard },
+        { provide: KeycloakJwtStrategy, useValue: mockKeycloakJwtStrategy },
         { provide: ApiKeyService, useValue: mockApiKeyService },
         { provide: UserService, useValue: mockUserService },
+        { provide: AuthService, useValue: mockAuthService },
       ],
     }).compile();
 
@@ -181,7 +191,7 @@ describe("Guard Composition Integration", () => {
       },
     );
 
-    mockUserService.getUserWithGroups.mockResolvedValue({
+    mockUserService.findUserWithGroups.mockResolvedValue({
       userGroups: [],
       is_system_admin: false,
       actor_id: "actor-1",