Skip to content

Commit 8abd822

Browse files
Merge branch 'master' into ws02-next-mattr
2 parents 1871bde + f90fa00 commit 8abd822

File tree

132 files changed

+7119
-2013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+7119
-2013
lines changed

.vale/styles/Microsoft/Acronyms.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ exceptions:
6969
- SAML
7070
- JWT
7171
- UTC
72+
- FAPI
73+
- LDAP
74+
- JWKS
75+
- TLS

en/asgardeo/docs/apis/organization-apis/restapis/org-user-store.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ paths:
2121
2222
To retrieve the available user store classes/types, use the **/o/api/server/v1/userstores/meta/types** API.
2323
24+
When creating a user store, it will be **disabled by default**. To enable the user store, include the `disabled` property set to `false` in the properties of the payload.
25+
2426
2527
<b>Scope(Permission) required:</b> `internal_org_userstore_create`
2628
responses:

en/asgardeo/docs/apis/restapis/scim2-users.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,12 @@ paths:
7979
tags:
8080
- Users Endpoint
8181
summary: Create User
82-
description: "This API creates a user and returns the user details along with the user's unique ID.\n\n
83-
- <b>Scope(Permission) required:</b> ``internal_user_mgt_create``\n\n
84-
- <b>Flow type:</b> Client Credentials OAuth Flow"
82+
description: "This API creates a user and returns the user details along with\
83+
\ the user's unique ID.\n\n\
84+
You can create a user in two ways:\n\
85+
1. **Set a password for the user**: Include the `password` parameter in the request body to set an initial password for the user.\n\
86+
2. **Invite the user to set their own password**: Set the `askPassword` parameter to `true` in the `urn:scim:wso2:schema` extension. An email will be sent to the user with instructions to set their password and confirm their account.\n\n
87+
\n<b>Scope(Permission) required:</b>`internal_user_mgt_create`\n \n"
8588
operationId: createUser
8689
parameters:
8790
- name: attributes
@@ -585,6 +588,8 @@ components:
585588
example: Taylor
586589
urn:scim:wso2:schema:
587590
type: object
591+
required:
592+
- askPassword
588593
properties:
589594
askPassword:
590595
type: boolean

en/asgardeo/docs/apis/restapis/user-store.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ paths:
2121
2222
To retrieve the available user store classes/types, use the **api/server/v1/userstores/meta/types** API.
2323
24+
When creating a user store, it will be **disabled by default**. To enable the user store, include the `disabled` property set to `false` in the properties of the payload.
2425
2526
<b>Scope(Permission) required:</b> `internal_userstore_create`
2627
responses:

en/asgardeo/docs/apis/scim2/scim2-users-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
template: templates/redoc.html
33
---
44

5-
<redoc spec-url="{{base_path}}/apis/restapis/scim2-users.yaml" theme='{{redoc_theme}}'></redoc>
5+
<redoc expand-single-schema-field="true" schema-expansion-level="3" spec-url="{{base_path}}/apis/restapis/scim2-users.yaml" theme='{{redoc_theme}}'></redoc>

en/asgardeo/docs/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api-contract.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

