backend: ユーザがいない場合のログインユーザ取得レスポンス

Changes

2 changed files (+34/-6)

• packages/backend/services/workspace/get_login_user.go
  • @@ -43,12 +43,6 @@ "service", "yamori.workspace.v2.WorkspaceService",
    "method", "GetLoginUser", ) - header := req.Header() - token, err := s.core.LoadTokenFromCookie(&header) - if err != nil || token == nil { - return getLoginUserAuthError(), nil - } - tx, err := s.core.DB.Begin() if err != nil { logger.Error("Failed to begin transaction", "error", err)
  • @@ -71,6 +65,20 @@
    if err := event.UpdateProjections(tx, users, secret); err != nil { logger.Error("Failed to update projections", "error", err) return getLoginUserSystemError("Database error"), nil + } + + if len(users.Projection.Users) == 0 { + return connect.NewResponse(&workspaceV2.GetLoginUserResponse{ + Result: &workspaceV2.GetLoginUserResponse_NoUserInWorkspace{ + NoUserInWorkspace: &errorV1.AuthenticationError{}, + }, + }), nil + } + + header := req.Header() + token, err := s.core.LoadTokenFromCookie(&header) + if err != nil || token == nil { + return getLoginUserAuthError(), nil } user, err := token.FindUser(secret, users)
• packages/backend/tests/workspace/v2/get_login_user_test.go
  • @@ -62,3 +62,23 @@ typeName := reflect.Indirect(reflect.ValueOf(res.Msg.Result))
    t.Errorf("Expected authentication_error, got %s", typeName.Type().Name()) } } + + func TestGetLoginUserNoUsers(t *testing.T) { + server := setup(t) + + client := v2connect.NewWorkspaceServiceClient(server.Client(), server.URL()) + + res, err := client.GetLoginUser( + context.Background(), + connect.NewRequest(&workspaceV2.GetLoginUserRequest{}), + ) + if err != nil { + t.Fatal(err) + } + + _, ok := res.Msg.Result.(*workspaceV2.GetLoginUserResponse_NoUserInWorkspace) + if !ok { + typeName := reflect.Indirect(reflect.ValueOf(res.Msg.Result)) + t.Errorf("Expected no_user_in_workspace, got %s", typeName.Type().Name()) + } + }