software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add org member in creation

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 18:53:18 -05:00
parent 579c4db188
commit a20e056a9b
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/internal/controller/zitadelcluster_controller.go
View File

@@ -584,7 +584,6 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
adminUser, err := managementClient.GetUserByLoginNameGlobal(ctx, &management.GetUserByLoginNameGlobalRequest{ adminUser, err := managementClient.GetUserByLoginNameGlobal(ctx, &management.GetUserByLoginNameGlobalRequest{
LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)), LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)),
}) })
fmt.Println(adminUser)
if err != nil { if err != nil {
return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err) return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err)
} }
@@ -610,6 +609,16 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
if err != nil { if err != nil {
return ctrl.Result{}, fmt.Errorf("Error adding human user: %v", err) return ctrl.Result{}, fmt.Errorf("Error adding human user: %v", err)
} }
{
if _, err := managementClient.AddOrgMember(middleware.SetOrgID(ctx, org.Org.Id), &management.AddOrgMemberRequest{
UserId: userid,
Roles: []string{
"ORG_OWNER",
},
}); err != nil {
return ctrl.Result{}, fmt.Errorf("Error adding org member: %v", err)
}
}
} else { } else {
userid = adminUser.User.Id userid = adminUser.User.Id
} }
@@ -623,16 +632,6 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
return ctrl.Result{}, fmt.Errorf("Error setting password for member: %v", err) return ctrl.Result{}, fmt.Errorf("Error setting password for member: %v", err)
} }
} }
{
if _, err := managementClient.UpdateOrgMember(middleware.SetOrgID(ctx, org.Org.Id), &management.UpdateOrgMemberRequest{
UserId: userid,
Roles: []string{
"ORG_OWNER",
},
}); err != nil {
return ctrl.Result{}, fmt.Errorf("Error adding org member: %v", err)
}
}
patch := client.MergeFrom(zitadel.DeepCopy()) patch := client.MergeFrom(zitadel.DeepCopy())
zitadel.Status.InitialAdminId = userid zitadel.Status.InitialAdminId = userid