Include meta into advisory message

Author: LauraBeatris

packages/clerk-js/src/core/resources/OrganizationCreationDefaults.ts

@@ -10,8 +10,9 @@ import { BaseResource } from './internal';
 
 export class OrganizationCreationDefaults extends BaseResource implements OrganizationCreationDefaultsResource {
   advisory: {
-    type: OrganizationCreationAdvisoryType;
+    code: OrganizationCreationAdvisoryType;
     severity: OrganizationCreationAdvisorySeverity;
+    meta: Record<string, string>;
   } | null = null;
   form: {
     name: string;
@@ -60,7 +61,8 @@ export class OrganizationCreationDefaults extends BaseResource implements Organi
     return {
       advisory: this.advisory
         ? {
-            type: this.advisory.type,
+            code: this.advisory.code,
+            meta: this.advisory.meta,
             severity: this.advisory.severity,
           }
         : null,

packages/localizations/src/en-US.ts

@@ -879,7 +879,7 @@ export const enUS: LocalizationResource = {
     },
     alerts: {
       existingOrgWithDomain:
-        'An organization already exists for the detected company name and email domain. Join by invitation.',
+        'An organization already exists for the detected company name and {{email}}. Join by invitation.',
     },
   },
   taskResetPassword: {

packages/shared/src/types/localization.ts

@@ -1308,7 +1308,7 @@ export type __internal_LocalizationResource = {
       subtitle: LocalizationValue;
     };
     alerts: {
-      existingOrgWithDomain: LocalizationValue;
+      existingOrgWithDomain: LocalizationValue<'email'>;
     };
   };
   taskResetPassword: {

packages/shared/src/types/organizationCreationDefaults.ts

@@ -7,8 +7,9 @@ export type OrganizationCreationAdvisorySeverity = 'warning';
 
 export interface OrganizationCreationDefaultsJSON extends ClerkResourceJSON {
   advisory: {
-    type: OrganizationCreationAdvisoryType;
+    code: OrganizationCreationAdvisoryType;
     severity: OrganizationCreationAdvisorySeverity;
+    meta: Record<string, string>;
   } | null;
   form: {
     name: string;
@@ -19,8 +20,9 @@ export interface OrganizationCreationDefaultsJSON extends ClerkResourceJSON {
 
 export interface OrganizationCreationDefaultsResource extends ClerkResource {
   advisory: {
-    type: OrganizationCreationAdvisoryType;
+    code: OrganizationCreationAdvisoryType;
     severity: OrganizationCreationAdvisorySeverity;
+    meta: Record<string, string>;
   } | null;
   form: {
     name: string;

packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/OrganizationCreationDefaultsAlert.tsx

@@ -1,30 +1,40 @@
-import type { OrganizationCreationAdvisoryType, OrganizationCreationDefaultsResource } from '@clerk/shared/types';
+import type { OrganizationCreationDefaultsResource } from '@clerk/shared/types';
 
 import { Alert, Text } from '@/customizables';
-import { type LocalizationKey, localizationKeys } from '@/localization';
+import { localizationKeys } from '@/localization';
 
 export function OrganizationCreationDefaultsAlert({
   organizationCreationDefaults,
 }: {
   organizationCreationDefaults?: OrganizationCreationDefaultsResource;
 }) {
-  if (!organizationCreationDefaults?.advisory) {
+  const localizationKey = advisoryToLocalizationKey(organizationCreationDefaults?.advisory);
+  if (!localizationKey) {
     return null;
   }
 
   return (
     <Alert colorScheme='warning'>
       <Text
         colorScheme='warning'
-        localizationKey={advisoryTypeToLocalizationKey[organizationCreationDefaults.advisory.type]}
+        localizationKey={localizationKey}
         variant='caption'
       />
     </Alert>
   );
 }
 
-// TODO -> Update with latest advisory where meta is returned
-// TODO -> Include email domain in message, eg: {{ meta }}
-const advisoryTypeToLocalizationKey: Record<OrganizationCreationAdvisoryType, LocalizationKey> = {
-  existing_org_with_domain: localizationKeys('taskChooseOrganization.alerts.existingOrgWithDomain'),
+const advisoryToLocalizationKey = (advisory?: OrganizationCreationDefaultsResource['advisory']) => {
+  if (!advisory) {
+    return null;
+  }
+
+  switch (advisory.code) {
+    case 'existing_org_with_domain':
+      return localizationKeys('taskChooseOrganization.alerts.existingOrgWithDomain', {
+        email: advisory.meta.email,
+      });
+    default:
+      return null;
+  }
 };

packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/index.tsx

@@ -113,7 +113,7 @@ const TaskChooseOrganizationCardFooter = () => {
 
 type TaskChooseOrganizationFlowsProps = {
   initialFlow: 'create' | 'choose';
-  organizationCreationDefaults?: OrganizationCreationDefaultsResource;
+  organizationCreationDefaults?: OrganizationCreationDefaultsResource | null;
 };
 
 const TaskChooseOrganizationFlows = withCardStateProvider((props: TaskChooseOrganizationFlowsProps) => {