diff --git a/en/docs/administer/key-managers/configure-forgerock-connector.md b/en/docs/administer/key-managers/configure-forgerock-connector.md
index e1a7611cde..1648fb048e 100644
--- a/en/docs/administer/key-managers/configure-forgerock-connector.md
+++ b/en/docs/administer/key-managers/configure-forgerock-connector.md
@@ -26,9 +26,11 @@ Follow the instructions given below to configure the ForgeRock Authorization Ser
[![ForgeRock realms]({{base_path}}/assets/img/administer/forgerock-realms.png)]({{base_path}}/assets/img/administer/forgerock-realms.png)
-3. Navigate to **Root Realm** -> **Dashboard** -> **Configure OAuth Provider** -> **Configure OAuth 2.0** section.
+3. Navigate to **Root Realm** -> **Services** and add Oauth2 provider as a new service as follows,
-4. Create an OAuth provider based on the following values.
+ [![ForgeRock add OAuth Provider]({{base_path}}/assets/img/administer/forgerock-create-new-oauth-provider.png)]({{base_path}}/assets/img/administer/forgerock-create-new-oauth-provider.png)
+
+4. Update the created OAuth provider based on the following values.
@@ -61,21 +63,12 @@ Follow the instructions given below to configure the ForgeRock Authorization Ser
Issue Refresh Tokens on Refreshing Access Tokens | Disabled |
-
-
- Scope Implementation Class | org.forgerock.openam.oauth2 |
-
-
[![ForgeRock create OAuth Provider]({{base_path}}/assets/img/administer/forgerock-create-oauth-provider.png)]({{base_path}}/assets/img/administer/forgerock-create-oauth-provider.png)
-5. Navigate to **Root Realm** -> **Services** add Oauth2 provider as a new service as follows,
- [![ForgeRock add OAuth Provider]({{base_path}}/assets/img/administer/forgerock-add-oauth-provider.png)]({{base_path}}/assets/img/administer/forgerock-create-add-provider.png)
-
-
-6. Configure the scopes and the signing algorithm of the created OAuth 2.0 Provider using the following values.
+5. Navigate to the **Advanced** tab and configure the scopes and the signing algorithm of the created OAuth 2.0 Provider using the following values.
@@ -83,7 +76,7 @@ Follow the instructions given below to configure the ForgeRock Authorization Ser
- Client Registration Scope Whitelist | default |
+ Client Registration Scope Allowlist | default |
@@ -158,20 +151,18 @@ Create a static OAuth client as follows so that you can use the OAuth client key
- Scope(s) | am-introspect-all-tokens dynamic_client_registration |
+ Scope(s) | am-introspect-all-tokens-any-realm dynamic_client_registration |
[![ForgeRock add client]({{base_path}}/assets/img/administer/forgerock-add-client.png)]({{base_path}}/assets/img/administer/forgerock-add-client.png)
-2. Navigate to the above created client under **Applications** -> **Client ID of the App** -> **Core** -> **Access Token LifeTime**.
+2. Navigate to the above created client under **Applications** -> **Client ID of the App (amAdmin)** -> **Core** -> **Access Token LifeTime**.
3. Set a long value for the **Access Token LifeTime** to obtain a long living registration access token. You will use this token to register and update clients dynamically.
4. Navigate to the **Advanced** tab and configure the `client_credential` grant type that you need to use to obtain the access token.
-
- [![ForgeRock client grant]({{base_path}}/assets/img/administer/forgerock-client-grant.png)]({{base_path}}/assets/img/administer/forgerock-client-grant.png)
If you want to work with scopes, then you need to assign the relevant scopes to the relevant OAuth clients beforehand.
@@ -195,13 +186,7 @@ Follow the instructions given below to configure WSO2 API Manager to work with t
3. Add the following configuration to add a new Key Manager.
- [![Add ForgeRock configurations]({{base_path}}/assets/img/administer/forgerock-add-km-1.png)]({{base_path}}/assets/img/administer/forgerock-add-km-1.png)
-
- [![Add ForgeRock configurations]({{base_path}}/assets/img/administer/forgerock-add-km-2.png)]({{base_path}}/assets/img/administer/forgerock-add-km-2.png)
-
- [![Add ForgeRock configurations]({{base_path}}/assets/img/administer/forgerock-add-km-3.png)]({{base_path}}/assets/img/administer/forgerock-add-km-3.png)
-
- [![Add ForgeRock configurations]({{base_path}}/assets/img/administer/forgerock-add-km-4.png)]({{base_path}}/assets/img/administer/forgerock-add-km-4.png)
+ [![Add ForgeRock configurations]({{base_path}}/assets/img/administer/forgerock-add-km.png)]({{base_path}}/assets/img/administer/forgerock-add-km.png)
The following table provides definitions for each of the configurations.
@@ -361,7 +346,7 @@ Follow the instructions given below to configure WSO2 API Manager to work with t
Advanced Configurations |
- Token Generation |
+ |
|
@@ -397,15 +382,32 @@ Follow the instructions given below to configure WSO2 API Manager to work with t
Optional |
- Token Handling Options |
- Provides a way to validate the token for this particular authorization server.
- This is mandatory if the Token Validation Method is introspect
- For Forgerock if its JWT it is required to specify a claim mapping as a unique identifier and
- If its REFERENCE its required to set a regular expression for the length of the token.
- Example For JWT Claim Key : iss
- Claim Value : http://loccbcalhost:8080/openam/oauth2
- Example for Reference {27} |
- |
+ Token Handling Options |
+
+ Provides a way to validate the token for this particular authorization server.
+
+ - JWT:
+
+ - Requires a unique claim mapping to identify the token.
+ - Example Claim Mapping for JWT:
+
+ - Claim Key:
iss
+ - Claim Value:
http://localhost:8080/cr75/oauth2
+
+
+
+
+ - REFERENCE:
+
+ - Requires a regular expression to specify the token length.
+ - Example for REFERENCE:
^[\w-]{27}$ (defines a token length of 27 characters)
+
+
+
+ |
+
+ Optional. This is mandatory if the Token Validation Method is introspect.
+ |
REFERENCE |
diff --git a/en/docs/assets/img/administer/forgerock-add-client.png b/en/docs/assets/img/administer/forgerock-add-client.png
index 3bd88c21fc..8dfe29508b 100644
Binary files a/en/docs/assets/img/administer/forgerock-add-client.png and b/en/docs/assets/img/administer/forgerock-add-client.png differ
diff --git a/en/docs/assets/img/administer/forgerock-add-km-1.png b/en/docs/assets/img/administer/forgerock-add-km-1.png
deleted file mode 100644
index 52583be266..0000000000
Binary files a/en/docs/assets/img/administer/forgerock-add-km-1.png and /dev/null differ
diff --git a/en/docs/assets/img/administer/forgerock-add-km-2.png b/en/docs/assets/img/administer/forgerock-add-km-2.png
deleted file mode 100644
index 074bdcb54f..0000000000
Binary files a/en/docs/assets/img/administer/forgerock-add-km-2.png and /dev/null differ
diff --git a/en/docs/assets/img/administer/forgerock-add-km-3.png b/en/docs/assets/img/administer/forgerock-add-km-3.png
deleted file mode 100644
index 0f370ba19e..0000000000
Binary files a/en/docs/assets/img/administer/forgerock-add-km-3.png and /dev/null differ
diff --git a/en/docs/assets/img/administer/forgerock-add-km-4.png b/en/docs/assets/img/administer/forgerock-add-km-4.png
deleted file mode 100644
index 8ac4ec4ffc..0000000000
Binary files a/en/docs/assets/img/administer/forgerock-add-km-4.png and /dev/null differ
diff --git a/en/docs/assets/img/administer/forgerock-add-km.png b/en/docs/assets/img/administer/forgerock-add-km.png
new file mode 100644
index 0000000000..2bdaa46ff8
Binary files /dev/null and b/en/docs/assets/img/administer/forgerock-add-km.png differ
diff --git a/en/docs/assets/img/administer/forgerock-client-grant.png b/en/docs/assets/img/administer/forgerock-client-grant.png
deleted file mode 100644
index 0d8fddb286..0000000000
Binary files a/en/docs/assets/img/administer/forgerock-client-grant.png and /dev/null differ
diff --git a/en/docs/assets/img/administer/forgerock-configure-dcr.png b/en/docs/assets/img/administer/forgerock-configure-dcr.png
index 81c4138db1..c6baca6647 100644
Binary files a/en/docs/assets/img/administer/forgerock-configure-dcr.png and b/en/docs/assets/img/administer/forgerock-configure-dcr.png differ
diff --git a/en/docs/assets/img/administer/forgerock-create-new-oauth-provider.png b/en/docs/assets/img/administer/forgerock-create-new-oauth-provider.png
new file mode 100644
index 0000000000..e9194eab56
Binary files /dev/null and b/en/docs/assets/img/administer/forgerock-create-new-oauth-provider.png differ
diff --git a/en/docs/assets/img/administer/forgerock-create-oauth-provider.png b/en/docs/assets/img/administer/forgerock-create-oauth-provider.png
index 6323d66ab6..0615ae6381 100644
Binary files a/en/docs/assets/img/administer/forgerock-create-oauth-provider.png and b/en/docs/assets/img/administer/forgerock-create-oauth-provider.png differ
diff --git a/en/docs/assets/img/administer/forgerock-devportal-genkeys.png b/en/docs/assets/img/administer/forgerock-devportal-genkeys.png
index 6e091b2566..864d2fc4f8 100644
Binary files a/en/docs/assets/img/administer/forgerock-devportal-genkeys.png and b/en/docs/assets/img/administer/forgerock-devportal-genkeys.png differ
diff --git a/en/docs/assets/img/administer/forgerock-provider-advance-config.png b/en/docs/assets/img/administer/forgerock-provider-advance-config.png
index afc910ac5e..1be3d30eba 100644
Binary files a/en/docs/assets/img/administer/forgerock-provider-advance-config.png and b/en/docs/assets/img/administer/forgerock-provider-advance-config.png differ
diff --git a/en/docs/assets/img/administer/forgerock-realms.png b/en/docs/assets/img/administer/forgerock-realms.png
index b9e1d2ffc9..d39ce0107b 100644
Binary files a/en/docs/assets/img/administer/forgerock-realms.png and b/en/docs/assets/img/administer/forgerock-realms.png differ