Changes
2 changed files (+19/-15)
-
-
@@ -173,7 +173,7 @@ }), nil} } id, err := uuid.NewRandom() uuid, err := uuid.NewRandom() if err != nil { logger.Error("Failed to generate UUID", "error", err) return connect.NewResponse(&workspaceV2.CreateInitialAdminResponse{
-
@@ -185,14 +185,16 @@ },}), nil } id := "wu-" + uuid.String() keyID := make([]byte, 32) rand.Read(keyID) err = event.AppendEvents(tx, []*eventV1.Event{ workspaceEvent.ExpireAdminCreationPassword(), workspaceEvent.CreateUser(id.String(), name, displayName, keyID), workspaceEvent.GrantAdminAccess(id.String()), workspaceEvent.ConfigurePasswordLogin(id.String(), password), workspaceEvent.CreateUser(id, name, displayName, keyID), workspaceEvent.GrantAdminAccess(id), workspaceEvent.ConfigurePasswordLogin(id, password), }) if err != nil { logger.Error("Failed to append events", "error", err)
-
@@ -228,8 +230,8 @@ }), nil} for _, u := range users.Projection.Users { if u.GetId() == id.String() { logger.Debug("Created an initial admin user", "id", id.String()) if u.GetId() == id { logger.Debug("Created an initial admin user", "id", id) return connect.NewResponse(&workspaceV2.CreateInitialAdminResponse{ Result: &workspaceV2.CreateInitialAdminResponse_Ok{
-
@@ -242,7 +244,7 @@logger.Error( "Creation of user succeeded, but the user does not exist in projection", "id", id.String(), id, ) return connect.NewResponse(&workspaceV2.CreateInitialAdminResponse{
-
-
-
@@ -161,18 +161,20 @@ }), nil} } id, err := uuid.NewRandom() uuid, err := uuid.NewRandom() if err != nil { logger.Error("Failed to generate UUID", "error", err) return createUserSystemError("Unable to issue a new ID"), nil } id := "wu-" + uuid.String() keyID := make([]byte, 32) rand.Read(keyID) err = event.AppendEvents(tx, []*eventV1.Event{ workspaceEvent.CreateUser(id.String(), name, displayName, keyID), workspaceEvent.ConfigurePasswordLogin(id.String(), password), workspaceEvent.CreateUser(id, name, displayName, keyID), workspaceEvent.ConfigurePasswordLogin(id, password), }) if err != nil { logger.Error("Failed to append user creation events", "error", err)
-
@@ -181,7 +183,7 @@ }if req.Msg.GetIsAdmin() { err := event.AppendEvents(tx, []*eventV1.Event{ workspaceEvent.GrantAdminAccess(id.String()), workspaceEvent.GrantAdminAccess(id), }) if err != nil { logger.Error("Failed to append adming grant events", "error", err)
-
@@ -257,7 +259,7 @@ }} err := event.AppendEvents(tx, []*eventV1.Event{ workspaceEvent.GrantPermission(id.String(), permissions), workspaceEvent.GrantPermission(id, permissions), }) if err != nil { logger.Error("Failed to append a permissions grant event", "error", err)
-
@@ -276,8 +278,8 @@ return createUserSystemError("Database error"), nil} for _, u := range users.Projection.Users { if u.GetId() == id.String() { logger.Debug("Created a new user", "id", id.String()) if u.GetId() == id { logger.Debug("Created a new user", "id", id) return connect.NewResponse(&workspaceV2.CreateUserResponse{ Result: &workspaceV2.CreateUserResponse_Ok{
-
@@ -290,7 +292,7 @@logger.Error( "Creation of user succeeded, but the user does not exist in projection", "id", id.String(), id, ) return createUserSystemError("Database error"), nil
-