From a24fc14eac8cd962551c59294273f4c2fd0c0f81 Mon Sep 17 00:00:00 2001
From: Henning Perl <henning.perl@ory.sh>
Date: Thu, 8 Feb 2024 11:44:25 +0100
Subject: [PATCH] feat: prep work for passkeys and deduplicated registration
 nodes (#179)

---
 src/react-components/ory/helpers/utils.ts     |  1 +
 src/react-components/ory/index.ts             |  2 +-
 .../ory/sections/auth-code-section.tsx        | 20 +++---
 .../ory/sections/passkey-settings-section.tsx | 13 ++--
 .../ory/sections/passwordless-section.tsx     | 54 ++++++++++----
 ...ttings-section.tsx => profile-section.tsx} | 26 +++++++
 .../ory/sections/registration-section.tsx     |  3 +-
 .../sections/webauthn-settings-section.tsx    |  4 +-
 src/react-components/ory/user-auth-card.tsx   | 70 +++++++++++++++++--
 .../ory/user-settings-card.tsx                |  2 +-
 10 files changed, 154 insertions(+), 41 deletions(-)
 rename src/react-components/ory/sections/{profile-settings-section.tsx => profile-section.tsx} (51%)

diff --git a/src/react-components/ory/helpers/utils.ts b/src/react-components/ory/helpers/utils.ts
index 1464d9aae..65a91e6d6 100644
--- a/src/react-components/ory/helpers/utils.ts
+++ b/src/react-components/ory/helpers/utils.ts
@@ -8,6 +8,7 @@ export const hasGroup = (group: string) => (nodes: UiNode[]) =>
 
 export const hasOidc = hasGroup("oidc")
 export const hasPassword = hasGroup("password")
+export const hasProfile = hasGroup("profile")
 export const hasWebauthn = hasGroup("webauthn")
 export const hasPasskey = hasGroup("passkey")
 export const hasLookupSecret = hasGroup("lookup_secret")
diff --git a/src/react-components/ory/index.ts b/src/react-components/ory/index.ts
index 360726401..0f142f38a 100644
--- a/src/react-components/ory/index.ts
+++ b/src/react-components/ory/index.ts
@@ -16,7 +16,7 @@ export * from "./sections/oidc-section"
 export * from "./sections/oidc-settings-section"
 export * from "./sections/password-settings-section"
 export * from "./sections/passwordless-section"
-export * from "./sections/profile-settings-section"
+export * from "./sections/profile-section"
 export * from "./sections/registration-section"
 export * from "./sections/totp-settings-section"
 export * from "./sections/webauthn-settings-section"
diff --git a/src/react-components/ory/sections/auth-code-section.tsx b/src/react-components/ory/sections/auth-code-section.tsx
index 22c0c80a9..d7f62625f 100644
--- a/src/react-components/ory/sections/auth-code-section.tsx
+++ b/src/react-components/ory/sections/auth-code-section.tsx
@@ -32,17 +32,15 @@ export const AuthCodeSection = ({
         }}
       />
       <div className={gridStyle({ gap: 32 })}>
-        <div className={gridStyle({ gap: 16 })}>
-          {/* default group is used here automatically for login */}
-          <FilterFlowNodes
-            filter={{
-              nodes: nodes,
-              groups: "code",
-              withoutDefaultAttributes: true,
-              excludeAttributes: ["hidden", "button", "submit"], // the form will take care of default (csrf) hidden fields
-            }}
-          />
-        </div>
+        {/* default group is used here automatically for login */}
+        <FilterFlowNodes
+          filter={{
+            nodes: nodes,
+            groups: "code",
+            withoutDefaultAttributes: true,
+            excludeAttributes: ["hidden", "button", "submit"], // the form will take care of default (csrf) hidden fields
+          }}
+        />
         {/* include hidden here because we want to have resend support */}
         {/* exclude default group because we dont want to map csrf twice */}
         <FilterFlowNodes
diff --git a/src/react-components/ory/sections/passkey-settings-section.tsx b/src/react-components/ory/sections/passkey-settings-section.tsx
index 943a1ec0d..edea27496 100644
--- a/src/react-components/ory/sections/passkey-settings-section.tsx
+++ b/src/react-components/ory/sections/passkey-settings-section.tsx
@@ -1,9 +1,9 @@
 import { JSX } from "react"
 
 import { SettingsFlow } from "@ory/client"
-import { gridStyle } from "../../../theme"
 import { FilterFlowNodes } from "../helpers/filter-flow-nodes"
 import { hasPasskey } from "../helpers/utils"
