feat: enable proper account linking flows

ory · Nov 26, 2024 · 67fad13 · 67fad13
1 parent 286014a
commit 67fad13
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 23 deletions.
diff --git a/packages/elements-react/src/components/form/form-helpers.ts b/packages/elements-react/src/components/form/form-helpers.ts
@@ -14,15 +14,22 @@ export function computeDefaultValues(nodes: UiNode[]): FormValues {
         attrs.name === "method" ||
         attrs.type === "submit" ||
         typeof attrs.value === "undefined"
-      )
+      ) {
         return acc
+      }
 
       // Unroll nested traits or assign default values
       const unrolled = unrollTrait({
         name: attrs.name,
         value: attrs.value,
       })
-      Object.assign(acc, unrolled ?? { [attrs.name]: attrs.value })
+      if (unrolled) {
+        Object.assign(acc, unrolled)
+      } else if (attrs.value) {
+        Object.assign(acc, {
+          [attrs.name]: attrs.value,
+        })
+      }
     }
 
     return acc
@@ -34,7 +41,6 @@ export function unrollTrait<T extends string, V>(
   output: Partial<UnrollTrait<T, V>> = {},
 ): UnrollTrait<T, V> | undefined {
   const keys = input.name.split(".")
-  if (!keys.length) return undefined
 
   // It's challenging to type this for deeply nested structures because the shape
   // of current changes dynamically as we navigate through levels.

diff --git a/packages/elements-react/src/components/form/messages.tsx b/packages/elements-react/src/components/form/messages.tsx
@@ -16,7 +16,7 @@ export type OryMessageRootProps = DetailedHTMLProps<
 
 // This is a list of message IDs that should not be shown to the user.
 // They're returned by the API, but they don't work well in the two step flows.
-const messageIdsToHide = [1040009, 1060003, 1080003, 1010014, 1040005]
+const messageIdsToHide = [1040009, 1060003, 1080003, 1010014, 1040005, 1010016]
 
 export function OryCardValidationMessages({ ...props }: OryMessageRootProps) {
   const { flow } = useOryFlow()

diff --git a/packages/elements-react/src/components/form/social.tsx b/packages/elements-react/src/components/form/social.tsx
@@ -7,6 +7,7 @@ import { UiNode, UiNodeInputAttributes } from "@ory/client-fetch"
 import { PropsWithChildren } from "react"
 import { OryForm } from "./form"
 import { useFormContext } from "react-hook-form"
+import { OryFormProvider } from "./form-provider"
 
 export type OryFormOidcButtonsProps = PropsWithChildren<{
   hideDivider?: boolean
@@ -86,8 +87,10 @@ export function OryFormSocialButtonsForm() {
   }
 
   return (
-    <OryForm>
-      <OryFormOidcButtons />
-    </OryForm>
+    <OryFormProvider>
+      <OryForm>
+        <OryFormOidcButtons />
+      </OryForm>
+    </OryFormProvider>
   )
 }
diff --git a/packages/elements-react/src/context/form-state.ts b/packages/elements-react/src/context/form-state.ts
@@ -42,11 +42,14 @@ function parseStateFromFlow(flow: OryFlowContainer): FormState {
         return { current: "method_active", method: methodWithMessage.group }
       } else if (
         flow.flow.active &&
-        !["default", "identifier_first"].includes(flow.flow.active)
+        !["default", "identifier_first", "oidc"].includes(flow.flow.active)
       ) {
         return { current: "method_active", method: flow.flow.active }
       } else if (isChoosingMethod(flow.flow.ui.nodes)) {
         return { current: "select_method" }
+      } else if (flow.flow.ui.messages?.some((m) => m.id === 1010016)) {
+        // Account linking edge case
+        return { current: "select_method" }
       }
       return { current: "provide_identifier" }
     }

diff --git a/packages/elements-react/src/locales/de.json b/packages/elements-react/src/locales/de.json
@@ -240,5 +240,6 @@
   "settings.title-totp": "Verwalten Sie die 2FA TOTP Authenticator-App",
   "settings.title-webauthn": "Hardware-Token verwalten",
   "settings.webauthn.info": "Hardware-Tokens werden für die Zweitfaktor-Authentifizierung oder als Erstfaktor-Authentifizierung mit Passkeys verwendet",
-  "card.footer.select-another-method": "Eine andere Methode verwenden"
+  "card.footer.select-another-method": "Eine andere Methode verwenden",
+  "account-linking.title": "Account Verbinden"
 }
diff --git a/packages/elements-react/src/locales/en.json b/packages/elements-react/src/locales/en.json
@@ -240,5 +240,6 @@
   "settings.passkey.title": "Manage Passkeys",
   "settings.passkey.description": "Manage your passkey settings",
   "settings.passkey.info": "Manage your passkey settings",
-  "card.footer.select-another-method": "Select another method"
+  "card.footer.select-another-method": "Select another method",
+  "account-linking.title": "Link account"
 }
diff --git a/packages/elements-react/src/locales/es.json b/packages/elements-react/src/locales/es.json
@@ -240,5 +240,6 @@
   "settings.title-totp": "",
   "settings.title-webauthn": "",
   "settings.webauthn.info": "",
