Address PR comments.

Author: mpmadhavig

apps/console/src/public/resources/users/init-impersonate.html

@@ -34,7 +34,7 @@
                             "&redirect_uri=" + window.location.origin + window.location.pathname +
                             "&state=sample_state&scope=internal_user_impersonate&response_type=id_token%20subject_token" +
                             "&requested_subject=" + userId +
-                            "&nonce=2131236&code_challenge=" + code_challenge + "&code_challenge_method=S256";
+                            "&nonce=" + getNonce() + "&code_challenge=" + code_challenge + "&code_challenge_method=S256";
                     }
                 } else {
                     if (sessionStorage.getItem("impersonation_artifacts") === null) {
@@ -43,6 +43,11 @@
                     window.parent.postMessage("impersonation-authorize-request-complete", "*");
                 }
             }
+
+            function getNonce() {
+                return Math.floor(Math.random() * (10000000 - 1000000 + 1)) + 1000000;
+            }
+
         </script>
     </body>
 </html>

apps/myaccount/src/configs/routes.tsx

@@ -120,16 +120,6 @@ export const getAuthLayoutRoutes = (): RouteInterface[] => {
 export const getDashboardLayoutRoutes = (): RouteInterface[] => {
 
     return [
-        {
-            component: lazy(() => import("../pages/overview")),
-            exact: true,
-            icon: <HomeIcon fill="black" />,
-            id: "overview",
-            name: "common:overview",
-            path: AppConstants.getPaths().get("OVERVIEW"),
-            protected: true,
-            showOnSidePanel: true
-        },
         {
             component: lazy(() => import("../pages/applications")),
             exact: true,
@@ -140,6 +130,16 @@ export const getDashboardLayoutRoutes = (): RouteInterface[] => {
             protected: true,
             showOnSidePanel: true
         },
+        {
+            component: lazy(() => import("../pages/overview")),
+            exact: true,
+            icon: <HomeIcon fill="black" />,
+            id: "overview",
+            name: "common:overview",
+            path: AppConstants.getPaths().get("OVERVIEW"),
+            protected: true,
+            showOnSidePanel: true
+        },
         {
             component: lazy(() => import("../pages/personal-info")),
             exact: true,

apps/myaccount/src/layouts/dashboard.tsx

@@ -96,6 +96,7 @@ export const DashboardLayout: FunctionComponent<PropsWithChildren<DashboardLayou
     const [ announcement, setAnnouncement ] = useState<AnnouncementBannerInterface>();
     const [ showAnnouncement, setShowAnnouncement ] = useState<boolean>(true);
     const [ dashboardLayoutRoutes, setDashboardLayoutRoutes ] = useState<RouteInterface[]>(getDashboardLayoutRoutes());
+    const allowedScopes: string = useSelector((state: AppState) => state?.authenticationInformation?.scope);
 
     useEffect(() => {
         const localeCookie: string = CookieStorageUtils.getItem("ui_lang");
@@ -161,15 +162,24 @@ export const DashboardLayout: FunctionComponent<PropsWithChildren<DashboardLayou
         }
 
         const routes: RouteInterface[] = getDashboardLayoutRoutes().filter((route: RouteInterface) => {
-            if (route.path === AppConstants.getPaths().get("APPLICATIONS") && !isApplicationsPageVisible) {
-                return false;
+
+            if (allowedScopes.includes("internal_user_impersonate")) {
+                if (route.path === "/") {
+                    route.redirectTo = AppConstants.getPaths().get("APPLICATIONS");
+                } else if (route.path != AppConstants.getPaths().get("APPLICATIONS")) {
+                    return false;
+                }
+            } else {
+                if (route.path === AppConstants.getPaths().get("APPLICATIONS") && !isApplicationsPageVisible) {
+                    return false;
+                }
             }
 
             return route;
         });
 
         setDashboardLayoutRoutes(filterRoutes(routes, config.ui?.features));
-    }, [ AppConstants.getTenantQualifiedAppBasename(), config, isApplicationsPageVisible ]);
+    }, [ AppConstants.getTenantQualifiedAppBasename(), config, isApplicationsPageVisible, allowedScopes ]);
 
     /**
      * On location change, update the selected route.
@@ -259,7 +269,8 @@ export const DashboardLayout: FunctionComponent<PropsWithChildren<DashboardLayou
                                             icon: route.icon,
                                             label: t(route.name),
                                             onClick: () => history.push(route.path),
-                                            selected: selectedRoute?.path === route.path
+                                            selected: selectedRoute?.path === route.path,
+                                            showOnSidePanel: false
                                         };
                                     }
                                 ),

features/admin.users.v1/components/user-impersonation-action.tsx

@@ -17,7 +17,6 @@
  */
 
 import { HttpResponse, useAuthContext } from "@asgardeo/auth-react";
-import Button from "@oxygen-ui/react/Button";
 import { AppState } from "@wso2is/admin.core.v1/store";
 import { SCIMConfigs } from "@wso2is/admin.extensions.v1";
 import { administratorConfig } from "@wso2is/admin.extensions.v1/configs/administrator";