mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-20 14:34:25 +00:00
LarsandGitHub
1915d35605
# Which Problems Are Solved
- Adds support for the list users SCIM v2 endpoint
# How the Problems Are Solved
- Adds support for the list users SCIM v2 endpoints under `GET
/scim/v2/{orgID}/Users` and `POST /scim/v2/{orgID}/Users/.search`
# Additional Changes
- adds a new function `SearchUserMetadataForUsers` to the query layer to
query a metadata keyset for given user ids
- adds a new function `NewUserMetadataExistsQuery` to the query layer to
query a given metadata key value pair exists
- adds a new function `CountUsers` to the query layer to count users
without reading any rows
- handle `ErrorAlreadyExists` as scim errors `uniqueness`
- adds `NumberLessOrEqual` and `NumberGreaterOrEqual` query comparison
methods
- adds `BytesQuery` with `BytesEquals` and `BytesNotEquals` query
comparison methods
# Additional Context
Part of #8140
Supported fields for scim filters:
* `meta.created`
* `meta.lastModified`
* `id`
* `username`
* `name.familyName`
* `name.givenName`
* `emails` and `emails.value`
* `active` only eq and ne
* `externalId` only eq and ne
84 lines
2.3 KiB
Go
84 lines
2.3 KiB
Go
package resources
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"slices"
|
|
|
|
"github.com/gorilla/mux"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/scim/serrors"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type ResourceHandlerAdapter[T ResourceHolder] struct {
|
|
handler ResourceHandler[T]
|
|
}
|
|
|
|
func NewResourceHandlerAdapter[T ResourceHolder](handler ResourceHandler[T]) *ResourceHandlerAdapter[T] {
|
|
return &ResourceHandlerAdapter[T]{
|
|
handler,
|
|
}
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) Create(r *http.Request) (T, error) {
|
|
entity, err := adapter.readEntityFromBody(r)
|
|
if err != nil {
|
|
return entity, err
|
|
}
|
|
|
|
return adapter.handler.Create(r.Context(), entity)
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) Replace(r *http.Request) (T, error) {
|
|
entity, err := adapter.readEntityFromBody(r)
|
|
if err != nil {
|
|
return entity, err
|
|
}
|
|
|
|
id := mux.Vars(r)["id"]
|
|
return adapter.handler.Replace(r.Context(), id, entity)
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) Delete(r *http.Request) error {
|
|
id := mux.Vars(r)["id"]
|
|
return adapter.handler.Delete(r.Context(), id)
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) List(r *http.Request) (*ListResponse[T], error) {
|
|
request, err := readListRequest(r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return adapter.handler.List(r.Context(), request)
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) Get(r *http.Request) (T, error) {
|
|
id := mux.Vars(r)["id"]
|
|
return adapter.handler.Get(r.Context(), id)
|
|
}
|
|
|
|
func (adapter *ResourceHandlerAdapter[T]) readEntityFromBody(r *http.Request) (T, error) {
|
|
entity := adapter.handler.NewResource()
|
|
err := json.NewDecoder(r.Body).Decode(entity)
|
|
if err != nil {
|
|
if serrors.IsScimOrZitadelError(err) {
|
|
return entity, err
|
|
}
|
|
|
|
return entity, serrors.ThrowInvalidSyntax(zerrors.ThrowInvalidArgumentf(nil, "SCIM-ucrjson", "Could not deserialize json: %v", err.Error()))
|
|
}
|
|
|
|
resource := entity.GetResource()
|
|
if resource == nil {
|
|
return entity, serrors.ThrowInvalidSyntax(zerrors.ThrowInvalidArgument(nil, "SCIM-xxrjson", "Could not get resource, is the schema correct?"))
|
|
}
|
|
|
|
if !slices.Contains(resource.Schemas, adapter.handler.SchemaType()) {
|
|
return entity, serrors.ThrowInvalidSyntax(zerrors.ThrowInvalidArgumentf(nil, "SCIM-xxrschema", "Expected schema %v is not provided", adapter.handler.SchemaType()))
|
|
}
|
|
|
|
return entity, nil
|
|
}
|