admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix billing services not accepting new subscriptions

Browse Source
This commit is contained in:
Charles Bochet
2024-09-13 20:01:18 +02:00
parent 523df5398a
commit 8588612cee
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ export class AuthResolver {
const transientToken = await this.tokenService.generateTransientToken(
workspaceMember.id,
user.id,
user.defaultWorkspace.id,
user.defaultWorkspaceId,
);
return { transientToken };

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

@ -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,
};

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

@ -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',

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

@ -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}`;