Merge pull request #87 from brionmario/next

Author: brionmario

.changeset/tiny-worms-repeat.md

@@ -0,0 +1,11 @@
+---
+'@asgardeo/browser': patch
+'@asgardeo/express': patch
+'@asgardeo/javascript': patch
+'@asgardeo/nextjs': patch
+'@asgardeo/node': patch
+'@asgardeo/react': patch
+'@asgardeo/vue': patch
+---
+
+Fix B2B components

packages/javascript/src/AsgardeoJavaScriptClient.ts

@@ -16,10 +16,12 @@
  * under the License.
  */
 
+import {AllOrganizationsApiResponse} from './models/organization';
 import {AsgardeoClient, SignInOptions, SignOutOptions, SignUpOptions} from './models/client';
 import {Config} from './models/config';
 import {EmbeddedFlowExecuteRequestPayload, EmbeddedFlowExecuteResponse} from './models/embedded-flow';
 import {EmbeddedSignInFlowHandleRequestPayload} from './models/embedded-signin-flow';
+import {TokenResponse} from './models/token';
 import {Organization} from './models/organization';
 import {User, UserProfile} from './models/user';
 
@@ -30,13 +32,15 @@ import {User, UserProfile} from './models/user';
  * @typeParam T - Configuration type that extends Config.
  */
 abstract class AsgardeoJavaScriptClient<T = Config> implements AsgardeoClient<T> {
-  abstract switchOrganization(organization: Organization): Promise<void>;
+  abstract switchOrganization(organization: Organization, sessionId?: string): Promise<TokenResponse | Response>;
 
   abstract initialize(config: T): Promise<boolean>;
 
   abstract getUser(options?: any): Promise<User>;
 
-  abstract getOrganizations(options?: any): Promise<Organization[]>;
+  abstract getAllOrganizations(options?: any, sessionId?: string): Promise<AllOrganizationsApiResponse>;
+
+  abstract getMyOrganizations(options?: any, sessionId?: string): Promise<Organization[]>;
 
   abstract getCurrentOrganization(sessionId?: string): Promise<Organization | null>;
 

packages/javascript/src/api/getAllOrganizations.ts

@@ -16,19 +16,9 @@
  * under the License.
  */
 
-import {Organization} from '../models/organization';
+import {AllOrganizationsApiResponse} from '../models/organization';
 import AsgardeoAPIError from '../errors/AsgardeoAPIError';
 
-/**
- * Interface for paginated organization response.
- */
-export interface PaginatedOrganizationsResponse {
-  hasMore?: boolean;
-  nextCursor?: string;
-  organizations: Organization[];
-  totalCount?: number;
-}
-
 /**
  * Configuration for the getAllOrganizations request
  */
@@ -120,7 +110,7 @@ const getAllOrganizations = async ({
   recursive = false,
   fetcher,
   ...requestConfig
-}: GetAllOrganizationsConfig): Promise<PaginatedOrganizationsResponse> => {
+}: GetAllOrganizationsConfig): Promise<AllOrganizationsApiResponse> => {
   try {
     new URL(baseUrl);
   } catch (error) {
@@ -150,9 +140,9 @@ const getAllOrganizations = async ({
     ...requestConfig,
     method: 'GET',
     headers: {
+      ...requestConfig.headers,
       'Content-Type': 'application/json',
       Accept: 'application/json',
-      ...requestConfig.headers,
     },
   };
 

packages/javascript/src/api/getBrandingPreference.ts

@@ -134,7 +134,7 @@ const getBrandingPreference = async ({
   );
 
   const fetchFn = fetcher || fetch;
-  const resolvedUrl = `${baseUrl}/api/server/v1/branding-preference${
+  const resolvedUrl = `${baseUrl}/api/server/v1/branding-preference/resolve${
     queryParams.toString() ? `?${queryParams.toString()}` : ''
   }`;
 

packages/javascript/src/api/getScim2Me.ts

@@ -18,6 +18,7 @@
 
 import {User} from '../models/user';
 import AsgardeoAPIError from '../errors/AsgardeoAPIError';
+import processUserUsername from '../utils/processUsername';
 
 /**
  * Configuration for the getScim2Me request
@@ -103,7 +104,7 @@ const getScim2Me = async ({url, baseUrl, fetcher, ...requestConfig}: GetScim2MeC
   }
 
   const fetchFn = fetcher || fetch;
-  const resolvedUrl: string = url ?? `${baseUrl}/scim2/Me`
+  const resolvedUrl: string = url ?? `${baseUrl}/scim2/Me`;
 
   const requestInit: RequestInit = {
     ...requestConfig,
@@ -130,7 +131,9 @@ const getScim2Me = async ({url, baseUrl, fetcher, ...requestConfig}: GetScim2MeC
       );
     }
 
-    return (await response.json()) as User;
+    const user = (await response.json()) as User;
+
+    return processUserUsername(user);
   } catch (error) {
     if (error instanceof AsgardeoAPIError) {
       throw error;

packages/javascript/src/api/initializeEmbeddedSignInFlow.ts

@@ -77,9 +77,9 @@ const initializeEmbeddedSignInFlow = async ({
     ...requestConfig,
     method: requestConfig.method || 'POST',
     headers: {
+      ...requestConfig.headers,
       'Content-Type': 'application/x-www-form-urlencoded',
       Accept: 'application/json',
-      ...requestConfig.headers,
     },
     body: searchParams.toString(),
   });

packages/javascript/src/i18n/en-US.ts

@@ -88,8 +88,18 @@ const translations: I18nTranslations = {
   'organization.switcher.members': 'members',
   'organization.switcher.member': 'member',
   'organization.switcher.create.organization': 'Create Organization',
-  'organization.switcher.manage.organizations': 'Manage Organization',
+  'organization.switcher.manage.organizations': 'Manage Organizations',
   'organization.switcher.manage.button': 'Manage',
+  'organization.switcher.organizations.title': 'Organizations',
+  'organization.switcher.switch.button': 'Switch',
+  'organization.switcher.no.access': 'No Access',
+  'organization.switcher.status.label': 'Status:',
+  'organization.switcher.showing.count': 'Showing {showing} of {total} organizations',
+  'organization.switcher.refresh.button': 'Refresh',
+  'organization.switcher.load.more': 'Load More Organizations',
+  'organization.switcher.loading.more': 'Loading...',
+  'organization.switcher.no.organizations': 'No organizations found',
+  'organization.switcher.error.prefix': 'Error:',
   'organization.profile.title': 'Organization Profile',
   'organization.profile.loading': 'Loading organization...',
   'organization.profile.error': 'Failed to load organization',

packages/javascript/src/index.ts

@@ -27,11 +27,7 @@ export {default as executeEmbeddedSignUpFlow} from './api/executeEmbeddedSignUpF
 export {default as getUserInfo} from './api/getUserInfo';
 export {default as getScim2Me, GetScim2MeConfig} from './api/getScim2Me';
 export {default as getSchemas, GetSchemasConfig} from './api/getSchemas';
-export {
-  default as getAllOrganizations,
-  PaginatedOrganizationsResponse,
-  GetAllOrganizationsConfig,
-} from './api/getAllOrganizations';
+export {default as getAllOrganizations, GetAllOrganizationsConfig} from './api/getAllOrganizations';
 export {
   default as createOrganization,
   CreateOrganizationPayload,
@@ -53,6 +49,7 @@ export {default as AsgardeoAPIError} from './errors/AsgardeoAPIError';
 export {default as AsgardeoRuntimeError} from './errors/AsgardeoRuntimeError';
 export {AsgardeoAuthException} from './errors/exception';
 
+export {AllOrganizationsApiResponse} from './models/organization';
 export {
   EmbeddedSignInFlowInitiateResponse,
   EmbeddedSignInFlowStatus,
@@ -115,6 +112,7 @@ export {default as AsgardeoJavaScriptClient} from './AsgardeoJavaScriptClient';
 export {default as createTheme} from './theme/createTheme';
 export {ThemeColors, ThemeConfig, Theme, ThemeMode, ThemeDetection} from './theme/types';
 
+export {default as processUsername} from './utils/processUsername';
 export {default as deepMerge} from './utils/deepMerge';
 export {default as deriveOrganizationHandleFromBaseUrl} from './utils/deriveOrganizationHandleFromBaseUrl';
 export {default as extractUserClaimsFromIdToken} from './utils/extractUserClaimsFromIdToken';
@@ -132,5 +130,6 @@ export {default as resolveFieldType} from './utils/resolveFieldType';
 export {default as resolveFieldName} from './utils/resolveFieldName';
 export {default as processOpenIDScopes} from './utils/processOpenIDScopes';
 export {default as withVendorCSSClassPrefix} from './utils/withVendorCSSClassPrefix';
+export {default as transformBrandingPreferenceToTheme} from './utils/transformBrandingPreferenceToTheme';
 
 export {default as StorageManager} from './StorageManager';

packages/javascript/src/models/client.ts

@@ -16,10 +16,16 @@
  * under the License.
  */
 
-import {EmbeddedFlowExecuteRequestConfig, EmbeddedFlowExecuteRequestPayload, EmbeddedFlowExecuteResponse} from './embedded-flow';
+import {AllOrganizationsApiResponse} from '../models/organization';
+import {
+  EmbeddedFlowExecuteRequestConfig,
+  EmbeddedFlowExecuteRequestPayload,
+  EmbeddedFlowExecuteResponse,
+} from './embedded-flow';
 import {EmbeddedSignInFlowHandleRequestPayload} from './embedded-signin-flow';
 import {Organization} from './organization';
 import {User, UserProfile} from './user';
+import {TokenResponse} from './token';
 
 export type SignInOptions = Record<string, unknown>;
 export type SignOutOptions = Record<string, unknown>;
@@ -37,11 +43,13 @@ export type SignUpOptions = Record<string, unknown>;
  */
 export interface AsgardeoClient<T> {
   /**
-   * Gets the users associated organizations.
+   * Gets the current signed-in user's associated organizations.
    *
    * @returns Associated organizations.
    */
-  getOrganizations(options?: any): Promise<Organization[]>;
+  getMyOrganizations(options?: any, sessionId?: string): Promise<Organization[]>;
+
+  getAllOrganizations(options?: any, sessionId?: string): Promise<AllOrganizationsApiResponse>;
 
   /**
    * Gets the current organization of the user.
@@ -55,7 +63,7 @@ export interface AsgardeoClient<T> {
    * @param organization - The organization to switch to.
    * @returns A promise that resolves when the switch is complete.
    */
-  switchOrganization(organization: Organization): Promise<void>;
+  switchOrganization(organization: Organization, sessionId?: string): Promise<TokenResponse | Response> ;
 
   getConfiguration(): T;
 
@@ -147,7 +155,11 @@ export interface AsgardeoClient<T> {
    * @param afterSignOut - Callback function to be executed after sign-out is complete.
    * @returns A promise that resolves to true if sign-out is successful
    */
-  signOut(options?: SignOutOptions, sessionId?: string, afterSignOut?: (afterSignOutUrl: string) => void): Promise<string>;
+  signOut(
+    options?: SignOutOptions,
+    sessionId?: string,
+    afterSignOut?: (afterSignOutUrl: string) => void,
+  ): Promise<string>;
 
   /**
    * Initiates a redirection-based sign-up process for the user.

packages/javascript/src/models/i18n.ts

@@ -88,6 +88,16 @@ export interface I18nTranslations {
   'organization.switcher.create.organization': string;
   'organization.switcher.manage.organizations': string;
   'organization.switcher.manage.button': string;
+  'organization.switcher.organizations.title': string;
+  'organization.switcher.switch.button': string;
+  'organization.switcher.no.access': string;
+  'organization.switcher.status.label': string;
+  'organization.switcher.showing.count': string;
+  'organization.switcher.refresh.button': string;
+  'organization.switcher.load.more': string;
+  'organization.switcher.loading.more': string;
+  'organization.switcher.no.organizations': string;
+  'organization.switcher.error.prefix': string;
   'organization.profile.title': string;
   'organization.profile.loading': string;
   'organization.profile.error': string;