sendnrw/pocket-id
2
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-10-14 21:59:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): update golangci-lint (#1833)

Browse Source
This commit is contained in:
Alessandro (Ale) Segala
2026-10-11 12:14:16 +02:00
committed by GitHub
parent 89827f076f
commit 7cc3a128c5
12 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/scimsync/service.go
+10 -5
View File
@@ -476,7 +476,7 @@ func (s *Service) syncGroups(ctx context.Context, provider ServiceProvider, grou
func (s *Service) syncUser(ctx context.Context, provider ServiceProvider, user model.User, userResource *ScimUser) (scimSyncAction, *ScimUser, error) {
// If user is not allowed for the client, delete it from SCIM provider
if userResource != nil && !oidc.IsUserGroupAllowedToAuthorize(user, provider.OidcClient) {
return scimActionDeleted, nil, s.deleteScimResource(ctx, provider, fmt.Sprintf("/Users/%s", url.PathEscape(userResource.ID)))
return scimActionDeleted, nil, s.deleteScimResource(ctx, provider, "/Users/"+url.PathEscape(userResource.ID))
}
payload := ScimUser{
@@ -505,11 +505,13 @@ func (s *Service) syncUser(ctx context.Context, provider ServiceProvider, user m
if user.LastModified().Before(userResource.GetMeta().LastModified) {
return scimActionNone, nil, nil
}
path := fmt.Sprintf("/Users/%s", url.PathEscape(userResource.GetID()))
path := "/Users/" + url.PathEscape(userResource.GetID())
userResource, err := updateScimResource(s, ctx, provider, path, payload)
if err != nil {
return scimActionNone, nil, err
}
return scimActionUpdated, userResource, nil
}
@@ -525,10 +527,11 @@ func (s *Service) syncUser(ctx context.Context, provider ServiceProvider, user m
func (s *Service) syncGroup(ctx context.Context, provider ServiceProvider, group model.UserGroup, groupResource *ScimGroup, userResources []ScimUser) (scimSyncAction, error) {
// If group is not allowed for the client, delete it from SCIM provider
if groupResource != nil && !groupAllowedForClient(group.ID, provider.OidcClient) {
err := s.deleteScimResource(ctx, provider, fmt.Sprintf("/Groups/%s", url.PathEscape(groupResource.GetID())))
err := s.deleteScimResource(ctx, provider, "/Groups/"+url.PathEscape(groupResource.GetID()))
if err != nil {
return scimActionNone, err
}
return scimActionDeleted, nil
}
@@ -560,11 +563,13 @@ func (s *Service) syncGroup(ctx context.Context, provider ServiceProvider, group
if group.LastModified().Before(groupResource.GetMeta().LastModified) {
return scimActionNone, nil
}
path := fmt.Sprintf("/Groups/%s", url.PathEscape(groupResource.GetID()))
path := "/Groups/" + url.PathEscape(groupResource.GetID())
_, err := updateScimResource(s, ctx, provider, path, groupPayload)
if err != nil {
return scimActionNone, err
}
return scimActionUpdated, nil
}
@@ -826,7 +831,7 @@ func (s *Service) scimRequest(ctx context.Context, provider ServiceProvider, met
}
}
return nil, fmt.Errorf("scim request retry attempts exceeded")
return nil, errors.New("scim request retry attempts exceeded")
}
func scimRetryDelay(retryAfter string, attempt int) time.Duration {
backend/internal/scimsync/sync_test.go
+1 -1
View File
@@ -414,7 +414,7 @@ func (m *mockSCIMTransport) RoundTrip(req *http.Request) (*http.Response, error)
func (m *mockSCIMTransport) validateRequest(req *http.Request, body []byte) string {
if req.URL.Scheme != "https" || req.URL.Host != "scim.example.test" {
return fmt.Sprintf("request used unexpected SCIM endpoint %s", req.URL.String())
return "request used unexpected SCIM endpoint " + req.URL.String()
}
if req.Header.Get("Accept") != mockSCIMRequestContentType {
return "request did not accept application/scim+json"