feat(cli): Added CLI

.gitignore

@@ -54,4 +54,6 @@ Thumbs.db
 .env.sentry-build-plugin
 
 # turbo
-.turbo
+.turbo
+
+keyshade.json

apps/api/package.json

@@ -35,13 +35,11 @@
     "@nestjs/websockets": "^10.3.7",
     "@socket.io/redis-adapter": "^8.3.0",
     "@supabase/supabase-js": "^2.39.6",
-    "chalk": "^4.1.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cookie-parser": "^1.4.6",
     "eccrypto": "^1.1.6",
     "minio": "^8.0.0",
-    "moment": "^2.30.1",
     "nodemailer": "^6.9.9",
     "passport-github2": "^0.1.12",
     "passport-gitlab2": "^5.0.0",

apps/api/src/api-key/controller/api-key.controller.ts

@@ -68,4 +68,18 @@ export class ApiKeyController {
       search
     )
   }
+
+  @Get('/access/live-updates')
+  @RequiredApiKeyAuthorities(
+    Authority.READ_SECRET,
+    Authority.READ_VARIABLE,
+    Authority.READ_ENVIRONMENT,
+    Authority.READ_PROJECT,
+    Authority.READ_WORKSPACE
+  )
+  async canAccessLiveUpdates() {
+    return {
+      canAccessLiveUpdates: true
+    }
+  }
 }

apps/api/src/api-key/service/api-key.service.ts

@@ -43,18 +43,31 @@ export class ApiKeyService {
   }
 
   async updateApiKey(user: User, apiKeyId: string, dto: UpdateApiKey) {
+    const apiKey = await this.prisma.apiKey.findUnique({
+      where: {
+        id: apiKeyId,
+        userId: user.id
+      }
+    })
+
+    if (!apiKey) {
+      throw new NotFoundException(`API key with id ${apiKeyId} not found`)
+    }
+
+    const existingAuthorities = new Set(apiKey.authorities)
+    dto.authorities &&
+      dto.authorities.forEach((auth) => existingAuthorities.add(auth))
+
     const updatedApiKey = await this.prisma.apiKey.update({
       where: {
         id: apiKeyId,
         userId: user.id
       },
       data: {
         name: dto.name,
-        authorities: dto.authorities
-          ? {
-              set: dto.authorities
-            }
-          : undefined,
+        authorities: {
+          set: Array.from(existingAuthorities)
+        },
         expiresAt: dto.expiresAfter
           ? addHoursToDate(dto.expiresAfter)
           : undefined

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

@@ -75,7 +75,7 @@ export class AuthGuard implements CanActivate {
       if (authType === 'API_KEY') {
         const apiKeyValue = this.extractApiKeyFromHeader(request)
         if (!apiKeyValue) {
-          throw new ForbiddenException()
+          throw new ForbiddenException('No API key provided')
         }
 
         const apiKey = await this.prisma.apiKey.findUnique({
@@ -88,7 +88,7 @@ export class AuthGuard implements CanActivate {
         })
 
         if (!apiKey) {
-          throw new ForbiddenException()
+          throw new ForbiddenException('Invalid API key')
         }
 
         user = apiKey.user

apps/api/src/secret/controller/secret.controller.ts

@@ -87,4 +87,18 @@ export class SecretController {
       search
     )
   }
+
+  @Get('/all/:projectId/:environmentId')
+  @RequiredApiKeyAuthorities(Authority.READ_SECRET)
+  async getAllSecretsOfEnvironment(
+    @CurrentUser() user: User,
+    @Param('projectId') projectId: string,
+    @Param('environmentId') environmentId: string
+  ) {
+    return await this.secretService.getAllSecretsOfProjectAndEnvironment(
+      user,
+      projectId,
+      environmentId
+    )
+  }
 }

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

@@ -27,6 +27,10 @@ import { RedisClientType } from 'redis'
 import { REDIS_CLIENT } from '../../provider/redis.provider'
 import { CHANGE_NOTIFIER_RSC } from '../../socket/change-notifier.socket'
 import { AuthorityCheckerService } from '../../common/authority-checker.service'
+import {
+  ChangeNotification,
+  ChangeNotificationEvent
+} from 'src/socket/socket.types'
 
 @Injectable()
 export class SecretService {
@@ -213,6 +217,9 @@ export class SecretService {
             select: {
               environmentId: true,
               value: true
+            },
+            orderBy: {
+              version: 'desc'
             }
           }
         }
@@ -238,7 +245,6 @@ export class SecretService {
           take: 1
         })
 
-        // Create the new version
         // Create the new version
         op.push(
           this.prisma.secretVersion.create({
@@ -268,8 +274,8 @@ export class SecretService {
               environmentId: entry.environmentId,
               name: updatedSecret.name,
               value: entry.value,
-              isSecret: true
-            })
+              isPlaintext: true
+            } as ChangeNotificationEvent)
           )
         } catch (error) {
           this.logger.error(`Error publishing secret update to Redis: ${error}`)
@@ -314,6 +320,8 @@ export class SecretService {
       prisma: this.prisma
     })
 
+    const project = secret.project
+
     // Filter the secret versions by the environment
     secret.versions = secret.versions.filter(
       (version) => version.environmentId === environmentId
@@ -351,9 +359,11 @@ export class SecretService {
         JSON.stringify({
           environmentId,
           name: secret.name,
-          value: secret.versions[rollbackVersion - 1].value,
-          isSecret: true
-        })
+          value: project.storePrivateKey
+            ? await decrypt(project.privateKey, secret.versions[0].value)
+            : secret.versions[0].value,
+          isPlaintext: !project.storePrivateKey
+        } as ChangeNotificationEvent)
       )
     } catch (error) {
       this.logger.error(`Error publishing secret update to Redis: ${error}`)
@@ -416,6 +426,63 @@ export class SecretService {
     this.logger.log(`User ${user.id} deleted secret ${secret.id}`)
   }
 
+  async getAllSecretsOfProjectAndEnvironment(
+    user: User,
+    projectId: Project['id'],
+    environmentId: Environment['id']
+  ) {
+    // Fetch the project
+    const project =
+      await this.authorityCheckerService.checkAuthorityOverProject({
+        userId: user.id,
+        entity: { id: projectId },
+        authority: Authority.READ_SECRET,
+        prisma: this.prisma
+      })
+
+    const secrets = await this.prisma.secret.findMany({
+      where: {
+        projectId,
+        versions: {
+          some: {
+            environmentId
+          }
+        }
+      },
+      include: {
+        lastUpdatedBy: {
+          select: {
+            id: true,
+            name: true
+          }
+        },
+        versions: {
+          where: {
+            environmentId
+          },
+          orderBy: {
+            version: 'desc'
+          },
+          take: 1
+        }
+      }
+    })
+
+    const response: ChangeNotification[] = []
+
+    for (const secret of secrets) {
+      response.push({
+        name: secret.name,
+        value: project.storePrivateKey
+          ? await decrypt(project.privateKey, secret.versions[0].value)
+          : secret.versions[0].value,
+        isPlaintext: !project.storePrivateKey
+      })
+    }
+
+    return response
+  }
+
   async getAllSecretsOfProject(
     user: User,
     projectId: Project['id'],
@@ -470,6 +537,7 @@ export class SecretService {
             id: Environment['id']
           }
           value: SecretVersion['value']
+          version: SecretVersion['version']
         }[]
       }
     >()