+import { gridStyle } from "../../../theme"
 
 export interface PasskeySettingsProps {
   flow: SettingsFlow
@@ -14,18 +14,19 @@ export const PasskeySettingsSection = ({
 }: PasskeySettingsProps): JSX.Element | null => {
   const filter = {
     nodes: flow.ui.nodes,
-    groups: ["passkey", "webauthn"],
+    groups: "passkey",
     withoutDefaultGroup: true,
   }
 
   return hasPasskey(flow.ui.nodes) ? (
-    <div>
+    <div className={gridStyle({ gap: 32 })}>
       <FilterFlowNodes
-        filter={{ ...filter, attributes: "submit,button" }}
-        buttonOverrideProps={{ fullWidth: false }}
+        filter={{ ...filter, excludeAttributes: "onclick,button" }}
       />
+
       <FilterFlowNodes
-        filter={{ ...filter, excludeAttributes: "submit,button" }}
+        filter={{ ...filter, attributes: "onclick,button" }}
+        buttonOverrideProps={{ fullWidth: false }}
       />
     </div>
   ) : null
diff --git a/src/react-components/ory/sections/passwordless-section.tsx b/src/react-components/ory/sections/passwordless-section.tsx
index 84b83fffa..a9ed1343b 100644
--- a/src/react-components/ory/sections/passwordless-section.tsx
+++ b/src/react-components/ory/sections/passwordless-section.tsx
@@ -8,14 +8,14 @@ import { hasPasskey, hasWebauthn } from "../helpers/utils"
 export const PasswordlessSection = (
   flow: SelfServiceFlow,
 ): JSX.Element | null => {
-  return hasWebauthn(flow.ui.nodes) || hasPasskey(flow.ui.nodes) ? (
+  return hasWebauthn(flow.ui.nodes) ? (
     <div className={gridStyle({ gap: 32 })}>
       <div className={gridStyle({ gap: 16 })}>
         <FilterFlowNodes
           filter={{
             nodes: flow.ui.nodes,
             // we will also map default fields here but not oidc and password fields
-            groups: ["webauthn", "passkey"],
+            groups: ["webauthn"],
             withoutDefaultAttributes: true,
             excludeAttributes: ["hidden", "button", "submit"], // the form will take care of hidden fields
           }}
@@ -24,7 +24,7 @@ export const PasswordlessSection = (
       <FilterFlowNodes
         filter={{
           nodes: flow.ui.nodes,
-          groups: ["webauthn", "passkey"],
+          groups: ["webauthn"],
           withoutDefaultAttributes: true,
           attributes: ["button", "submit"],
         }}
@@ -33,24 +33,52 @@ export const PasswordlessSection = (
   ) : null
 }
 
-export const PasswordlessLoginSection = (
-  flow: SelfServiceFlow,
-): JSX.Element | null => {
-  if (hasPasskey(flow.ui.nodes)) {
-    return (
-      <div className={gridStyle({ gap: 32 })}>
+export const PasskeySection = (flow: SelfServiceFlow): JSX.Element | null => {
+  return hasPasskey(flow.ui.nodes) ? (
+    <div className={gridStyle({ gap: 32 })}>
+      <div className={gridStyle({ gap: 16 })}>
         <FilterFlowNodes
           filter={{
             nodes: flow.ui.nodes,
-            groups: ["webauthn", "passkey"],
+            // we will also map default fields here but not oidc and password fields
+            groups: ["passkey"],
             withoutDefaultAttributes: true,
-            attributes: ["button", "submit"],
+            excludeAttributes: ["hidden", "button", "submit"], // the form will take care of hidden fields
           }}
         />
       </div>
-    )
-  }
+      <FilterFlowNodes
+        filter={{
+          nodes: flow.ui.nodes,
+          groups: ["passkey"],
+          withoutDefaultAttributes: true,
+          attributes: ["button", "submit"],
+        }}
+      />
+    </div>
+  ) : null
+}
+
+export const PasskeyLoginSection = (
+  flow: SelfServiceFlow,
+): JSX.Element | null => {
+  return hasPasskey(flow.ui.nodes) ? (
+    <div className={gridStyle({ gap: 32 })}>
+      <FilterFlowNodes
+        filter={{
+          nodes: flow.ui.nodes,
+          groups: ["passkey"],
+          withoutDefaultAttributes: true,
+          attributes: ["button", "submit"],
+        }}
+      />
+    </div>
+  ) : null
+}
 
+export const PasswordlessLoginSection = (
+  flow: SelfServiceFlow,
+): JSX.Element | null => {
   if (hasWebauthn(flow.ui.nodes)) {
     return (
       <div className={gridStyle({ gap: 32 })}>
diff --git a/src/react-components/ory/sections/profile-settings-section.tsx b/src/react-components/ory/sections/profile-section.tsx
similarity index 51%
rename from src/react-components/ory/sections/profile-settings-section.tsx
rename to src/react-components/ory/sections/profile-section.tsx
index 61b7ae758..b053664a9 100644
--- a/src/react-components/ory/sections/profile-settings-section.tsx
+++ b/src/react-components/ory/sections/profile-section.tsx
@@ -3,6 +3,8 @@ import { JSX } from "react"
 import { SettingsFlow } from "@ory/client"
 import { gridStyle } from "../../../theme"
 import { FilterFlowNodes } from "../helpers/filter-flow-nodes"
+import { SelfServiceFlow } from "../helpers/types"
+import { hasProfile } from "../helpers/utils"
 
 export interface ProfileSettingsProps {
   flow: SettingsFlow
@@ -24,3 +26,27 @@ export const ProfileSettingsSection = ({
     </div>
   )
 }
+
+export const ProfileRegistrationSection = (
+  flow: SelfServiceFlow,
+): JSX.Element | null => {
+  return hasProfile(flow.ui.nodes) ? (
+    <div className={gridStyle({ gap: 32 })}>
+      <FilterFlowNodes
+        filter={{
+          nodes: flow.ui.nodes,
+          groups: ["profile"],
+          excludeAttributes: "submit,hidden",
+        }}
+      />
+      <FilterFlowNodes
+        filter={{
+          nodes: flow.ui.nodes,
+          groups: ["profile"],
+          excludeAttributes: "hidden",
+          attributes: "submit",
+        }}
+      />
+    </div>
+  ) : null
+}
diff --git a/src/react-components/ory/sections/registration-section.tsx b/src/react-components/ory/sections/registration-section.tsx
index f416b5bc6..19b9bd3cf 100644
--- a/src/react-components/ory/sections/registration-section.tsx
+++ b/src/react-components/ory/sections/registration-section.tsx
@@ -19,7 +19,7 @@ export const RegistrationSection = ({
           filter={{
             nodes: nodes,
             groups: ["password"],
-            excludeAttributes: "submit",
+            excludeAttributes: "submit,hidden",
           }}
         />
       </div>
@@ -27,6 +27,7 @@ export const RegistrationSection = ({
         filter={{
           nodes: nodes,
           groups: ["password"],
+          excludeAttributes: "hidden",
           attributes: "submit",
         }}
       />
diff --git a/src/react-components/ory/sections/webauthn-settings-section.tsx b/src/react-components/ory/sections/webauthn-settings-section.tsx
index 7e9d0981f..5dd46b52e 100644
--- a/src/react-components/ory/sections/webauthn-settings-section.tsx
+++ b/src/react-components/ory/sections/webauthn-settings-section.tsx
@@ -21,10 +21,10 @@ export const WebAuthnSettingsSection = ({
   return hasWebauthn(flow.ui.nodes) ? (
     <div className={gridStyle({ gap: 32 })}>
       <FilterFlowNodes
-        filter={{ ...filter, excludeAttributes: "submit,button" }}
+        filter={{ ...filter, excludeAttributes: "onclick,button" }}
       />
       <FilterFlowNodes
-        filter={{ ...filter, attributes: "submit,button" }}
+        filter={{ ...filter, attributes: "onclick,button" }}
         buttonOverrideProps={{ fullWidth: false }}
       />
     </div>
diff --git a/src/react-components/ory/user-auth-card.tsx b/src/react-components/ory/user-auth-card.tsx
index 392e668ab..3a53f8e32 100644
--- a/src/react-components/ory/user-auth-card.tsx
+++ b/src/react-components/ory/user-auth-card.tsx
@@ -26,6 +26,7 @@ import {
   hasLookupSecret,
   hasPasskey,
   hasPassword,
+  hasProfile,
   hasTotp,
   hasWebauthn,
 } from "./helpers/utils"
@@ -35,10 +36,13 @@ import { LoggedInInfo } from "./sections/logged-info"
 import { LoginSection } from "./sections/login-section"
 import { OIDCSection } from "./sections/oidc-section"
 import {
+  PasskeyLoginSection,
+  PasskeySection,
   PasswordlessLoginSection,
   PasswordlessSection,
 } from "./sections/passwordless-section"
 import { RegistrationSection } from "./sections/registration-section"
+import { ProfileRegistrationSection } from "./sections/profile-section"
 
 export interface LoginSectionAdditionalProps {
   forgotPasswordURL?: CustomHref | string
@@ -198,7 +202,9 @@ export const UserAuthCard = ({
   let $flow: JSX.Element | null = null
   let $oidc: JSX.Element | null = null
   let $code: JSX.Element | null = null
-  let $passwordless: JSX.Element | null = null
+  let $passwordlessWebauthn: JSX.Element | null = null
+  let $passkey: JSX.Element | null = null
+  let $profile: JSX.Element | null = null
   let message: MessageSectionProps | null = null
 
   // the user might need to logout on the second factor page.
@@ -214,9 +220,17 @@ export const UserAuthCard = ({
   // passwordless can be shown if the user is not logged in (e.g. exclude 2FA screen) or if the flow is a registration flow.
   // we want the login section to handle passwordless as well when we have a 2FA screen.
   const canShowPasswordless = () =>
-    !!$passwordless &&
+    !!$passwordlessWebauthn &&
     (!isLoggedIn(flow as LoginFlow) || flowType === "registration")
 
+  // passkey can be shown if the user is not logged in (e.g. exclude 2FA screen) or if the flow is a registration flow.
+  // we want the login section to handle passwordless as well when we have a 2FA screen.
+  const canShowPasskey = () =>
+    !!$passkey &&
+    (!isLoggedIn(flow as LoginFlow) || flowType === "registration")
+
+  const canShowProfile = () => !!$profile && flowType === "registration"
+
   // the current flow is a two factor flow if the user is logged in and has any of the second factor methods enabled.
   const isTwoFactor = () =>
     flowType === "login" &&
@@ -252,7 +266,7 @@ export const UserAuthCard = ({
           <FilterFlowNodes
             filter={{
               nodes: flow.ui.nodes,
-              groups: ["passkey", "webauthn"],
+              groups: ["passkey"],
               withoutDefaultGroup: true,
             }}
           />
@@ -269,6 +283,17 @@ export const UserAuthCard = ({
           />
         </UserAuthForm>
       ),
+      hasProfile(flow.ui.nodes) && (
+        <UserAuthForm flow={flow} data-testid="profile-flow">
+          <FilterFlowNodes
+            filter={{
+              nodes: flow.ui.nodes,
+              groups: "profile",
+              withoutDefaultGroup: true,
+            }}
+          />
+        </UserAuthForm>
+      ),
       hasTotp(flow.ui.nodes) && (
         <UserAuthForm
           flow={flow}
@@ -328,7 +353,8 @@ export const UserAuthCard = ({
 
   switch (flowType) {
     case "login":
-      $passwordless = PasswordlessLoginSection(flow)
+      $passwordlessWebauthn = PasswordlessLoginSection(flow)
+      $passkey = PasskeyLoginSection(flow)
       $oidc = OIDCSection(flow)
       $code = AuthCodeSection({ nodes: flow.ui.nodes })
 
@@ -366,7 +392,9 @@ export const UserAuthCard = ({
       }
       break
     case "registration":
-      $passwordless = PasswordlessSection(flow)
+      $passwordlessWebauthn = PasswordlessSection(flow)
+      $passkey = PasskeySection(flow)
+      $profile = ProfileRegistrationSection(flow)
       $oidc = OIDCSection(flow)
       $code = AuthCodeSection({ nodes: flow.ui.nodes })
       $flow = RegistrationSection({
@@ -493,6 +521,25 @@ export const UserAuthCard = ({
           </>
         )}
 
+        {canShowPasskey() && (
+          <>
+            <Divider />
+            <UserAuthForm
+              flow={flow}
+              submitOnEnter={true}
+              onSubmit={onSubmit}
+              data-testid={"passkey-flow"}
+              formFilterOverride={{
+                nodes: flow.ui.nodes,
+                groups: ["default", "passkey"],
+                attributes: "hidden",
+              }}
+            >
+              {$passkey}
+            </UserAuthForm>
+          </>
+        )}
+
         {canShowPasswordless() && (
           <>
             <Divider />
@@ -503,13 +550,24 @@ export const UserAuthCard = ({
               data-testid={"passwordless-flow"}
               formFilterOverride={{
                 nodes: flow.ui.nodes,
+                groups: ["default", "webauthn"],
                 attributes: "hidden",
               }}
             >
-              {$passwordless}
+              {$passwordlessWebauthn}
+            </UserAuthForm>
+          </>
+        )}
+
+        {$profile && (
+          <>
+            <Divider />
+            <UserAuthForm flow={flow} data-testid={`${flowType}-flow-profile`}>
+              {$profile}
             </UserAuthForm>
           </>
         )}
+
         {message && MessageSection(message)}
       </div>
     </Card>
diff --git a/src/react-components/ory/user-settings-card.tsx b/src/react-components/ory/user-settings-card.tsx
index 4dea602e3..c8f0a36d3 100644
--- a/src/react-components/ory/user-settings-card.tsx
+++ b/src/react-components/ory/user-settings-card.tsx
@@ -19,7 +19,7 @@ import {
 import { LookupSecretSettingsSection } from "./sections/lookup-secret-settings-section"
 import { OIDCSettingsSection } from "./sections/oidc-settings-section"
 import { PasswordSettingsSection } from "./sections/password-settings-section"
-import { ProfileSettingsSection } from "./sections/profile-settings-section"
+import { ProfileSettingsSection } from "./sections/profile-section"
 import { TOTPSettingsSection } from "./sections/totp-settings-section"
 import { WebAuthnSettingsSection } from "./sections/webauthn-settings-section"
 import { useIntl } from "react-intl"