WIP:Update machine

SUNET · Jan 30, 2025 · 0740419 · 0740419
1 parent 27f6750
commit 0740419
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/src/components/ResetPassword/ResetPasswordApp.tsx b/src/components/ResetPassword/ResetPasswordApp.tsx
@@ -56,9 +56,9 @@ export function ResetPasswordApp(): JSX.Element {
       {state.matches("AskForEmailOrConfirmEmail") && <AskForEmailOrConfirmEmail />}
       {state.matches("AskForEmailOrConfirmEmail.ResetPasswordConfirmEmail") && <ResetPasswordConfirmEmail />}
       {state.matches("AskForEmailOrConfirmEmail.ResetPasswordEnterEmail") && <ResetPasswordEnterEmail />}
-      {state.matches("AskForEmailOrConfirmEmail.ResetPasswordCaptcha") && <ResetPasswordCaptcha />}
-      {state.matches("AskForEmailOrConfirmEmail.ProcessCaptcha") && <ProcessCaptcha />}
-      {state.matches("AskForEmailOrConfirmEmail.EmailLinkSent") && <EmailLinkSent />}
+      {state.matches("HandleCaptcha.ResetPasswordCaptcha") && <ResetPasswordCaptcha />}
+      {state.matches("HandleCaptcha.ProcessCaptcha") && <ProcessCaptcha />}
+      {state.matches("HandleCaptcha.EmailLinkSent") && <EmailLinkSent />}
       {state.matches("HandleExtraSecurities.HandleExtraSecurities") && <HandleExtraSecurities />}
       {state.matches("FinaliseResetPassword.SetNewPassword") && <SetNewPassword />}
       {state.matches("FinaliseResetPassword.ResetPasswordSuccess") && <ResetPasswordSuccess />}

diff --git a/src/machines/ResetPasswordMachine.ts b/src/machines/ResetPasswordMachine.ts
@@ -64,8 +64,11 @@ export function createResetPasswordMachine() {
             },
             ResetPasswordConfirmEmail: {
               on: {
-                COMPLETE: {
-                  target: "ResetPasswordCaptcha",
+                API_SUCCESS: {
+                  target: "Finished",
+                },
+                API_FAIL: {
+                  target: "ResetPasswordEnterEmail",
                 },
                 GO_BACK: {
                   target: "#resetPassword.ReturnToPrevious",
@@ -74,22 +77,34 @@ export function createResetPasswordMachine() {
             },
             ResetPasswordEnterEmail: {
               on: {
-                COMPLETE: {
-                  target: "ResetPasswordCaptcha",
+                API_SUCCESS: {
+                  target: "Finished",
+                },
+                API_FAIL: {
+                  target: "ResetPasswordEnterEmail",
                 },
                 GO_BACK: {
                   target: "#resetPassword.ReturnToPrevious",
                 },
               },
             },
+
+            Finished: {
+              type: "final",
+            },
+          },
+          onDone: {
+            target: "HandleCaptcha",
+          },
+        },
+        HandleCaptcha: {
+          initial: "ResetPasswordCaptcha",
+          states: {
             ResetPasswordCaptcha: {
               on: {
                 COMPLETE: {
                   target: "ProcessCaptcha",
                 },
-                // BYPASS: {
-                //   target: "EmailLinkSent",
-                // },
               },
             },
             ProcessCaptcha: {

diff --git a/src/machines/ResetPasswordMachine.typegen.ts b/src/machines/ResetPasswordMachine.typegen.ts
@@ -19,15 +19,17 @@ export interface Typegen0 {
   matchesStates:
     | "AskForEmailOrConfirmEmail"
     | "AskForEmailOrConfirmEmail.AskForEmailOrConfirmEmail"
-    | "AskForEmailOrConfirmEmail.EmailLinkSent"
     | "AskForEmailOrConfirmEmail.Finished"
-    | "AskForEmailOrConfirmEmail.ProcessCaptcha"
-    | "AskForEmailOrConfirmEmail.ResetPasswordCaptcha"
     | "AskForEmailOrConfirmEmail.ResetPasswordConfirmEmail"
     | "AskForEmailOrConfirmEmail.ResetPasswordEnterEmail"
     | "FinaliseResetPassword"
     | "FinaliseResetPassword.ResetPasswordSuccess"
     | "FinaliseResetPassword.SetNewPassword"
+    | "HandleCaptcha"
+    | "HandleCaptcha.EmailLinkSent"
+    | "HandleCaptcha.Finished"
+    | "HandleCaptcha.ProcessCaptcha"
+    | "HandleCaptcha.ResetPasswordCaptcha"
     | "HandleExtraSecurities"
     | "HandleExtraSecurities.ExtraSecurityFinished"
     | "HandleExtraSecurities.Fail"
@@ -40,13 +42,11 @@ export interface Typegen0 {
     | {
         "AskForEmailOrConfirmEmail"?:
           | "AskForEmailOrConfirmEmail"
-          | "EmailLinkSent"
           | "Finished"
-          | "ProcessCaptcha"
-          | "ResetPasswordCaptcha"
           | "ResetPasswordConfirmEmail"
           | "ResetPasswordEnterEmail";
         "FinaliseResetPassword"?: "ResetPasswordSuccess" | "SetNewPassword";
+        "HandleCaptcha"?: "EmailLinkSent" | "Finished" | "ProcessCaptcha" | "ResetPasswordCaptcha";
         "HandleExtraSecurities"?:
           | "ExtraSecurityFinished"
           | "Fail"