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

Get user using getuserbyloginnameglobal

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 18:06:22 -05:00
parent 681adc3c6a
commit e35f170207
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,18 +581,14 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
if err != nil { if err != nil {
return ctrl.Result{}, fmt.Errorf("Error getting org: %v", err) return ctrl.Result{}, fmt.Errorf("Error getting org: %v", err)
} }
users, err := managementClient.ListUsers(middleware.SetOrgID(ctx, org.Org.Id), &management.ListUsersRequest{}) adminUser, err := managementClient.GetUserByLoginNameGlobal(ctx, &management.GetUserByLoginNameGlobalRequest{
LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)),
})
if err != nil { if err != nil {
return ctrl.Result{}, fmt.Errorf("Error getting users: %v", err) return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err)
} }
userid := zitadel.Status.InitialAdminId var userid string
for _, u := range users.Result { if adminUser.User == nil {
fmt.Println(u)
if admin.AccountName == u.UserName {
userid = u.Id
}
}
if userid == "" {
resp, err := managementClient.AddHumanUser(middleware.SetOrgID(ctx, org.Org.Id), &management.AddHumanUserRequest{ resp, err := managementClient.AddHumanUser(middleware.SetOrgID(ctx, org.Org.Id), &management.AddHumanUserRequest{
UserName: admin.AccountName, UserName: admin.AccountName,
Profile: &management.AddHumanUserRequest_Profile{ Profile: &management.AddHumanUserRequest_Profile{
@@ -613,6 +609,8 @@ 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)
} }
} else {
userid = adminUser.User.Id
} }
{ {