-
Notifications
You must be signed in to change notification settings - Fork 320
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4966 from mpmadhavig/user-response
Add groups param to users endpoint results
- Loading branch information
Showing
2 changed files
with
72 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1178,6 +1178,76 @@ definitions: | |
| - type: "default" | ||
| value: "Internal/everyone" | ||
|
|
||
| UsersResponseObject: | ||
| type: object | ||
| required: | ||
| - meta | ||
| properties: | ||
| meta: | ||
| type: object | ||
| properties: | ||
| created: | ||
| type: string | ||
| example: "2018-08-17T10:34:29Z" | ||
| location: | ||
| type: string | ||
| example: "https://localhost:9443/scim2/Users/008bba85-451d-414b-87de-c03b5a1f4217" | ||
| lastModified: | ||
| type: string | ||
| example: "2018-08-17T10:34:29Z" | ||
| resourceType: | ||
| type: string | ||
| example: User | ||
| schemas: | ||
| type: object | ||
| example: | ||
| - urn:ietf:params:scim:schemas:core:2.0:User | ||
| - urn:ietf:params:scim:schemas:extension:enterprise:2.0:User | ||
| username: | ||
| type: string | ||
| example: "PRIMARY/kim" | ||
| id: | ||
| type: string | ||
| example: "008bba85-451d-414b-87de-c03b5a1f4217" | ||
| name: | ||
| type: object | ||
| properties: | ||
| givenName: | ||
| type: string | ||
| example: "Kim" | ||
| familyName: | ||
| type: string | ||
| example: "Berry" | ||
| emails: | ||
| type: array | ||
| items: | ||
| type: object | ||
| example: | ||
| - type: "home" | ||
| value: "[email protected]" | ||
| primary: true | ||
| - type: "work" | ||
| value: "[email protected]" | ||
| urn:ietf:params:scim:schemas:extension:enterprise:2.0:User: | ||
| type: object | ||
| properties: | ||
| employeeNumber: | ||
| type: string | ||
| example: "1234A" | ||
| manager: | ||
| type: object | ||
| properties: | ||
| value: | ||
| type: string | ||
| example: "Taylor" | ||
| groups: | ||
| type: array | ||
| items: | ||
| type: object | ||
| example: | ||
| type: "admin" | ||
| value: "98ad283c-06e3-4bbd-8d05-a97ec76278a8" | ||
| $ref : "https://localhost:9443/scim2/Groups/98ad283c-06e3-4bbd-8d05-a97ec76278a8" | ||
| #----------------------------------------------------- | ||
| # The User Update Object | ||
| #----------------------------------------------------- | ||
|
|
@@ -1656,7 +1726,7 @@ definitions: | |
| Resources: | ||
| type: array | ||
| items: | ||
| $ref: "#/definitions/UserResponseObject" | ||
| $ref: "#/definitions/UsersResponseObject" | ||
|
|
||
| #----------------------------------------------------- | ||
| # Search Request Object- User | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -439,7 +439,7 @@ supported across multiple user stores. | |
| <strong>Response</strong> | ||
| </div> | ||
| <div class="codeContent panelContent pdl"> | ||
| <div class="sourceCode" id="cb3" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Confluence" data-theme="Confluence" style="brush: java; gutter: false; theme: Confluence"><pre class="sourceCode java"><code class="sourceCode java"><a class="sourceLine" id="cb3-1" title="1">{<span class="st">"totalResults"</span>:<span class="dv">1</span>,<span class="st">"startIndex"</span>:<span class="dv">1</span>,<span class="st">"itemsPerPage"</span>:<span class="dv">1</span>,<span class="st">"schemas"</span>:[<span class="st">"urn:ietf:params:scim:api:messages:2.0:ListResponse"</span>],<span class="st">"Resources"</span>:[{<span class="st">"emails"</span>:[{<span class="st">"type"</span>:<span class="st">"work"</span>,<span class="st">"value"</span>:<span class="st">"[email protected]"</span>},{<span class="st">"type"</span>:<span class="st">"home"</span>,<span class="st">"value"</span>:<span class="st">"[email protected]"</span>}],<span class="st">"meta"</span>:{<span class="st">"created"</span>:<span class="st">"2018-08-15T14:55:23Z"</span>,<span class="st">"location"</span>:<span class="st">"https://localhost:9443/scim2/Users/c8c821ba-1200-495e-a775-79b260e717bd"</span>,<span class="st">"lastModified"</span>:<span class="st">"2018-08-15T14:55:23Z"</span>,<span class="st">"resourceType"</span>:<span class="st">"User"</span>},<span class="st">"roles"</span>:[{<span class="st">"type"</span>:<span class="st">"default"</span>,<span class="st">"value"</span>:<span class="st">"Internal/everyone"</span>}],<span class="st">"name"</span>:{<span class="st">"givenName"</span>:<span class="st">"kim"</span>,<span class="st">"familyName"</span>:<span class="st">"jackson"</span>},<span class="st">"id"</span>:<span class="st">"c8c821ba-1200-495e-a775-79b260e717bd"</span>,<span class="st">"userName"</span>:<span class="st">"kim"</span>}]}</a></code></pre></div> | ||
| <div class="sourceCode" id="cb3" data-syntaxhighlighter-params="brush: java; gutter: false; theme: Confluence" data-theme="Confluence" style="brush: java; gutter: false; theme: Confluence"><pre class="sourceCode java"><code class="sourceCode java"><a class="sourceLine" id="cb3-1" title="1">{<span class="st">"totalResults"</span>:<span class="dv">1</span>,<span class="st">"startIndex"</span>:<span class="dv">1</span>,<span class="st">"itemsPerPage"</span>:<span class="dv">1</span>,<span class="st">"schemas"</span>:[<span class="st">"urn:ietf:params:scim:api:messages:2.0:ListResponse"</span>],<span class="st">"Resources"</span>:[{<span class="st">"emails"</span>:[{<span class="st">"type"</span>:<span class="st">"work"</span>,<span class="st">"value"</span>:<span class="st">"[email protected]"</span>},{<span class="st">"type"</span>:<span class="st">"home"</span>,<span class="st">"value"</span>:<span class="st">"[email protected]"</span>}],<span class="st">"meta"</span>:{<span class="st">"created"</span>:<span class="st">"2018-08-15T14:55:23Z"</span>,<span class="st">"location"</span>:<span class="st">"https://localhost:9443/scim2/Users/c8c821ba-1200-495e-a775-79b260e717bd"</span>,<span class="st">"lastModified"</span>:<span class="st">"2018-08-15T14:55:23Z"</span>,<span class="st">"resourceType"</span>:<span class="st">"User"</span>},<span class="st">"groups"</span>:[{<span class="st">"display"</span>:<span class="st">"admin"</span>,<span class="st">"value"</span>:<span class="st">"74f4be74-36bc-4bec-8689-d03c36e4a106"</span>,<span class="st">"$ref"</span>:<span class="st">"https://localhost:9443/scim2/Groups/74f4be74-36bc-4bec-8689-d03c36e4a106"</span>}],<span class="st">"name"</span>:{<span class="st">"givenName"</span>:<span class="st">"kim"</span>,<span class="st">"familyName"</span>:<span class="st">"jackson"</span>},<span class="st">"id"</span>:<span class="st">"c8c821ba-1200-495e-a775-79b260e717bd"</span>,<span class="st">"userName"</span>:<span class="st">"kim"</span>}]}</a></code></pre></div> | ||
| </div> | ||
| </div> | ||
| </div></td> | ||
|
|
||