fix(api): Missing default workspace and secret test fix

Author: rajdip-b

apps/api/src/auth/guard/auth/auth.guard.spec.ts

@@ -2,6 +2,6 @@ import { AuthGuard } from './auth.guard'
 
 describe('AuthGuard', () => {
   it('should be defined', () => {
-    expect(new AuthGuard(null, null, null, null)).toBeDefined()
+    expect(new AuthGuard(null, null, null, null, null)).toBeDefined()
   })
 })

apps/api/src/auth/guard/auth/auth.guard.ts

@@ -17,6 +17,7 @@ import { toSHA256 } from '@/common/cryptography'
 import { getUserByEmailOrId } from '@/common/user'
 import { Request } from 'express'
 import { constructErrorBody } from '@/common/util'
+import SlugGenerator from '@/common/slug-generator.service'
 
 const X_E2E_USER_EMAIL = 'x-e2e-user-email'
 const X_KEYSHADE_TOKEN = 'x-keyshade-token'
@@ -29,7 +30,8 @@ export class AuthGuard implements CanActivate {
     private readonly jwtService: JwtService,
     private readonly prisma: PrismaService,
     private readonly reflector: Reflector,
-    private readonly cache: CacheService
+    private readonly cache: CacheService,
+    private readonly slugGenerator: SlugGenerator
   ) {}
 
   /**
@@ -77,7 +79,11 @@ export class AuthGuard implements CanActivate {
       if (!email) {
         throw new ForbiddenException()
       }
-      const user = await getUserByEmailOrId(email, this.prisma)
+      const user = await getUserByEmailOrId(
+        email,
+        this.prisma,
+        this.slugGenerator
+      )
 
       userContext = {
         ...user,
@@ -134,7 +140,11 @@ export class AuthGuard implements CanActivate {
               ipAddress: request.ip
             }
           } else {
-            const user = await getUserByEmailOrId(payload['id'], this.prisma)
+            const user = await getUserByEmailOrId(
+              payload['id'],
+              this.prisma,
+              this.slugGenerator
+            )
 
             userContext = {
               ...user,

apps/api/src/auth/service/auth.service.ts

@@ -76,7 +76,11 @@ export class AuthService {
       )
     }
 
-    const user = await getUserByEmailOrId(email, this.prisma)
+    const user = await getUserByEmailOrId(
+      email,
+      this.prisma,
+      this.slugGenerator
+    )
     const otp = await generateOtp(email, user.id, this.prisma)
     await this.mailService.sendOtp(email, otp.code)
   }
@@ -96,7 +100,11 @@ export class AuthService {
   ): Promise<UserAuthenticatedResponse> {
     this.logger.log(`Validating login code for ${email}`)
 
-    const user = await getUserByEmailOrId(email, this.prisma)
+    const user = await getUserByEmailOrId(
+      email,
+      this.prisma,
+      this.slugGenerator
+    )
 
     this.logger.log(`Checking if OTP is valid for ${email}`)
     const isOtpValid =
@@ -231,7 +239,7 @@ export class AuthService {
 
     this.logger.log(`Checking if user exists with email: ${email}`)
     try {
-      user = await getUserByEmailOrId(email, this.prisma)
+      user = await getUserByEmailOrId(email, this.prisma, this.slugGenerator)
     } catch (ignored) {}
 
     // We need to create the user if it doesn't exist yet

apps/api/src/common/user.ts

@@ -86,7 +86,8 @@ export async function createUser(
  */
 export async function getUserByEmailOrId(
   input: User['email'] | User['id'],
-  prisma: PrismaService
+  prisma: PrismaService,
+  slugGenerator: SlugGenerator
 ): Promise<UserWithWorkspace> {
   const logger = new Logger('getUserByEmailOrId')
 
@@ -135,20 +136,29 @@ export async function getUserByEmailOrId(
     logger.log(
       `User ${user.id} is a regular user. Getting default workspace for user ${user.id}`
     )
-    const defaultWorkspace = await prisma.workspace.findFirst({
+    let defaultWorkspace = await prisma.workspace.findFirst({
       where: {
         ownerId: user.id,
         isDefault: true
       }
     })
 
     if (!defaultWorkspace) {
-      logger.error(`Default workspace not found for user ${user.id}`)
-      throw new NotFoundException(
-        constructErrorBody(
-          'Default workspace not found',
-          'We could not find your default workspace. Please get in touch with us.'
-        )
+      logger.warn(`Default workspace not found for user ${user.id}`)
+
+      // Create the user's default workspace
+      logger.log(
+        `User ${user.id} has no default workspace. Creating default workspace.`
+      )
+      defaultWorkspace = await createWorkspace(
+        user,
+        { name: 'My Workspace' },
+        prisma,
+        slugGenerator,
+        true
+      )
+      logger.log(
+        `Created user ${user.id} with default workspace ${defaultWorkspace.id}`
       )
     }
 

apps/api/src/secret/dto/update.secret/update.secret.ts

@@ -1,12 +1,12 @@
 import { PartialType } from '@nestjs/swagger'
 import { CreateSecret } from '../create.secret/create.secret'
-import { IsBoolean, IsOptional } from 'class-validator'
+import { IsBoolean, IsOptional, IsString } from 'class-validator'
 export class UpdateSecret extends PartialType(CreateSecret) {
   @IsBoolean()
   @IsOptional()
   decryptValue?: boolean
 
-  @IsBoolean()
+  @IsString()
   @IsOptional()
   privateKey?: string
 }

apps/api/src/secret/secret.e2e.spec.ts

@@ -513,7 +513,7 @@ describe('Secret Controller Tests', () => {
 
       expect(response.statusCode).toBe(200)
       expect(response.json().updatedVersions.length).toBe(1)
-      expect(response.json().updatedVersions[0].value).toBe(
+      expect(response.json().updatedVersions[0].value).not.toBe(
         'Updated Secret 1 value'
       )
 

apps/api/src/secret/secret.service.ts

@@ -362,7 +362,10 @@ export class SecretService {
         dto.privateKey)
     ) {
       for (const version of updatedVersions) {
-        version.value = await decrypt(secret.project.privateKey, version.value)
+        version.value = await decrypt(
+          secret.project.privateKey ?? dto.privateKey,
+          version.value
+        )
       }
     }
 

apps/api/src/workspace-membership/workspace-membership.service.ts

@@ -66,7 +66,11 @@ export class WorkspaceMembershipService {
         authorities: [Authority.WORKSPACE_ADMIN]
       })
 
-    const otherUser = await getUserByEmailOrId(otherUserEmail, this.prisma)
+    const otherUser = await getUserByEmailOrId(
+      otherUserEmail,
+      this.prisma,
+      this.slugGenerator
+    )
 
     if (otherUser.id === user.id) {
       throw new BadRequestException(
@@ -360,7 +364,11 @@ export class WorkspaceMembershipService {
     otherUserEmail: User['email'],
     roleSlugs: WorkspaceRole['slug'][]
   ): Promise<void> {
-    const otherUser = await getUserByEmailOrId(otherUserEmail, this.prisma)
+    const otherUser = await getUserByEmailOrId(
+      otherUserEmail,
+      this.prisma,
+      this.slugGenerator
+    )
 
     const workspace =
       await this.authorizationService.authorizeUserAccessToWorkspace({
@@ -656,7 +664,11 @@ export class WorkspaceMembershipService {
     workspaceSlug: Workspace['slug'],
     inviteeEmail: User['email']
   ): Promise<void> {
-    const inviteeUser = await getUserByEmailOrId(inviteeEmail, this.prisma)
+    const inviteeUser = await getUserByEmailOrId(
+      inviteeEmail,
+      this.prisma,
+      this.slugGenerator
+    )
 
     const workspace =
       await this.authorizationService.authorizeUserAccessToWorkspace({
@@ -811,7 +823,11 @@ export class WorkspaceMembershipService {
     let otherUser: User | null = null
 
     try {
-      otherUser = await getUserByEmailOrId(otherUserEmail, this.prisma)
+      otherUser = await getUserByEmailOrId(
+        otherUserEmail,
+        this.prisma,
+        this.slugGenerator
+      )
     } catch (e) {
       return false
     }
@@ -836,7 +852,11 @@ export class WorkspaceMembershipService {
     )
 
     // Fetch the invitee user
-    const member = await getUserByEmailOrId(inviteeEmail, this.prisma)
+    const member = await getUserByEmailOrId(
+      inviteeEmail,
+      this.prisma,
+      this.slugGenerator
+    )
 
     const workspace =
       await this.authorizationService.authorizeUserAccessToWorkspace({