Merge pull request #1563 from yashsinghcodes/quick-fix

a quick fix for SHUFFLE_DEFAULT_USERNAME doesn't set up account

backend/go-app/main.go

@@ -4009,22 +4009,32 @@ func runInitEs(ctx context.Context) {
 			log.Printf("[DEBUG] Creating org for default user %s", username)
 			orgId := uuid.NewV4().String()
 			orgSetupName := "default"
+			tmpOrg := shuffle.OrgMini{
+				Name: orgSetupName,
+				Id:   orgId,
+			}
+			err = createNewUser(username, password, "admin", apikey, tmpOrg)
+			if err != nil {
+				log.Printf("[ERROR] Failed to create default user %s: %s", username, err)
+			} else {
+				log.Printf("[INFO] Successfully created user %s", username)
+			}
+
+			user, err := shuffle.GetUser(ctx, username)
 			newOrg := shuffle.Org{
 				Name:      orgSetupName,
 				Id:        orgId,
 				Org:       orgSetupName,
-				Users:     []shuffle.User{},
+				Users:     []shuffle.User{*user},
 				Roles:     []string{"admin", "user"},
 				CloudSync: false,
 			}
 
 			err = shuffle.SetOrg(ctx, newOrg, newOrg.Id)
-			setUsers := false
 			if err != nil {
-				log.Printf("[WARNING] Failed setting organization when creating original user: %s", err)
+				log.Printf("[ERROR] Failed setting organization when creating original user: %s", err)
 			} else {
 				log.Printf("[DEBUG] Successfully created the default org with id %s!", orgId)
-				setUsers = true
 
 				item := shuffle.Environment{
 					Name:    defaultEnv,
@@ -4039,20 +4049,6 @@ func runInitEs(ctx context.Context) {
 					log.Printf("[WARNING] Failed setting up new environment")
 				}
 			}
-
-			if setUsers {
-				tmpOrg := shuffle.OrgMini{
-					Name: orgSetupName,
-					Id:   orgId,
-				}
-
-				err = createNewUser(username, password, "admin", apikey, tmpOrg)
-				if err != nil {
-					log.Printf("[INFO] Failed to create default user %s: %s", username, err)
-				} else {
-					log.Printf("[INFO] Successfully created user %s", username)
-				}
-			}
 		}
 	} else {
 		for _, user := range users {