refactor: oauth-client module and repository use new jwt service

calcom · Jan 3, 2024 · d213820 · d213820
1 parent a057d06
commit d213820
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/apps/api/v2/src/modules/oauth-clients/oauth-client.module.ts b/apps/api/v2/src/modules/oauth-clients/oauth-client.module.ts
@@ -1,4 +1,3 @@
-import { getEnv } from "@/env";
 import { AuthModule } from "@/modules/auth/auth.module";
 import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import { OAuthClientUsersController } from "@/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller";
@@ -11,17 +10,10 @@ import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UsersModule } from "@/modules/users/users.module";
 import { Global, Module } from "@nestjs/common";
-import { JwtModule } from "@nestjs/jwt";
 
 @Global()
 @Module({
-  imports: [
-    PrismaModule,
-    AuthModule,
-    UsersModule,
-    MembershipsModule,
-    JwtModule.register({ secret: getEnv("JWT_SECRET") }),
-  ],
+  imports: [PrismaModule, AuthModule, UsersModule, MembershipsModule],
   providers: [OAuthClientRepository, OAuthClientCredentialsGuard, TokensRepository, OAuthFlowService],
   controllers: [OAuthClientUsersController, OAuthClientsController, OAuthFlowController],
   exports: [OAuthClientRepository, OAuthClientCredentialsGuard],

diff --git a/apps/api/v2/src/modules/oauth-clients/oauth-client.repository.ts b/apps/api/v2/src/modules/oauth-clients/oauth-client.repository.ts
@@ -1,7 +1,7 @@
+import { JwtService } from "@/modules/jwt/jwt.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { JwtService } from "@nestjs/jwt";
 import type { PlatformOAuthClient } from "@prisma/client";
 
 import type { CreateOAuthClientInput } from "@calcom/platform-types";
@@ -18,7 +18,7 @@ export class OAuthClientRepository {
     return this.dbWrite.prisma.platformOAuthClient.create({
       data: {
         ...data,
-        secret: await this.jwtService.signAsync(JSON.stringify(data)),
+        secret: this.jwtService.sign(data),
         organizationId,
       },
     });