mirror of
https://github.com/pocket-id/pocket-id.git
synced 2026-10-04 08:49:03 +02:00
Claude
0e0187dbc6
Remove the AppConfigMiddleware that stored an app-config resolver in the request context and the FromCtx helper that read it back downstream. Handlers now load the app config from AppConfigService and pass it as an explicit argument to the service methods that need it, which then forward it further down the call chain. The webauthn and usersignup modules gain an AppConfigResolver dependency so their handlers can load the config the same way. The email SendEmail and LDAP SyncAll helpers drop their context-based variants in favor of the explicit-config versions. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ6SoJpmnLggZqactXxrak
100 lines
3.1 KiB
Go
100 lines
3.1 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/pocket-id/pocket-id/backend/internal/appconfig"
|
|
"github.com/pocket-id/pocket-id/backend/internal/dto"
|
|
"github.com/pocket-id/pocket-id/backend/internal/storage"
|
|
testutils "github.com/pocket-id/pocket-id/backend/internal/utils/testing"
|
|
)
|
|
|
|
func newTestUserService(t *testing.T) (*UserService, *UserGroupService) {
|
|
t.Helper()
|
|
|
|
db := testutils.NewDatabaseForTest(t)
|
|
|
|
fileStorage, err := storage.NewDatabaseStorage(db)
|
|
require.NoError(t, err)
|
|
|
|
userService := NewUserService(
|
|
db,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
NewCustomClaimService(db),
|
|
NewAppImagesService(map[string]string{}, fileStorage),
|
|
nil,
|
|
fileStorage,
|
|
)
|
|
groupService := NewUserGroupService(db, nil)
|
|
|
|
return userService, groupService
|
|
}
|
|
|
|
func TestCreateUserBumpsGroupUpdatedAt(t *testing.T) {
|
|
config := &appconfig.AppConfigModel{RequireUserEmail: "false"}
|
|
userService, groupService := newTestUserService(t)
|
|
|
|
group, err := groupService.Create(t.Context(), dto.UserGroupCreateDto{
|
|
Name: "members",
|
|
FriendlyName: "Members",
|
|
})
|
|
require.NoError(t, err)
|
|
require.Nil(t, group.UpdatedAt, "a freshly created group has no UpdatedAt yet")
|
|
|
|
// Create a user that is a member of the group
|
|
// This mirrors signing up via an invite link that adds the user to a group
|
|
email := "member@example.com"
|
|
_, err = userService.CreateUser(t.Context(), config, dto.UserCreateDto{
|
|
Username: "member",
|
|
Email: &email,
|
|
FirstName: "Group",
|
|
LastName: "Member",
|
|
UserGroupIds: []string{group.ID},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// The group's UpdatedAt must now be set
|
|
updated, err := groupService.Get(t.Context(), group.ID)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, updated.UpdatedAt, "creating a group member must bump the group's UpdatedAt")
|
|
require.False(t, updated.LastModified().Before(updated.CreatedAt.ToTime()), "group LastModified must not predate its CreatedAt after a membership change")
|
|
require.Len(t, updated.Users, 1, "the user should be a member of the group")
|
|
}
|
|
|
|
func TestCreateUserBumpsDefaultGroupUpdatedAt(t *testing.T) {
|
|
config := &appconfig.AppConfigModel{RequireUserEmail: "false"}
|
|
userService, groupService := newTestUserService(t)
|
|
|
|
group, err := groupService.Create(t.Context(), dto.UserGroupCreateDto{
|
|
Name: "default",
|
|
FriendlyName: "Default",
|
|
})
|
|
require.NoError(t, err)
|
|
require.Nil(t, group.UpdatedAt)
|
|
|
|
// Configure the group as a default signup group
|
|
defaultGroups, err := json.Marshal([]string{group.ID})
|
|
require.NoError(t, err)
|
|
config.SignupDefaultUserGroupIDs = appconfig.AppConfigValue(defaultGroups)
|
|
|
|
// Create a user without explicit group IDs, so the default groups apply
|
|
email := "default@example.com"
|
|
_, err = userService.CreateUser(t.Context(), config, dto.UserCreateDto{
|
|
Username: "defaultmember",
|
|
Email: &email,
|
|
FirstName: "Default",
|
|
LastName: "Member",
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
updated, err := groupService.Get(t.Context(), group.ID)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, updated.UpdatedAt, "adding a default group member must bump the group's UpdatedAt")
|
|
require.Len(t, updated.Users, 1)
|
|
}
|