en/asgardeo/docs/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.yaml renamed to en/asgardeo/docs/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.0.yaml

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ openapi: 3.0.1
22
info:
33
title: API contract for pre-issue access token action
44
description: This API defines the REST API contract for a service that implements logic to extend the access token issuance flow of Asgardeo.
5-
version: v1
5+
version: v1.0
66
security:
77
- BasicAuth: []
88
- BearerAuth: []
@@ -77,8 +77,6 @@ components:
7777
$ref: '#/components/schemas/Request'
7878
tenant:
7979
$ref: '#/components/schemas/Tenant'
80-
organization:
81-
$ref: '#/components/schemas/IssuerOrganization'
8280
user:
8381
$ref: '#/components/schemas/User'
8482
userStore:
@@ -139,53 +137,16 @@ components:
139137
example:
140138
bar.com
141139
description: This property represents the tenant under which the token request is being processed.
142-
IssuerOrganization:
143-
type: object
144-
required:
145-
- id
146-
- name
147-
properties:
148-
id:
149-
type: string
150-
description: The unique identifier of the organization.
151-
example:
152-
f14962ba-e198-4261-88dd-ea0e25121f83
153-
name:
154-
type: string
155-
description: The name of the organization.
156-
example:
157-
bar.com
158-
description: This property represents the organization which is issuing the access token.
159140
User:
160141
type: object
161142
required:
162143
- id
163-
- organization
164144
properties:
165145
id:
166146
type: string
167147
description: Defines the unique identifier of the user.
168148
example: e204849c-4ec2-41f1-8ff7-ec1ebff02821
169-
organization:
170-
$ref: '#/components/schemas/UserOrganization'
171149
description: Contains information about the authenticated user associated with the token request.
172-
UserOrganization:
173-
type: object
174-
required:
175-
- id
176-
- name
177-
properties:
178-
id:
179-
type: string
180-
description: The unique identifier of the organization.
181-
example:
182-
f14962ba-e198-4261-88dd-ea0e25121f83
183-
name:
184-
type: string
185-
description: The name of the organization.
186-
example:
187-
bar.com
188-
description: This property represents the organization in which the user has been authenticated.
189150
UserStore:
190151
type: object
191152
required:
@@ -209,7 +170,7 @@ components:
209170
properties:
210171
tokenType:
211172
type: string
212-
example: HASH
173+
example: JWT
213174
enum:
214175
- JWT
215176
description: Defines the type of token.

en/identity-server/7.2.0/docs/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.yaml renamed to en/asgardeo/docs/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.1.yaml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ openapi: 3.0.1
22
info:
33
title: API contract for pre-issue access token action
44
description: This API defines the REST API contract for a service that implements logic to extend the access token issuance flow of WSO2 Identity Server.
5-
version: v1
5+
version: v1.1
66
contact:
77
name: WSO2
88
url: 'https://wso2.com/identity-server/'
@@ -91,6 +91,8 @@ components:
9191
$ref: '#/components/schemas/Request'
9292
tenant:
9393
$ref: '#/components/schemas/Tenant'
94+
organization:
95+
$ref: "#/components/schemas/Organization"
9496
user:
9597
$ref: '#/components/schemas/User'
9698
userStore:
@@ -152,7 +154,28 @@ components:
152154
description: The domain name of the tenant.
153155
example:
154156
bar.com
155-
description: This property represents the tenant under which the token request is being processed.
157+
description: This property represents the tenant under which the token request is being processed.
158+
Organization:
159+
type: object
160+
required:
161+
- id
162+
- name
163+
- orgHandle
164+
- depth
165+
properties:
166+
id:
167+
type: string
168+
example: eb1115f6-274f-4bb7-9b6d-d31f678e81f7
169+
name:
170+
type: string
171+
example: Example
172+
orgHandle:
173+
type: string
174+
example: example.com
175+
depth:
176+
type: integer
177+
example: 0
178+
description: This property represents the organization context.
156179
User:
157180
type: object
158181
required:
@@ -162,6 +185,8 @@ components:
162185
type: string
163186
description: Defines the unique identifier of the user.
164187
example: e204849c-4ec2-41f1-8ff7-ec1ebff02821
188+
organization:
189+
$ref: "#/components/schemas/Organization"
165190
description: Contains information about the authenticated user associated with the token request.
166191
UserStore:
167192
type: object
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
template: templates/redoc.html
3+
---
4+
5+
<redoc id="pre-issue-access-token-v1.0" spec-url="{{base_path}}/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.0.yaml" theme='{{redoc_theme}}'></redoc>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
template: templates/redoc.html
3+
---
4+
5+
<redoc id="pre-issue-access-token-v1.1" spec-url="{{base_path}}/references/service-extensions/pre-flow-extensions/pre-issue-access-token-action/api/pre-issue-access-token-action-v1.1.yaml" theme='{{redoc_theme}}'></redoc>

0 commit comments

Comments
 (0)