TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-10 09:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return userID on org setup (#3623)

Browse Source
This commit is contained in:
Livio Amstutz
2022-05-13 13:54:48 +02:00
committed by GitHub
parent f70990709b
commit 734cfdddae
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/grpc/admin/org.go
View File

@@ -57,7 +57,7 @@ func (s *Server) SetUpOrg(ctx context.Context, req *admin_pb.SetUpOrgRequest) (*
org := setUpOrgOrgToDomain(req.Org) //TODO: handle domain org := setUpOrgOrgToDomain(req.Org) //TODO: handle domain
_ = org _ = org
objectDetails, err := s.command.SetUpOrg(ctx, &command.OrgSetup{ userID, objectDetails, err := s.command.SetUpOrg(ctx, &command.OrgSetup{
Name: req.Org.Name, Name: req.Org.Name,
Human: human, Human: human,
}) })
@@ -66,6 +66,8 @@ func (s *Server) SetUpOrg(ctx context.Context, req *admin_pb.SetUpOrgRequest) (*
} }
return &admin_pb.SetUpOrgResponse{ return &admin_pb.SetUpOrgResponse{
Details: object.DomainToAddDetailsPb(objectDetails), Details: object.DomainToAddDetailsPb(objectDetails),
OrgId: objectDetails.ResourceOwner,
UserId: userID,
}, nil }, nil
} }

2
internal/api/ui/login/register_org_handler.go
View File

@@ -67,7 +67,7 @@ func (l *Login) handleRegisterOrgCheck(w http.ResponseWriter, r *http.Request) {
return return
} }
_ = userIDs //TODO: handle userIDs _ = userIDs //TODO: handle userIDs
_, err = l.command.SetUpOrg(ctx, data.toCommandOrg()) _, _, err = l.command.SetUpOrg(ctx, data.toCommandOrg())
if err != nil { if err != nil {
l.renderRegisterOrg(w, r, authRequest, data, err) l.renderRegisterOrg(w, r, authRequest, data, err)
return return

12
internal/command/org.go
View File

@@ -21,15 +21,15 @@ type OrgSetup struct {
Human AddHuman Human AddHuman
} }
func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (*domain.ObjectDetails, error) { func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (string, *domain.ObjectDetails, error) {
orgID, err := id.SonyFlakeGenerator.Next() orgID, err := id.SonyFlakeGenerator.Next()
if err != nil { if err != nil {
return nil, err return "", nil, err
} }
userID, err := id.SonyFlakeGenerator.Next() userID, err := id.SonyFlakeGenerator.Next()
if err != nil { if err != nil {
return nil, err return "", nil, err
} }
orgAgg := org.NewAggregate(orgID) orgAgg := org.NewAggregate(orgID)
@@ -41,14 +41,14 @@ func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (*domain.ObjectDet
c.AddOrgMemberCommand(orgAgg, userID, domain.RoleOrgOwner), c.AddOrgMemberCommand(orgAgg, userID, domain.RoleOrgOwner),
) )
if err != nil { if err != nil {
return nil, err return "", nil, err
} }
events, err := c.eventstore.Push(ctx, cmds...) events, err := c.eventstore.Push(ctx, cmds...)
if err != nil { if err != nil {
return nil, err return "", nil, err
} }
return &domain.ObjectDetails{ return userID, &domain.ObjectDetails{
Sequence: events[len(events)-1].Sequence(), Sequence: events[len(events)-1].Sequence(),
EventDate: events[len(events)-1].CreationDate(), EventDate: events[len(events)-1].CreationDate(),
ResourceOwner: orgID, ResourceOwner: orgID,