-  "card.footer.select-another-method": ""
+  "card.footer.select-another-method": "",
+  "account-linking.title": ""
 }
diff --git a/packages/elements-react/src/locales/fr.json b/packages/elements-react/src/locales/fr.json
@@ -240,5 +240,6 @@
   "settings.webauthn.description": "",
   "settings.webauthn.info": "",
   "settings.webauthn.title": "",
-  "card.footer.select-another-method": ""
+  "card.footer.select-another-method": "",
+  "account-linking.title": ""
 }
diff --git a/packages/elements-react/src/locales/nl.json b/packages/elements-react/src/locales/nl.json
@@ -240,5 +240,6 @@
   "settings.webauthn.description": "",
   "settings.webauthn.info": "",
   "settings.webauthn.title": "",
-  "card.footer.select-another-method": ""
+  "card.footer.select-another-method": "",
+  "account-linking.title": ""
 }
diff --git a/packages/elements-react/src/locales/pl.json b/packages/elements-react/src/locales/pl.json
@@ -240,5 +240,6 @@
   "settings.webauthn.description": "",
   "settings.webauthn.info": "",
   "settings.webauthn.title": "",
-  "card.footer.select-another-method": ""
+  "card.footer.select-another-method": "",
+  "account-linking.title": ""
 }
diff --git a/packages/elements-react/src/locales/pt.json b/packages/elements-react/src/locales/pt.json
@@ -240,5 +240,6 @@
   "settings.webauthn.description": "",
   "settings.webauthn.info": "",
   "settings.webauthn.title": "",
-  "card.footer.select-another-method": ""
+  "card.footer.select-another-method": "",
+  "account-linking.title": ""
 }
diff --git a/packages/elements-react/src/locales/sv.json b/packages/elements-react/src/locales/sv.json
@@ -240,5 +240,6 @@
   "settings.webauthn.description": "Hantera inställningarna för din maskinvarutoken",
   "settings.webauthn.info": "Hårdvarutokens används för andrafaktorsautentisering eller som förstafaktor med lösenordsnycklar",
   "settings.webauthn.title": "Hantera maskinvarutokens",
-  "card.footer.select-another-method": "Välj en annan metod"
+  "card.footer.select-another-method": "Välj en annan metod",
+  "account-linking.title": "Länka ditt konto"
 }
diff --git a/packages/elements-react/src/theme/default/components/card/header.tsx b/packages/elements-react/src/theme/default/components/card/header.tsx
@@ -23,10 +23,7 @@ function InnerCardHeader({ title, text }: { title: string; text?: string }) {
 
 export function DefaultCardHeader() {
   const context = useOryFlow()
-  const { title, description } = useCardHeaderText(
-    context.flow.ui.nodes,
-    context,
-  )
+  const { title, description } = useCardHeaderText(context.flow.ui, context)
 
   return <InnerCardHeader title={title} text={description} />
 }
diff --git a/packages/elements-react/src/theme/default/utils/__tests__/constructCardHeader.spec.tsx b/packages/elements-react/src/theme/default/utils/__tests__/constructCardHeader.spec.tsx
@@ -184,7 +184,11 @@ for (const flowType of [
               const res = renderHook(
                 () =>
                   useCardHeaderText(
-                    Array.isArray(value) ? value : [value],
+                    {
+                      nodes: Array.isArray(value) ? value : [value],
+                      action: "",
+                      method: "",
+                    },
                     opts,
                   ),
                 { wrapper },

diff --git a/packages/elements-react/src/theme/default/utils/constructCardHeader.ts b/packages/elements-react/src/theme/default/utils/constructCardHeader.ts
@@ -1,7 +1,11 @@
 // Copyright © 2024 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
-import { FlowType, isUiNodeInputAttributes, UiNode } from "@ory/client-fetch"
+import {
+  FlowType,
+  isUiNodeInputAttributes,
+  UiContainer,
+} from "@ory/client-fetch"
 import { useIntl } from "react-intl"
 
 function joinWithCommaOr(list: string[], orText = "or"): string {
@@ -48,9 +52,10 @@ type opts =
  * @returns a title and a description for the card header
  */
 export function useCardHeaderText(
-  nodes: UiNode[],
+  container: UiContainer,
   opts: opts,
 ): { title: string; description: string } {
+  const nodes = container.nodes
   const intl = useIntl()
   switch (opts.flowType) {
     case FlowType.Recovery:
@@ -110,6 +115,25 @@ export function useCardHeaderText(
           id: "verification.subtitle",
         }),
       }
+    case FlowType.Login: {
+      // account linking
+      const accountLinkingMessage = container.messages?.find(
+        (m) => m.id === 1010016,
+      )
+      if (accountLinkingMessage) {
+        return {
+          title: intl.formatMessage({
+            id: "account-linking.title",
+          }),
+          description: intl.formatMessage(
+            {
+              id: "identities.messages.1010016",
+            },
+            accountLinkingMessage.context as Record<string, string>,
+          ),
+        }
+      }
+    }
   }
 
   const parts = []