a quick fix for #1510 where SHUFFLE_DEFAULT_USERNAME doesn't set up account
This commit is contained in:
+14
-13
@@ -4009,11 +4009,23 @@ func runInitEs(ctx context.Context) {
|
|||||||
log.Printf("[DEBUG] Creating org for default user %s", username)
|
log.Printf("[DEBUG] Creating org for default user %s", username)
|
||||||
orgId := uuid.NewV4().String()
|
orgId := uuid.NewV4().String()
|
||||||
orgSetupName := "default"
|
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{
|
newOrg := shuffle.Org{
|
||||||
Name: orgSetupName,
|
Name: orgSetupName,
|
||||||
Id: orgId,
|
Id: orgId,
|
||||||
Org: orgSetupName,
|
Org: orgSetupName,
|
||||||
Users: []shuffle.User{},
|
Users: []shuffle.User{*user},
|
||||||
Roles: []string{"admin", "user"},
|
Roles: []string{"admin", "user"},
|
||||||
CloudSync: false,
|
CloudSync: false,
|
||||||
}
|
}
|
||||||
@@ -4021,7 +4033,7 @@ func runInitEs(ctx context.Context) {
|
|||||||
err = shuffle.SetOrg(ctx, newOrg, newOrg.Id)
|
err = shuffle.SetOrg(ctx, newOrg, newOrg.Id)
|
||||||
setUsers := false
|
setUsers := false
|
||||||
if err != nil {
|
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 {
|
} else {
|
||||||
log.Printf("[DEBUG] Successfully created the default org with id %s!", orgId)
|
log.Printf("[DEBUG] Successfully created the default org with id %s!", orgId)
|
||||||
setUsers = true
|
setUsers = true
|
||||||
@@ -4041,17 +4053,6 @@ func runInitEs(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if setUsers {
|
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 {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user