8000 Serve all core schemas on /Schemas endpoint by hrenard · Pull Request #140 · elimity-com/scim · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Serve all core schemas on /Schemas endpoint #140

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Serve all core schemas on /Schemas endpoint #140

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
9 changes: 6 additions & 3 deletions handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,18 +762,21 @@ func TestServerSchemasEndpoint(t *testing.T) {
var response listResponse
assertUnmarshalNoError(t, json.Unmarshal(rr.Body.Bytes(), &response))

expectedLen := 3
expectedLen := 6
assertEqual(t, expectedLen, response.TotalResults)
assertLen(t, response.Resources, expectedLen)

resourceIDs := make([]string, 3)
resourceIDs := make([]string, 6)
for i, resource := range response.Resources {
resourceType, ok := resource.(map[string]interface{})
assertTypeOk(t, ok, "object")
resourceIDs[i] = resourceType["id"].(string)
}

assertEqualStrings(t, []string{
"urn:ietf:params:scim:schemas:core:2.0:Schema",
"urn:ietf:params:scim:schemas:core:2.0:ResourceType",
"urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig",
"urn:ietf:params:scim:schemas:core:2.0:User",
"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User",
"urn:ietf:params:scim:schemas:core:2.0:Group",
Expand All @@ -798,7 +801,7 @@ func TestServerSchemasEndpointFilter(t *testing.T) {
var response listResponse
assertUnmarshalNoError(t, json.Unmarshal(rr.Body.Bytes(), &response))
assertLen(t, response.Resources, 1)
assertEqual(t, 3, response.TotalResults)
assertEqual(t, 6, response.TotalResults)
}

func TestServerServiceProviderConfigHandler(t *testing.T) {
Expand Down
157 changes: 157 additions & 0 deletions schema/schemas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,3 +685,160 @@ func ResourceTypeSchema() Schema {
Name: optional.NewString("Resource Type"),
}
}

// ServiceProviderConfig returns the Resource Type Schema.
// RFC: https://tools.ietf.org/html/rfc7643#section-5
func ServiceProviderConfigSchema() Schema {
return Schema{
Attributes: []CoreAttribute{
SimpleCoreAttribute(SimpleStringParams(StringParams{
Description: optional.NewString("An HTTP-addressable URL pointing to the service provider's human-consumable help documentation."),
Mutability: AttributeMutabilityReadOnly(),
Name: "documentationUri",
Required: false,
})),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies PATCH configuration options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "patch",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies bulk configuration options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "bulk",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
SimpleNumberParams(NumberParams{
Description: optional.NewString("An integer value specifying the maximum number of operations."),
Mutability: AttributeMutabilityReadOnly(),
Name: "maxOperations",
Required: true,
}),
SimpleNumberParams(NumberParams{
Description: optional.NewString("An integer value specifying the maximum payload size in bytes."),
Mutability: AttributeMutabilityReadOnly(),
Name: "maxPayloadSize",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies FILTER options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "filter",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
SimpleNumberParams(NumberParams{
Description: optional.NewString("An integer value specifying the maximum number of resources returned in a response."),
Mutability: AttributeMutabilityReadOnly(),
Name: "maxResults",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies configuration options related to changing a password."),
Mutability: AttributeMutabilityReadOnly(),
Name: "changePassword",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies Sort configuration options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "sort",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies ETag configuration options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "etag",
Required: true,
SubAttributes: []SimpleParams{
SimpleBooleanParams(BooleanParams{
Description: optional.NewString("A Boolean value specifying whether or not the operation is supported."),
Mutability: AttributeMutabilityReadOnly(),
Name: "supported",
Required: true,
}),
},
}),
ComplexCoreAttribute(ComplexParams{
Description: optional.NewString("A complex type that specifies ETag configuration options."),
Mutability: AttributeMutabilityReadOnly(),
Name: "authenticationSchemes",
Required: true,
MultiValued: true,
SubAttributes: []SimpleParams{
SimpleStringParams(StringParams{
Description: optional.NewString("The authentication scheme. This specification defines the values 'oauth', 'oauth2', 'oauthbearertoken', 'httpbasic', and 'httpdigest'."),
Mutability: AttributeMutabilityReadOnly(),
Name: "type",
Required: true,
}),
SimpleStringParams(StringParams{
Description: optional.NewString("The common authentication scheme name, e.g., HTTP Basic."),
Mutability: AttributeMutabilityReadOnly(),
Name: "name",
Required: true,
}),
SimpleStringParams(StringParams{
Description: optional.NewString("A description of the authentication scheme."),
Mutability: AttributeMutabilityReadOnly(),
Name: "description",
Required: true,
}),
SimpleStringParams(StringParams{
Description: optional.NewString("An HTTP-addressable URL pointing to the authentication scheme's specification."),
Mutability: AttributeMutabilityReadOnly(),
Name: "specUri",
}),
SimpleStringParams(StringParams{
Description: optional.NewString("An HTTP-addressable URL pointing to the authentication scheme's usage documentation."),
Mutability: AttributeMutabilityReadOnly(),
Name: "documentationUri",
}),
},
}),
},
Description: optional.NewString("SCIM provides a schema for representing the service provider's configuration."),
ID: "urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig",
Name: optional.NewString("Service Provider Config"),
}
}
12 changes: 11 additions & 1 deletion server.go
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ func (s Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {

// getSchema extracts the schemas from the resources types defined in the server with given id.
func (s Server) getSchema(id string) schema.Schema {
switch id {
case "urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig":
return schema.ServiceProviderConfigSchema()
case "urn:ietf:params:scim:schemas:core:2.0:ResourceType":
return schema.ResourceTypeSchema()
case "urn:ietf:params:scim:schemas:core:2.0:Schema":
return schema.Definition()
}
for _, resourceType := range s.ResourceTypes {
if resourceType.Schema.ID == id {
return resourceType.Schema
Expand All @@ -148,7 +156,9 @@ func (s Server) getSchema(id string) schema.Schema {
// getSchemas extracts all the schemas from the resources types defined in the server. Duplicate IDs will be ignored.
func (s Server) getSchemas() []schema.Schema {
ids := make([]string, 0)
schemas := make([]schema.Schema, 0)
schemas := []schema.Schema{
schema.Definition(), schema.ResourceTypeSchema(), schema.ServiceProviderConfigSchema(),
}
for _, resourceType := range s.ResourceTypes {
if !contains(ids, resourceType.Schema.ID) {
schemas = append(schemas, resourceType.Schema)
Expand Down
0