File tree 4 files changed +6
-6
lines changed
packages/twenty-server/src/engine/core-modules
4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ export class AuthResolver {
124
124
const transientToken = await this . tokenService . generateTransientToken (
125
125
workspaceMember . id ,
126
126
user . id ,
127
- user . defaultWorkspace . id ,
127
+ user . defaultWorkspaceId ,
128
128
) ;
129
129
130
130
return { transientToken } ;
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ export class TokenService {
97
97
) ;
98
98
}
99
99
100
- const tokenWorkspaceId = workspaceId ?? user . defaultWorkspace . id ;
100
+ const tokenWorkspaceId = workspaceId ?? user . defaultWorkspaceId ;
101
101
let tokenWorkspaceMemberId : string | undefined ;
102
102
103
103
if (
@@ -128,7 +128,7 @@ export class TokenService {
128
128
129
129
const jwtPayload : JwtPayload = {
130
130
sub : user . id ,
131
- workspaceId : workspaceId ? workspaceId : user . defaultWorkspace . id ,
131
+ workspaceId : workspaceId ? workspaceId : user . defaultWorkspaceId ,
132
132
workspaceMemberId : tokenWorkspaceMemberId ,
133
133
} ;
134
134
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ import { AvailableProduct } from 'src/engine/core-modules/billing/interfaces/ava
6
6
7
7
import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity' ;
8
8
import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity' ;
9
- import { User } from 'src/engine/core-modules/user/user.entity' ;
10
9
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service' ;
10
+ import { User } from 'src/engine/core-modules/user/user.entity' ;
11
11
12
12
@Injectable ( )
13
13
export class StripeService {
@@ -93,7 +93,7 @@ export class StripeService {
93
93
mode : 'subscription' ,
94
94
subscription_data : {
95
95
metadata : {
96
- workspaceId : user . defaultWorkspace . id ,
96
+ workspaceId : user . defaultWorkspaceId ,
97
97
} ,
98
98
trial_period_days : this . environmentService . get (
99
99
'BILLING_FREE_TRIAL_DURATION_IN_DAYS' ,
Original file line number Diff line number Diff line change @@ -103,7 +103,7 @@ export class UserResolver {
103
103
if ( workspaceMember && workspaceMember . avatarUrl ) {
104
104
const avatarUrlToken = await this . fileService . encodeFileToken ( {
105
105
workspace_member_id : workspaceMember . id ,
106
- workspace_id : user . defaultWorkspace . id ,
106
+ workspace_id : user . defaultWorkspaceId ,
107
107
} ) ;
108
108
109
109
workspaceMember . avatarUrl = `${ workspaceMember . avatarUrl } ?token=${ avatarUrlToken } ` ;
You can’t perform that action at this time.
0 commit comments