Merge pull request #6947 from pavinduLakshan/fix_scope_rendering

wso2 · Oct 2, 2024 · 4b43b93 · 4b43b93
2 parents 0201b46 + b779f87
commit 4b43b93
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/brown-trains-approve.md b/.changeset/brown-trains-approve.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.identity-providers.v1": patch
+"@wso2is/admin.connections.v1": patch
+---
+
+Fix scopes being rendered incorrectly in connection settings tab
diff --git a/...s/admin.connections.v1/components/edit/forms/authenticators/google-authenticator-form.tsx b/...s/admin.connections.v1/components/edit/forms/authenticators/google-authenticator-form.tsx
@@ -351,7 +351,7 @@ export const GoogleAuthenticatorForm: FunctionComponent<GoogleAuthenticatorFormP
  let scopes: string[] = [];
 
  try {
- scopes = rawScopes.trim().split("scope=")[1].split(" ");
+ scopes = new URLSearchParams(rawScopes).get("scope").split(" ");
  } catch(e) {
  // Silent any issues occurred when trying to scroll.
  // Add debug logs here one a logger is added.

diff --git a/...dmin.connections.v1/components/edit/forms/authenticators/microsoft-authenticator-form.tsx b/...dmin.connections.v1/components/edit/forms/authenticators/microsoft-authenticator-form.tsx
@@ -309,7 +309,7 @@ export const MicrosoftAuthenticatorForm: FunctionComponent<MicrosoftAuthenticato
  let scopes: string[] = [];
 
  try {
- scopes = rawScopes.trim().split(" ");
+ scopes = new URLSearchParams(rawScopes).get("scope").split(" ");
  } catch(e) {
  // Silent any issues occurred when trying to scroll.
  // Add debug logs here one a logger is added.

diff --git a/...admin.identity-providers.v1/components/forms/authenticators/google-authenticator-form.tsx b/...admin.identity-providers.v1/components/forms/authenticators/google-authenticator-form.tsx
@@ -353,7 +353,7 @@ export const GoogleAuthenticatorForm: FunctionComponent<GoogleAuthenticatorFormP
  let scopes: string[] = [];
 
  try {
- scopes = rawScopes.trim().split("scope=")[1].split(" ");
+ scopes = new URLSearchParams(rawScopes).get("scope").split(" ");
  } catch(e) {
  // Silent any issues occurred when trying to scroll.
  // Add debug logs here one a logger is added.

diff --git a/...in.identity-providers.v1/components/forms/authenticators/microsoft-authenticator-form.tsx b/...in.identity-providers.v1/components/forms/authenticators/microsoft-authenticator-form.tsx
@@ -311,7 +311,7 @@ export const MicrosoftAuthenticatorForm: FunctionComponent<MicrosoftAuthenticato
  let scopes: string[] = [];
 
  try {
- scopes = rawScopes.trim().split(" ");
+ scopes = new URLSearchParams(rawScopes).get("scope").split(" ");
  } catch(e) {
  // Silent any issues occurred when trying to scroll.
  // Add debug logs here one a logger is added.