@@ -513,7 +581,8 @@ export class SecretService {
             },
             value: decryptValue
               ? await decrypt(project.privateKey, latestVersion.value)
-              : latestVersion.value
+              : latestVersion.value,
+            version: latestVersion.version
           })
         } else {
           secretsWithEnvironmentalValues.set(secret.id, {
@@ -526,7 +595,8 @@ export class SecretService {
                 },
                 value: decryptValue
                   ? await decrypt(project.privateKey, latestVersion.value)
-                  : latestVersion.value
+                  : latestVersion.value,
+                version: latestVersion.version
               }
             ]
           })

apps/api/src/socket/change-notifier.socket.ts

@@ -141,10 +141,18 @@ export default class ChangeNotifier
     // Add the client to the environment
     await this.addClientToEnvironment(client, environment.id)
 
+    const clientRegisteredResponse = {
+      workspaceId: workspace.id,
+      projectId: project.id,
+      environmentId: environment.id
+    }
+
     // Send ACK to client
-    client.send({
-      status: 200
-    })
+    client.emit('client-registered', clientRegisteredResponse)
+
+    this.logger.log(
+      `Client registered: ${client.id} for configuration: ${clientRegisteredResponse}`
+    )
   }
 
   private async addClientToEnvironment(client: Socket, environmentId: string) {

apps/api/src/socket/socket.types.ts

@@ -4,10 +4,16 @@ export interface ChangeNotifierRegistration {
   environmentName: string
 }
 
+export interface ClientRegisteredResponse {
+  workspaceId: string
+  projectId: string
+  environmentId: string
+}
+
 export interface ChangeNotification {
   name: string
   value: string
-  isSecret: boolean
+  isPlaintext: boolean
 }
 
 export interface ChangeNotificationEvent extends ChangeNotification {

apps/api/src/variable/controller/variable.controller.ts

@@ -13,6 +13,7 @@ import { RequiredApiKeyAuthorities } from '../../decorators/required-api-key-aut
 import { Authority, User } from '@prisma/client'
 import { CurrentUser } from '../../decorators/user.decorator'
 import { CreateVariable } from '../dto/create.variable/create.variable'
+import { UpdateVariable } from '../dto/update.variable/update.variable'
 
 @Controller('variable')
 export class VariableController {
@@ -33,7 +34,7 @@ export class VariableController {
   async updateVariable(
     @CurrentUser() user: User,
     @Param('variableId') variableId: string,
-    @Body() dto: CreateVariable
+    @Body() dto: UpdateVariable
   ) {
     return await this.variableService.updateVariable(user, variableId, dto)
   }
@@ -84,4 +85,18 @@ export class VariableController {
       search
     )
   }
+
+  @Get('/all/:projectId/:environmentId')
+  @RequiredApiKeyAuthorities(Authority.READ_VARIABLE)
+  async getAllSecretsOfEnvironment(
+    @CurrentUser() user: User,
+    @Param('projectId') projectId: string,
+    @Param('environmentId') environmentId: string
+  ) {
+    return await this.variableService.getAllVariablesOfProjectAndEnvironment(
+      user,
+      projectId,
+      environmentId
+    )
+  }
 }