chore: finish main merge

Author: supalarry

apps/api/v2/src/lib/modules/oauth.module.ts

@@ -1,13 +1,20 @@
 import { PrismaAccessCodeRepository } from "@/lib/repositories/prisma-access-code.repository";
 import { PrismaOAuthClientRepository } from "@/lib/repositories/prisma-oauth-client.repository";
+import { PrismaOAuthRefreshTokenRepository } from "@/lib/repositories/prisma-oauth-refresh-token.repository";
 import { PrismaTeamRepository } from "@/lib/repositories/prisma-team.repository";
 import { OAuthService } from "@/lib/services/oauth.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { Module } from "@nestjs/common";
 
 @Module({
   imports: [PrismaModule],
-  providers: [PrismaAccessCodeRepository, PrismaOAuthClientRepository, PrismaTeamRepository, OAuthService],
+  providers: [
+    PrismaAccessCodeRepository,
+    PrismaOAuthClientRepository,
+    PrismaOAuthRefreshTokenRepository,
+    PrismaTeamRepository,
+    OAuthService,
+  ],
   exports: [OAuthService],
 })
 export class oAuthServiceModule {}

apps/api/v2/src/lib/repositories/prisma-oauth-refresh-token.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaOAuthRefreshTokenRepository as PrismaOAuthRefreshTokenRepositoryLib } from "@calcom/platform-libraries/repositories";
+import type { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaOAuthRefreshTokenRepository extends PrismaOAuthRefreshTokenRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/services/oauth.service.ts

@@ -3,6 +3,7 @@ import { OAuthService as BaseOAuthService } from "@calcom/platform-libraries";
 import { Injectable } from "@nestjs/common";
 import { PrismaAccessCodeRepository } from "@/lib/repositories/prisma-access-code.repository";
 import { PrismaOAuthClientRepository } from "@/lib/repositories/prisma-oauth-client.repository";
+import { PrismaOAuthRefreshTokenRepository } from "@/lib/repositories/prisma-oauth-refresh-token.repository";
 import { PrismaTeamRepository } from "@/lib/repositories/prisma-team.repository";
 import type { OAuth2ExchangeInput } from "@/modules/auth/oauth2/inputs/exchange.input";
 import { OAuth2ExchangeConfidentialInput } from "@/modules/auth/oauth2/inputs/exchange.input";
@@ -15,11 +16,13 @@ export class OAuthService extends BaseOAuthService {
   constructor(
     accessCodeRepository: PrismaAccessCodeRepository,
     oAuthClientRepository: PrismaOAuthClientRepository,
+    oAuthRefreshTokenRepository: PrismaOAuthRefreshTokenRepository,
     teamsRepository: PrismaTeamRepository
   ) {
     super({
       accessCodeRepository: accessCodeRepository,
       oAuthClientRepository: oAuthClientRepository,
+      oAuthRefreshTokenRepository: oAuthRefreshTokenRepository,
       teamsRepository: teamsRepository,
     });
   }

apps/api/v2/src/modules/auth/oauth2/controllers/oauth2.controller.e2e-spec.ts

@@ -92,16 +92,15 @@ describe("OAuth2 Controller Endpoints", () => {
 
     /** Generate an authorization code directly via the service (bypasses HTTP layer). */
     async function generateAuthCode(
-      scopes: AccessScope[] = [AccessScope.READ_BOOKING],
-      teamSlug?: string
+      scopes: AccessScope[] = [AccessScope.READ_BOOKING]
     ): Promise<string> {
       const result = await oAuthService.generateAuthorizationCode(
         testClientId,
         authenticatedUser.id,
         testRedirectUri,
         scopes,
         undefined,
-        teamSlug ?? team.slug
+        team.slug ?? undefined
       );
       const redirectUrl = new URL(result.redirectUrl);
       return redirectUrl.searchParams.get("code") as string;

apps/web/playwright/oauth/oauth-refresh-tokens.e2e.ts

@@ -5,7 +5,6 @@ import jwt from "jsonwebtoken";
 
 import { test } from "../lib/fixtures";
 import type { PrismaClient } from "@calcom/prisma";
-import { expect } from "@playwright/test";
 import jwt from "jsonwebtoken";
 import { test } from "../lib/fixtures";
 

packages/platform/libraries/repositories.ts

@@ -16,3 +16,4 @@ export { PrismaBookingAttendeeRepository } from "@calcom/features/bookings/repos
 export { ProfileRepository as PrismaProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 export { AccessCodeRepository as PrismaAccessCodeRepository } from "@calcom/features/oauth/repositories/AccessCodeRepository";
 export { OAuthClientRepository as PrismaOAuthClientRepository } from "@calcom/features/oauth/repositories/OAuthClientRepository";
+export { OAuthRefreshTokenRepository as PrismaOAuthRefreshTokenRepository } from "@calcom/features/oauth/repositories/OAuthRefreshTokenRepository";