Show suborg name in the user dropdown for suborg user's myaccount login

.changeset/real-ants-look.md

@@ -0,0 +1,6 @@
+---
+"@wso2is/myaccount": patch
+"@wso2is/core": patch
+---
+
+Show suborg name in the user dropdown for suborg user's myaccount login

apps/myaccount/src/components/shared/header.tsx

@@ -112,6 +112,12 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
     const tenantName: string = useSelector(
         (state: AppState) => state.authenticationInformation.tenantDomain
     );
+
+    // B2B organization name if the user has logged in through B2B organization.
+    const orgName: string = useSelector(
+        (state: AppState) => state?.authenticationInformation?.orgName
+    );
+
     const linkedAccounts: LinkedAccountInterface[] = useSelector(
         (state: AppState) => state.profile.linkedAccounts
     );
@@ -271,16 +277,19 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
     /**
      * Resolves the organization label in the header.
      */
-    const resolveOrganizationLabel = (): ReactElement => {
-        const organization: string =
-            tenantName == "carbon.super"
-                ? commonConfig.header.organization.replace("{{productName}}", productName)
-                : tenantName;
+    const resolveOrganizationLabel =  (): ReactElement => {
+        let organizationName: string = tenantName;
+
+        if (tenantName === AppConstants.getSuperTenant()) {
+            organizationName = commonConfig.header.organization.replace("{{productName}}", productName);
+        } else if (!!orgName && orgName !== tenantName) {
+            organizationName = orgName;
+        }
 
         return (
             <Alert classes={ { root: "organization-label-alert" } } severity="info" icon={ false }>
                 { t("myAccount:components.header.organizationLabel") }{ " " }
-                <strong>{ organization }</strong>
+                <strong>{ organizationName }</strong>
             </Alert>
         );
     };

apps/myaccount/src/meta/themes/index.ts

@@ -16,7 +16,8 @@
  * under the License.
  */
 
-import { DynamicBrandingPreferenceThemeInterface, PredefinedThemes } from "@wso2is/common.branding.v1/models";
+import { DynamicBrandingPreferenceThemeInterface } from "@wso2is/common.branding.v1/models";
+import { PredefinedThemes } from "@wso2is/common.branding.v1/models/branding-preferences";
 import { DARK_THEME } from "./dark-theme";
 import { LIGHT_THEME } from "./light-theme";
 

apps/myaccount/src/models/auth.ts

@@ -28,6 +28,7 @@ export interface AuthStateInterface {
     location: string;
     loginInit: boolean;
     logoutInit: boolean;
+    orgName: string;
     profileSchemas: ProfileSchema[];
     profileInfo: BasicProfileInterface;
     tenantDomain?: string;

apps/myaccount/src/store/reducers/authenticate.ts

@@ -31,6 +31,7 @@ const authenticateInitialState: AuthStateInterface = {
     location: window["AppUtils"]?.getConfig()?.routes.home,
     loginInit: false,
     logoutInit: false,
+    orgName: "",
     profileInfo: createEmptyProfile(),
     profileSchemas: [],
     scope: "",
@@ -59,6 +60,7 @@ const authenticateReducer = (
                     isAuth: true,
                     loginInit: true,
                     logoutInit: false,
+                    orgName: action.payload.orgName,
                     scope: action.payload.scope,
                     tenantDomain: action.payload.tenantDomain,
                     username: action.payload.username

modules/core/src/utils/authenticate-utils.ts

@@ -141,6 +141,7 @@ export class AuthenticateUtils {
             displayName: response?.displayName,
             display_name: response?.displayName,
             email: response?.email,
+            orgName: response.orgName,
             providedUsername: response?.username,
             scope: response?.allowedScopes,
             tenantDomain: tenantDomain ? tenantDomain : AuthenticateUtils.deriveTenantDomainFromSubject(response?.sub),

modules/unit-testing/__mocks__/file.ts

@@ -16,6 +16,8 @@
  * under the License.
  */
 
+/* eslint-disable sort-keys */
+
 /**
  * Stubs files such as .jpg, .png, etc.
  *