Get user using getuserbyloginnameglobal
[ZITADOPER-1]
This commit is contained in:
@@ -581,18 +581,14 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
|
||||
if err != nil {
|
||||
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 {
|
||||
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
|
||||
for _, u := range users.Result {
|
||||
fmt.Println(u)
|
||||
if admin.AccountName == u.UserName {
|
||||
userid = u.Id
|
||||
}
|
||||
}
|
||||
if userid == "" {
|
||||
var userid string
|
||||
if adminUser.User == nil {
|
||||
resp, err := managementClient.AddHumanUser(middleware.SetOrgID(ctx, org.Org.Id), &management.AddHumanUserRequest{
|
||||
UserName: admin.AccountName,
|
||||
Profile: &management.AddHumanUserRequest_Profile{
|
||||
@@ -613,6 +609,8 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
|
||||
if err != nil {
|
||||
return ctrl.Result{}, fmt.Errorf("Error adding human user: %v", err)
|
||||
}
|
||||
} else {
|
||||
userid = adminUser.User.Id
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user