fix: [UIE-10253] - IAM Delegate: clear storage

Author: mpolotsk-akamai

packages/manager/src/OAuth/oauth.ts

@@ -5,7 +5,7 @@ import {
 } from '@linode/utilities';
 import * as Sentry from '@sentry/react';
 
-import { clearUserInput, storage } from 'src/utilities/storage';
+import { clearStorage, clearUserInput, storage } from 'src/utilities/storage';
 
 import { getAppRoot, getClientId, getLoginURL } from './constants';
 import { generateCodeChallenge, generateCodeVerifier } from './pkce';
@@ -45,6 +45,7 @@ function clearNonceAndCodeVerifierFromLocalStorage() {
 function clearAllAuthDataFromLocalStorage() {
   clearNonceAndCodeVerifierFromLocalStorage();
   clearAuthDataFromLocalStorage();
+  clearStorage('switch_account/company_name');
 }
 
 export function clearStorageAndRedirectToLogout() {
@@ -105,6 +106,7 @@ export async function logout() {
 
   clearUserInput();
   clearAuthDataFromLocalStorage();
+  clearStorage('switch_account/company_name');
 
   if (token) {
     const tokenWithoutPrefix = token.split(' ')[1];

packages/manager/src/features/Account/SwitchAccounts/useSwitchToParentAccount.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { PARENT_USER_SESSION_EXPIRED } from 'src/features/Account/constants';
-import { setStorage } from 'src/utilities/storage';
+import { clearStorage, setStorage } from 'src/utilities/storage';
 
 import { useParentChildAuthentication } from './useParentChildAuthentication';
 
@@ -38,7 +38,8 @@ export const useSwitchToParentAccount = ({
 
     // Flag to prevent multiple clicks on the switch account button.
     setSubmitting(true);
-
+    // Clean up the company name in storage to prevent it from being used in the parent account after switching back from a child account.
+    clearStorage('switch_account/company_name');
     try {
       // Revoke proxy or delegate token before switching to parent account.
       await revokeToken().catch(() => {

packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx

@@ -121,8 +121,9 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
       }
     : undefined;
 
+  const switchAccountCompanyName = getStorage('switch_account/company_name');
   const companyNameOrEmail = getCompanyNameOrEmail({
-    company: account?.company,
+    company: account?.company ? account?.company : switchAccountCompanyName,
     profile,
   });
   const { data: parentProfile } = useProfile({ headers: proxyHeaders });