implemented suggestions

keyshade-xyz · Apr 10, 2024 · f131958 · f131958
1 parent 98d88b1
commit f131958
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 44 deletions.
diff --git a/.github/workflows/validate-api.yaml b/.github/workflows/validate-api.yaml
@@ -58,6 +58,7 @@ jobs:
           GITHUB_CLIENT_ID: dummy
           GITHUB_CLIENT_SECRET: dummy
           GITHUB_CALLBACK_URL: dummy
+          REDIS_URL: redis://localhost:6379
         run: pnpm run e2e:api
 
       - name: Upload e2e test coverage reports to Codecov

diff --git a/apps/api/src/auth/guard/auth/auth.guard.ts b/apps/api/src/auth/guard/auth/auth.guard.ts
@@ -133,7 +133,7 @@ export class AuthGuard implements CanActivate {
   }
 
   private getAuthType(request: any): 'JWT' | 'API_KEY' | 'NONE' {
-    const headers = request.headers || request.handshake.headers // For websockets
+    const headers = this.getHeaders(request)
     if (headers[X_KEYSHADE_TOKEN]) {
       return 'API_KEY'
     }
@@ -144,16 +144,20 @@ export class AuthGuard implements CanActivate {
   }
 
   private extractTokenFromHeader(request: any): string | undefined {
-    const headers = request.headers || request.handshake.headers // For websockets
+    const headers = this.getHeaders(request)
     const [type, token] = headers.authorization?.split(' ') ?? []
     return type === 'Bearer' ? token : undefined
   }
 
   private extractApiKeyFromHeader(request: any): string | undefined {
-    const headers = request.headers || request.handshake.headers // For websockets
+    const headers = this.getHeaders(request)
     if (Array.isArray(headers[X_KEYSHADE_TOKEN])) {
       throw new Error('Bad auth')
     }
     return headers[X_KEYSHADE_TOKEN]
   }
+
+  private getHeaders(request: any): any {
+    return request.headers || request.handshake.headers // For websockets
+  }
 }
diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -80,7 +80,14 @@ async function initializeNestApp() {
   const logger = new CustomLogger()
   const app = await NestFactory.create(AppModule, {
     logger,
-    cors: false
+    cors: {
+      origin: process.env.CORS_ORIGIN || '*',
+      credentials: true,
+      methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
+      allowedHeaders: 'Content-Type, Accept, Authorization, x-keyshade-token',
+      preflightContinue: false,
+      optionsSuccessStatus: 204
+    }
   })
   app.use(Sentry.Handlers.requestHandler())
   app.use(Sentry.Handlers.tracingHandler())

diff --git a/apps/api/src/secret/service/secret.service.ts b/apps/api/src/secret/service/secret.service.ts
@@ -595,15 +595,21 @@ export class SecretService {
         }
       })
 
-      await this.redis.publish(
-        CHANGE_NOTIFIER_RSC,
-        JSON.stringify({
-          environmentId: secret.environmentId,
-          name: secret.name,
-          value: dto.value,
-          isSecret: true
-        })
-      )
+      try {
+        await this.redis.publish(
+          CHANGE_NOTIFIER_RSC,
+          JSON.stringify({
+            environmentId: secret.environmentId,
+            name: secret.name,
+            value: dto.value,
+            isSecret: true
+          })
+        )
+      } catch (error) {
+        this.logger.error(
+          this.logger.error(`Error publishing secret update to Redis: ${error}`)
+        )
+      }
     } else {
       result = await this.prisma.secret.update({
         where: {
@@ -698,15 +704,21 @@ export class SecretService {
       }
     })
 
-    await this.redis.publish(
-      CHANGE_NOTIFIER_RSC,
-      JSON.stringify({
-        environmentId: secret.environmentId,
-        name: secret.name,
-        value: secret.versions[rollbackVersion - 1].value,
-        isSecret: true
-      })
-    )
+    try {
+      await this.redis.publish(
+        CHANGE_NOTIFIER_RSC,
+        JSON.stringify({
+          environmentId: secret.environmentId,
+          name: secret.name,
+          value: secret.versions[rollbackVersion - 1].value,
+          isSecret: true
+        })
+      )
+    } catch (error) {
+      this.logger.error(
+        this.logger.error(`Error publishing secret update to Redis: ${error}`)
+      )
+    }
 
     await createEvent(
       {

diff --git a/apps/api/src/socket/redis.adapter.ts b/apps/api/src/socket/redis.adapter.ts
@@ -1,5 +1,5 @@
 import { IoAdapter } from '@nestjs/platform-socket.io'
-import { ServerOptions } from 'socket.io'
+import { Server, ServerOptions } from 'socket.io'
 import { createAdapter } from '@socket.io/redis-adapter'
 import { createClient } from 'redis'
 
@@ -18,7 +18,7 @@ export class RedisIoAdapter extends IoAdapter {
     this.adapterConstructor = createAdapter(pubClient, subClient)
   }
 
-  createIOServer(port: number, options?: ServerOptions): any {
+  createIOServer(port: number, options?: ServerOptions): Server {
     const server = super.createIOServer(port, options)
     server.adapter(this.adapterConstructor)
     return server

diff --git a/apps/api/src/variable/service/variable.service.ts b/apps/api/src/variable/service/variable.service.ts
@@ -542,15 +542,19 @@ export class VariableService {
         }
       })
 
-      await this.redis.publish(
-        CHANGE_NOTIFIER_RSC,
-        JSON.stringify({
-          environmentId: variable.environmentId,
-          name: variable.name,
-          value: dto.value,
-          isSecret: false
-        })
-      )
+      try {
+        await this.redis.publish(
+          CHANGE_NOTIFIER_RSC,
+          JSON.stringify({
+            environmentId: variable.environmentId,
+            name: variable.name,
+            value: dto.value,
+            isSecret: false
+          })
+        )
+      } catch (error) {
+        this.logger.error(`Error publishing variable update to Redis: ${error}`)
+      }
     } else {
       result = await this.prisma.variable.update({
         where: {
@@ -646,15 +650,19 @@ export class VariableService {
       }
     })
 
-    await this.redis.publish(
-      CHANGE_NOTIFIER_RSC,
-      JSON.stringify({
-        environmentId: variable.environmentId,
-        name: variable.name,
-        value: variable.versions[rollbackVersion - 1].value,
-        isSecret: false
-      })
-    )
+    try {
+      await this.redis.publish(
+        CHANGE_NOTIFIER_RSC,
+        JSON.stringify({
+          environmentId: variable.environmentId,
+          name: variable.name,
+          value: variable.versions[rollbackVersion - 1].value,
+          isSecret: false
+        })
+      )
+    } catch (error) {
+      this.logger.error(`Error publishing variable update to Redis: ${error}`)
+    }
 
     await createEvent(
       {

diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
@@ -15,7 +15,7 @@
     "strictNullChecks": false,
     "noImplicitAny": false,
     "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true
   }
 }