Skip to content

Commit 8588612

Browse files
committed
Fix billing services not accepting new subscriptions
1 parent 523df53 commit 8588612

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export class AuthResolver {
124124
const transientToken = await this.tokenService.generateTransientToken(
125125
workspaceMember.id,
126126
user.id,
127-
user.defaultWorkspace.id,
127+
user.defaultWorkspaceId,
128128
);
129129

130130
return { transientToken };

packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class TokenService {
9797
);
9898
}
9999

100-
const tokenWorkspaceId = workspaceId ?? user.defaultWorkspace.id;
100+
const tokenWorkspaceId = workspaceId ?? user.defaultWorkspaceId;
101101
let tokenWorkspaceMemberId: string | undefined;
102102

103103
if (
@@ -128,7 +128,7 @@ export class TokenService {
128128

129129
const jwtPayload: JwtPayload = {
130130
sub: user.id,
131-
workspaceId: workspaceId ? workspaceId : user.defaultWorkspace.id,
131+
workspaceId: workspaceId ? workspaceId : user.defaultWorkspaceId,
132132
workspaceMemberId: tokenWorkspaceMemberId,
133133
};
134134

packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { AvailableProduct } from 'src/engine/core-modules/billing/interfaces/ava
66

77
import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
88
import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
9-
import { User } from 'src/engine/core-modules/user/user.entity';
109
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
10+
import { User } from 'src/engine/core-modules/user/user.entity';
1111

1212
@Injectable()
1313
export class StripeService {
@@ -93,7 +93,7 @@ export class StripeService {
9393
mode: 'subscription',
9494
subscription_data: {
9595
metadata: {
96-
workspaceId: user.defaultWorkspace.id,
96+
workspaceId: user.defaultWorkspaceId,
9797
},
9898
trial_period_days: this.environmentService.get(
9999
'BILLING_FREE_TRIAL_DURATION_IN_DAYS',

packages/twenty-server/src/engine/core-modules/user/user.resolver.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export class UserResolver {
103103
if (workspaceMember && workspaceMember.avatarUrl) {
104104
const avatarUrlToken = await this.fileService.encodeFileToken({
105105
workspace_member_id: workspaceMember.id,
106-
workspace_id: user.defaultWorkspace.id,
106+
workspace_id: user.defaultWorkspaceId,
107107
});
108108

109109
workspaceMember.avatarUrl = `${workspaceMember.avatarUrl}?token=${avatarUrlToken}`;

0 commit comments

Comments
 (0)