Skip to content

Commit 5cbc45b

Browse files
committed
fix(account): user cannot be created in multitenant
1 parent 72a0857 commit 5cbc45b

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

account/accountusecase/accountinteractor/workspace.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ func (i *Workspace) Create(ctx context.Context, name string, firstUser workspace
4545
return nil, accountinterfaces.ErrInvalidOperator
4646
}
4747

48-
return Run1(ctx, operator, i.repos, Usecase().Transaction(), func(ctx context.Context) (*workspace.Workspace, error) {
49-
if len(strings.TrimSpace(name)) == 0 {
50-
return nil, user.ErrInvalidName
51-
}
48+
if len(strings.TrimSpace(name)) == 0 {
49+
return nil, user.ErrInvalidName
50+
}
5251

53-
firstUsers, err := i.userquery.FetchByID(ctx, []user.ID{firstUser})
54-
if err != nil || len(firstUsers) == 0 {
55-
if err == nil {
56-
return nil, rerror.ErrNotFound
57-
}
58-
return nil, err
52+
firstUsers, err := i.userquery.FetchByID(ctx, []user.ID{firstUser})
53+
if err != nil || len(firstUsers) == 0 {
54+
if err == nil {
55+
return nil, rerror.ErrNotFound
5956
}
57+
return nil, err
58+
}
6059

60+
return Run1(ctx, operator, i.repos, Usecase().Transaction(), func(ctx context.Context) (*workspace.Workspace, error) {
6161
ws, err := workspace.New().
6262
NewID().
6363
Name(name).
@@ -119,6 +119,11 @@ func (i *Workspace) AddUserMember(ctx context.Context, workspaceID workspace.ID,
119119
return nil, accountinterfaces.ErrInvalidOperator
120120
}
121121

122+
ul, err := i.userquery.FetchByID(ctx, maps.Keys(users))
123+
if err != nil {
124+
return nil, err
125+
}
126+
122127
return Run1(ctx, operator, i.repos, Usecase().Transaction().WithOwnableWorkspaces(workspaceID), func(ctx context.Context) (*workspace.Workspace, error) {
123128
ws, err := i.repos.Workspace.FindByID(ctx, workspaceID)
124129
if err != nil {
@@ -129,11 +134,6 @@ func (i *Workspace) AddUserMember(ctx context.Context, workspaceID workspace.ID,
129134
return nil, workspace.ErrCannotModifyPersonalWorkspace
130135
}
131136

132-
ul, err := i.userquery.FetchByID(ctx, maps.Keys(users))
133-
if err != nil {
134-
return nil, err
135-
}
136-
137137
if i.enforceMemberCount != nil {
138138
if err := i.enforceMemberCount(ctx, ws, ul, operator); err != nil {
139139
return nil, err

0 commit comments

Comments
 (0)