From 8588612cee91392ba65b6800e2f5f3588c4a56b3 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Fri, 13 Sep 2024 20:01:18 +0200
Subject: [PATCH] Fix billing services not accepting new subscriptions

---
 .../src/engine/core-modules/auth/auth.resolver.ts             | 2 +-
 .../src/engine/core-modules/auth/services/token.service.ts    | 4 ++--
 .../src/engine/core-modules/billing/stripe/stripe.service.ts  | 4 ++--
 .../src/engine/core-modules/user/user.resolver.ts             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
index 048870136..9533cddf6 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -124,7 +124,7 @@ export class AuthResolver {
     const transientToken = await this.tokenService.generateTransientToken(
       workspaceMember.id,
       user.id,
-      user.defaultWorkspace.id,
+      user.defaultWorkspaceId,
     );
 
     return { transientToken };
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
index abc0befea..9ff47fe99 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
@@ -97,7 +97,7 @@ export class TokenService {
       );
     }
 
-    const tokenWorkspaceId = workspaceId ?? user.defaultWorkspace.id;
+    const tokenWorkspaceId = workspaceId ?? user.defaultWorkspaceId;
     let tokenWorkspaceMemberId: string | undefined;
 
     if (
@@ -128,7 +128,7 @@ export class TokenService {
 
     const jwtPayload: JwtPayload = {
       sub: user.id,
-      workspaceId: workspaceId ? workspaceId : user.defaultWorkspace.id,
+      workspaceId: workspaceId ? workspaceId : user.defaultWorkspaceId,
       workspaceMemberId: tokenWorkspaceMemberId,
     };
 
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
index c62eb845f..a6b0d1799 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
@@ -6,8 +6,8 @@ import { AvailableProduct } from 'src/engine/core-modules/billing/interfaces/ava
 
 import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
 import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
-import { User } from 'src/engine/core-modules/user/user.entity';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
 
 @Injectable()
 export class StripeService {
@@ -93,7 +93,7 @@ export class StripeService {
       mode: 'subscription',
       subscription_data: {
         metadata: {
-          workspaceId: user.defaultWorkspace.id,
+          workspaceId: user.defaultWorkspaceId,
         },
         trial_period_days: this.environmentService.get(
           'BILLING_FREE_TRIAL_DURATION_IN_DAYS',
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index f779b23db..82d7b7c6d 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -103,7 +103,7 @@ export class UserResolver {
     if (workspaceMember && workspaceMember.avatarUrl) {
       const avatarUrlToken = await this.fileService.encodeFileToken({
         workspace_member_id: workspaceMember.id,
-        workspace_id: user.defaultWorkspace.id,
+        workspace_id: user.defaultWorkspaceId,
       });
 
       workspaceMember.avatarUrl = `${workspaceMember.avatarUrl}?token=${avatarUrlToken}`;