Merge pull request wso2#6673 from pavinduLakshan/graceful_err

HasiniSama · Jul 26, 2024 · ece7d3e · ece7d3e
2 parents 79fcc38 + 5711502
commit ece7d3e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/.changeset/bright-cameras-obey.md b/.changeset/bright-cameras-obey.md
@@ -0,0 +1,8 @@
+---
+"@wso2is/admin.extensions.v1": patch
+"@wso2is/admin.roles.v1": patch
+"@wso2is/admin.roles.v2": patch
+"@wso2is/admin.core.v1": patch
+---
+
+Gracefully handle server configuration retrieval errors
diff --git a/features/admin.core.v1/store/actions/organization.ts b/features/admin.core.v1/store/actions/organization.ts
@@ -126,5 +126,7 @@ export const getServerConfigurations = () => (dispatch: Dispatch): void => {
             const adminUser: string = response?.realmConfig.adminUser;
 
             dispatch(setSuperAdmin(adminUser));
+        }).catch((_error: unknown) => {
+            setSuperAdmin(null);
         });
 };
diff --git a/features/admin.extensions.v1/components/administrators/pages/administrator-edit.tsx b/features/admin.extensions.v1/components/administrators/pages/administrator-edit.tsx
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+import { useRequiredScopes } from "@wso2is/access-control";
 import { getProfileInformation } from "@wso2is/admin.authentication.v1/store";
 import { AppState, FeatureConfigInterface, history, store } from "@wso2is/admin.core.v1";
 import { PatchRoleDataInterface } from "@wso2is/admin.roles.v2/models/roles";
@@ -35,7 +36,7 @@ import { UserManagementConstants } from "@wso2is/admin.users.v1/constants/user-m
 import { UserManagementUtils } from "@wso2is/admin.users.v1/utils/user-management-utils";
 import { UserstoreConstants } from "@wso2is/core/constants";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
-import { hasRequiredScopes, isFeatureEnabled, resolveUserDisplayName, resolveUserEmails } from "@wso2is/core/helpers";
+import { isFeatureEnabled, resolveUserDisplayName, resolveUserEmails } from "@wso2is/core/helpers";
 import {
     AlertInterface,
     AlertLevels,
@@ -70,8 +71,6 @@ const AdministratorEditPage = (): ReactElement => {
     const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
     const profileInfo: ProfileInfoInterface = useSelector((state: AppState) => state.profile.profileInfo);
 
-    const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
-
     const [ user, setUserProfile ] = useState<ProfileInfoInterface>(emptyProfileInfo);
     const [ isUserDetailsRequestLoading, setIsUserDetailsRequestLoading ] = useState<boolean>(false);
     const [ readOnlyUserStoresList, setReadOnlyUserStoresList ] = useState<string[]>(undefined);
@@ -83,6 +82,9 @@ const AdministratorEditPage = (): ReactElement => {
     const [ isSubmitting, setIsSubmitting ] = useState<boolean>(false);
     const [ isDisplayNameEnabled, setIsDisplayNameEnabled ] = useState<boolean>(undefined);
 
+    const hasUserReadPermissions: boolean = useRequiredScopes(featureConfig?.users?.scopes?.read);
+    const hasUserUpdatePermissions: boolean = useRequiredScopes(featureConfig?.users?.scopes?.update);
+
     useEffect(() => {
         if (!user) {
             return;
@@ -94,7 +96,7 @@ const AdministratorEditPage = (): ReactElement => {
 
         if (!isFeatureEnabled(featureConfig?.users, UserManagementConstants.FEATURE_DICTIONARY.get("USER_UPDATE"))
             || readOnlyUserStoresList?.includes(userStore?.toString())
-            || !hasRequiredScopes(featureConfig?.users, featureConfig?.users?.scopes?.update, allowedScopes)
+            || !hasUserUpdatePermissions
         ) {
             setReadOnly(true);
         }
@@ -139,8 +141,7 @@ const AdministratorEditPage = (): ReactElement => {
             return;
         }
 
-        if (hasRequiredScopes(featureConfig?.guestUser,
-            featureConfig?.guestUser?.scopes?.read, allowedScopes)) {
+        if (hasUserReadPermissions) {
             getAdminUser();
         }
         setIsDisplayNameEnabled(
@@ -175,6 +176,9 @@ const AdministratorEditPage = (): ReactElement => {
         getServerConfigs()
             .then((response: ServerConfigurationsInterface) => {
                 setRealmConfigs(response?.realmConfig);
+            })
+            .catch((_error: unknown) => {
+                setRealmConfigs(null);
             });
     };
 

diff --git a/features/admin.roles.v1/components/wizard/role-permission.tsx b/features/admin.roles.v1/components/wizard/role-permission.tsx
@@ -129,6 +129,8 @@ export const PermissionList: FunctionComponent<PermissionListProp> = (props: Per
             if (loggedUserName === adminUser) {
                 setIsSuperAdmin(true);
             }
+        }).catch((_error: unknown) => {
+            setIsSuperAdmin(false);
         });
     };
 

diff --git a/features/admin.roles.v2/components/wizard/role-permission.tsx b/features/admin.roles.v2/components/wizard/role-permission.tsx
@@ -129,6 +129,8 @@ export const PermissionList: FunctionComponent<PermissionListProp> = (props: Per
             if (loggedUserName === adminUser) {
                 setIsSuperAdmin(true);
             }
+        }).catch((_error: unknown) => {
+            setIsSuperAdmin(false);
         });
     };