Skip to content

refactor: replace specific user getter methods with unified UserResolve #4946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

refactor: replace specific user getter methods with unified UserResolve #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions api/services/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,12 @@ func (s *service) AuthLocalUser(ctx context.Context, req *requests.AuthLocalUser
return nil, 0, "", NewErrAuthMethodNotAllowed(models.UserAuthMethodLocal.String())
}

var err error
var user *models.User

resolver := store.UserUsernameResolver
if req.Identifier.IsEmail() {
user, err = s.store.UserGetByEmail(ctx, strings.ToLower(string(req.Identifier)))
} else {
user, err = s.store.UserGetByUsername(ctx, strings.ToLower(string(req.Identifier)))
resolver = store.UserEmailResolver
}

user, err := s.store.UserResolve(ctx, resolver, strings.ToLower(string(req.Identifier)))
if err != nil {
return nil, 0, "", NewErrAuthUnathorized(nil)
}
Expand Down Expand Up @@ -330,7 +327,7 @@ func (s *service) AuthLocalUser(ctx context.Context, req *requests.AuthLocalUser
}

func (s *service) CreateUserToken(ctx context.Context, req *requests.CreateUserToken) (*models.UserAuthResponse, error) {
user, _, err := s.store.UserGetByID(ctx, req.UserID, false)
user, err := s.store.UserResolve(ctx, store.UserIDResolver, req.UserID)
if err != nil {
return nil, NewErrUserNotFound(req.UserID, err)
}
Expand Down
56 changes: 28 additions & 28 deletions api/services/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ func TestService_AuthLocalUser(t *testing.T) {
).
Once()
mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(nil, store.ErrNoDocuments).
Once()
},
Expand Down Expand Up @@ -891,7 +891,7 @@ func TestService_AuthLocalUser(t *testing.T) {
).
Once()
mock.
On("UserGetByEmail", ctx, "[email protected]").
On("UserResolve", ctx, store.UserEmailResolver, "[email protected]").
Return(nil, store.ErrNoDocuments).
Once()
},
Expand Down Expand Up @@ -944,7 +944,10 @@ func TestService_AuthLocalUser(t *testing.T) {
},
}

mock.On("UserGetByUsername", ctx, "john_doe").Return(user, nil).Once()
mock.
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
},
expected: Expected{
res: nil,
Expand Down Expand Up @@ -995,7 +998,10 @@ func TestService_AuthLocalUser(t *testing.T) {
},
}

mock.On("UserGetByUsername", ctx, "john_doe").Return(user, nil).Once()
mock.
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
},
expected: Expected{
res: nil,
Expand Down Expand Up @@ -1026,7 +1032,7 @@ func TestService_AuthLocalUser(t *testing.T) {
).
Once()
mock.
On("UserGetByEmail", ctx, "[email protected]").
On("UserResolve", ctx, store.UserEmailResolver, "[email protected]").
Return(
&models.User{
ID: "65fdd16b5f62f93184ec8a39",
Expand Down Expand Up @@ -1102,7 +1108,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1160,7 +1166,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1226,7 +1232,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1301,7 +1307,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1405,7 +1411,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1500,7 +1506,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1607,7 +1613,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1715,7 +1721,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1822,7 +1828,7 @@ func TestService_AuthLocalUser(t *testing.T) {
}

mock.
On("UserGetByUsername", ctx, "john_doe").
On("UserResolve", ctx, store.UserUsernameResolver, "john_doe").
Return(user, nil).
Once()
cacheMock.
Expand Down Expand Up @@ -1927,8 +1933,8 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: "00000000-0000-4000-0000-000000000000"},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
Return(nil, 0, store.ErrNoDocuments).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(nil, store.ErrNoDocuments).
Once()
},
expected: Expected{
Expand All @@ -1941,7 +1947,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: "00000000-0000-4000-0000-000000000000"},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -1962,7 +1968,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "",
},
},
0,
nil,
).
Once()
Expand All @@ -1981,7 +1986,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: "00000000-0000-4000-0000-000000000000"},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -2002,7 +2007,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "",
},
},
0,
nil,
).
Once()
Expand All @@ -2027,7 +2031,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: "00000000-0000-4000-0000-000000000000"},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -2048,7 +2052,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "",
},
},
0,
nil,
).
Once()
Expand Down Expand Up @@ -2079,7 +2082,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: "00000000-0000-4000-0000-000000000000"},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -2100,7 +2103,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "",
},
},
0,
nil,
).
Once()
Expand Down Expand Up @@ -2151,7 +2153,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: ""},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -2172,7 +2174,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "00000000-0000-4000-0000-000000000000",
},
},
0,
nil,
).
Once()
Expand Down Expand Up @@ -2218,7 +2219,7 @@ func TestCreateUserToken(t *testing.T) {
req: &requests.CreateUserToken{UserID: "000000000000000000000000", TenantID: ""},
requiredMocks: func(ctx context.Context) {
storeMock.
On("UserGetByID", ctx, "000000000000000000000000", false).
On("UserResolve", ctx, store.UserIDResolver, "000000000000000000000000").
Return(
&models.User{
ID: "000000000000000000000000",
Expand All @@ -2239,7 +2240,6 @@ func TestCreateUserToken(t *testing.T) {
PreferredNamespace: "",
},
},
0,
nil,
).
Once()
Expand Down
8 changes: 4 additions & 4 deletions api/services/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *service) AddNamespaceMember(ctx context.Context, req *requests.Namespac
return nil, NewErrNamespaceNotFound(req.TenantID, err)
}

user, _, err := s.store.UserGetByID(ctx, req.UserID, false)
user, err := s.store.UserResolve(ctx, store.UserIDResolver, req.UserID)
if err != nil || user == nil {
return nil, NewErrUserNotFound(req.UserID, err)
}
Expand All @@ -72,7 +72,7 @@ func (s *service) AddNamespaceMember(ctx context.Context, req *requests.Namespac
// In cloud instances, if the target user does not exist, we need to create a new user
// with the specified email. We use the inserted ID to identify the user once they complete
// the registration and accepts the invitation.
passiveUser, err := s.store.UserGetByEmail(ctx, strings.ToLower(req.MemberEmail))
passiveUser, err := s.store.UserResolve(ctx, store.UserEmailResolver, strings.ToLower(req.MemberEmail))
if err != nil {
if !envs.IsCloud() || !errors.Is(err, store.ErrNoDocuments) {
return nil, NewErrUserNotFound(req.MemberEmail, err)
Expand Down Expand Up @@ -162,7 +162,7 @@ func (s *service) UpdateNamespaceMember(ctx context.Context, req *requests.Names
return NewErrNamespaceNotFound(req.TenantID, err)
}

user, _, err := s.store.UserGetByID(ctx, req.UserID, false)
user, err := s.store.UserResolve(ctx, store.UserIDResolver, req.UserID)
if err != nil {
return NewErrUserNotFound(req.UserID, err)
}
Expand Down Expand Up @@ -199,7 +199,7 @@ func (s *service) RemoveNamespaceMember(ctx context.Context, req *requests.Names
return nil, NewErrNamespaceNotFound(req.TenantID, err)
}

user, _, err := s.store.UserGetByID(ctx, req.UserID, false)
user, err := s.store.UserResolve(ctx, store.UserIDResolver, req.UserID)
if err != nil {
return nil, NewErrUserNotFound(req.UserID, err)
}
Expand Down
Loading
Loading