Update machine

SUNET · Jan 29, 2025 · 6f04fb1 · 6f04fb1
1 parent a9eae2e
commit 6f04fb1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 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("ResetPasswordCaptcha.ResetPasswordCaptcha") && <ResetPasswordCaptcha />}
+      {state.matches("ResetPasswordCaptcha.ProcessCaptcha") && <ProcessCaptcha />}
+      {state.matches("ResetPasswordCaptcha.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
@@ -28,7 +28,7 @@ const resetPasswordModel = createModel(
 
 export function createResetPasswordMachine() {
   const machine =
-    /** @xstate-layout N4IgpgJg5mDOIC5QCc5gC4AUCGtYHcB7ZCAOgCU0tcDiIBBAB0YGIBhAeQFlMAZAUQAq-ANoAGALqJQjQrACW6eYQB20kAA9EAJgAsADlLaArABoQAT0QBGa2IDsR4wF9n51LAw48REhSretCRMrGz0AHIA+gAiHJH8ABqC5PSRAMr8bACq5ACSggCa4lJIILIKSqrqWghi5la1ru4BNL5klJ7UPnQhLADq+QASHFmC8Ukp6Zk5+UWS6uWKymqlNXWWiGJNIB5erXSk9LAA1gBixPwAttjyADYcyGyqAGbyyJdXN7eHJ+fIn3cHk8VK93gDbuxuHwhKJ5qVFpUVqAagA2fTaUgo+zWfT2MwbBDWADM1hRpGM+iJRO06N09gcYhcbh2LW6fiOZwu10Bjxebw+3O+HL+4KBfLBgpYACECph6Gk0sUFnIllVVog0RisTi8fVEABOIliUhiU1m82m6zbXZdIJkYVcr5ikH88H+TqBNrA0ECr4seiYXLpLJsNj8BVK+EqxHVGxifUYon6sQokx6wnWXTGUj6fV5-R03TWbS2a2su0-Tn-QXOn1ujp7NkQb2uyUBoOnei5XiRmTR5axwnxxPJ1P4hrE7REk0W2faMse-bs36OnktiVfd2Nu3r313f1SjjkQS9sr9tXImw4wy5lNpgnE-TZ4yzi3z5k2z0HB3Vp28l0bncW62m0-AqOgYC-vu7bBqG4aKnCfYVAO6qEroRqkPY+jFuOV5iNYTivma77NIuTaViKNb-nWgrAV+JBgRBUEQjBnbdqeCIoZehJovqTjpsWKLGnY2K6DSxiiSSC7bm0FGrvc1GtpuDYgXQjGQeCB5HieiFnshF4PiS2ZCaJ4mSdY5g1NY+popiuh3kypEyd+K7MbWSlAeCvDyCoxxpGA4H+oGsFhhGumcQZVnocaWE4QJjIxS+RFiCRLJkRWP6iopgHfF5Pl+QF6BBR2XY9uF55IpoNjRZh2H3hO1jGAReLSapy5Vllu5unlvn+YF9CHseHEVYOmYYbF9U2NoKVOK19H2q5nXinu3wABbYCoEC3GA9AAEbEEVw36ZVazplsH7lrJgwbVtYD8Bo6DINg-kAMYAK7IEscAsBAqhgKQsDoNgEGkJ+S5kNdm3bfdj3PWA72fUocBHaqJ2IMY2jpth5JzeDpCQ7dMNPa9H1fbA+M3dDD3E-DpNI7A7DDBwGRTNkeSFJEADS-BzCUSGo+oDT2LofEotZYh0mLyZ0vYllTRLpD6sYJImLj5EE1TsMk4j8hwBTUN3dTcMI2TjMcMz-CRJgwzhJbABq-B5KcuRhIIuQcOEKMxqhxYK0rKu4QgdWkLY0v2FLEv2PYasVhrhta7TOt63HRPG3TusM2wTMs6c5D8AAUqk-C5NEXtcVVhLTboivK3FBL0gREeS+LMsx1dlPxzTJv0-rhNG9rptZ+bLPhHEiTJKkGRs7MZeRfL1f+3XDQosrmIt+H6-Rxd6XtwbqcDz3Kf94npswWkIahQhfN6QLPtVzXAdY8La9h03UdtwcR8J93Gd0eDB8WE5mACwxUQrwVnmjBA2gTAEW0DZXEgddBZkxCiVBaD0FYl0B-PwX8u7pz1ipeaACgEgNYqVCBg5oFNSMPA3UBIkzZlJBgjBwtsEQw7vvE+PdCHg0wKtP6dtILyFeC9YGyxIQ8AEMIChqEqGwNoYHYwugyTMOYVvJybV2F72Pj-Ahl06B8IEUIkRYjVCgLYmVa+EVIFyJoWiOhDQRZkiYao1BrDt7ORwRwnR+DyY8KbDDSCKhsC3C4J2CR0JpHlWOpQmBdiEHpmMPqQweJkr4TYb3TWeCk7k1OH6GR3EpxThNI1Mc6ZqTGjSWaFEGTTg+RCfITw-iKz+XQOEMA+B5qgPPnBMKViRqyJRHxTMDlynYhxh4zRpA6nBNuI0sAzTZKtPaZ08G5jyHRNvtxewRJGH2TKQSEw50NHzWmfUuZTT9F+GWR0rpA1tIFIrjsvZoz65YhzEMyOb8t7MhUIQCAcB1BgybMqGJqEAC0Bh0zgtxKQEWeZkkogMEiokYsMmLJ6MwUFWyK7UNxCLHE1loH6mxCidM2I+JNWScYLEol7CpWBRlRaVEuqCmxd7biRI8SYXQkMgwuZlHGEDgWDESVTQlkpBJCWGTMosuWm6WVf5WVfHZeXGoYlpyjkmoSEkxoMGNX0BLMQRJ9AyuZUq+VtEMUkGVXcVVc8g40lINSOqgdiTWEcGISkKtknomwo5NKniFodTlQBFaf8AngQ0myqMYLuKkm0I4JJXK3VGUxA4TMZkxpWkmacxVa5LWbh6gVcC9rIE4T4tNR+D5MxkiwbmvG+aFK2u+DMxpq1IBltGqmJNhoHFxhfDONJDKrnBsohasNbp1oGz2gdLtqENU8tRfqflK6V5upfHxJBeg8T0uqaaht6tvHf18fO7iBZpxVqXjoak5JzTEiarspFI6d6f2PdksmmTO5pxyWeiuuZYHGuvQgYWot17fIybgn9n7rUQGIcAv9VlknNVdemdCfFUlpJqYe2O77oPcNHYYlQYBBGfRMRym+FGkNCsVvYxR9lMJitfDmk5eMoMH1-rBwJyBZlhPoIhmwJKMRAe1UkytTHZwscDVM9jXDf6cO7hYNtsAO0QAE1AsShg7B9sUckodyUpOMt3n3E9OTpkqtjTimoegnXaZTeUvTLjXHuNY+RGZDTLmvpIOppM6YaSXrFQ+h9SLannPmbB0gNzVkgss1RxAuIxkvqDWc2Z4XR0RrtGkN6L0XpwHgLFtViB0LZkXtqrliVIMd1ncgdA6m8WgcJQmOBpKBJi2nBSKkY0kwoi5Qe1zuGZ37Rq-4dAH0VCCEILwQgUAfLqbzDmBr2EmsktJAJBuJpvXFl9TSRqrhXBAA */
+    /** @xstate-layout N4IgpgJg5mDOIC5QCc5gC4AUCGtYHcB7ZCAOgCU0tcDiIBBAB0YGIBlAFXvI4H1yAomwF9MAdQDaABgC6iUI0KwAlumWEAdvJAAPRFIA0IAJ76AvmaOpYGHHiIkKVO7RJNWAYXoA5XgBEAeV4BAA0OcnpeYQ8AVXIASQ4ATWk5JBBFFTVNbT0EQxNzSxBrWxoHMkobans6dxYxRIAJAJi+UPDI6LjElNltTNV1LXS8gtN8iytncrpSelgAawAxYgEAW2xlABsA5A9NADNlZHWNre2WCE0wUlh0bHRb0prXMgWVtc2dvYONY9O5x2qQGSiGOVG+iMEykUxKM1qjg+q2QQN2+yOJzO3228yWKLRv0xgJxLAA0t4AmJfDFhOQQelBtkRqAxtCitNqi4KnjPqicUT-li0byCQKMUKSRcWDFvBSqTS6QyFGDmbkoYVJsUXty5sivhdBQDsRcnFzZiQ-sa0SwPAEALKYAAyIgEyoyquG6vy7K1nLKiPe+INPwl1pxZoDbytwtJAHEggAhegeMnupleyE+zWw7UIt6ikPomNSnaR14VAQaJ786V2x0ujhu-qMz0Q1kamFwnUWoN8wlh2OmqpRyvVsC1nYsBO8ZOp9Ntlm6Tsc+HmwOFyfF4kmssjit0DzYRjoADGAAtsLaHc7XQuspmO9mu3n1wX9VujUOy5hkIRT3AsBHieF5XvQmDxFEMQeB4QhsPe4JLmyObdvmPIfgOJa7riv7-oBwFnpeLDgZByz0PEToIWqWbjKuPYbhh4pYSKuEAXgBGgewXA8PwQgiLw4hUY+y7PnRaF6sGn6DqWuJok6ygaIsbBgNWDTNK07RhBEUQCLECTJEJ7YibRfprqOEn9kxO4inJClKSp6C2i0ATCDpem9LwZICH0aQqg+RnIS+-oHkikmYdZEa2YpymqTOc5pi2fmId6Jm5sFuqOE02AaBA2xgAIOjoMg2DKaeACuyBDHAVw3HcDxPKQ9EFllOV5QVRUlWA5WVWocCGUhiAAKwAEy+gAHAAjKQg2oW+PItbl+WFcVpUVVVsCkAtbXLZ13XrU5AQuQIbk9Mknnef12gTAA7AALAAnKQABsE33VIt3XS9b0fddRh5BNw3vaQ92DQAzADM2vuZmXZYt7UrV1a29RtW1LR1q09co1UeM5rnLIIABSkQCPEfiXVmANAyD4PDYNvrXVIU1fe9n2vSz12zdDZCo-Du1I1jKOw9t6OI5j1WNBwLRtMEWldLpp0+aC-kDaJplNfNQtowje3I5tmu8xj+0kVBMFweTT6U7dwNgxD413c9bMfczP2cyF3P6zthu6-uGUQF7xhkmAxjERBJuwWw8GJR6yvesNtNTcN91PWN1105qt23YNz1PTnud509d2u77eutVrfNixtPu9v7gfB8bZEUebIlx4NCdJynacTKDIOkBN+f94XUNuyXcOe6L63lr77UTho2DbPaZHXg2d5RxmAWIC3bfJ6nvqDfdY2kKnUjHyfp8TUXvYj8L2v83ApDLNKTd5MNoMv6QjODU9tO+q-Ujv6fACT5PQvhuZYCk57KBsFXDcyl0DeDAPgX2IdIJsGguHSOvlo7JSzMNJ6j0Jq3SkF-TuiBQbXSmpDdKl8wGz22JAsA0CCywPgYg3s04kwpgSpgteKtUogILDQiBUDxKOGYQgpBnBuCaU6CdfSitWwxxor6XMxQNCEAgHAbQ6s6BK2wU+AAtEnX0+iJqp3-ifWmydAYp1uvwnkjCKjuF0dRJ8rdSA2PuhNSa90473XIU9emr1pqvTGp-a65CPrDTsRZMUhppLYWccJPI+jbpjWMSnUgD17r71TnHWmUgxpjWiaFSycTmIRkYmUiKFxEnrwQLdN+b1iG+gmuDP++cJqDTGu9KQoMilD2LpU0M5ThwiIgCMnYtSVZjWGgfV+k1v6alaaY9+Y1QY033jMyalCzLDyGduSU2FJ69irDWNEUzvR92Gtdaa90yEkIQMsrOT0pARNmYNCJ4Nil9licM6pe4xkcUvBcpRSzBpSEegU9ZANNmzM6d8zc4VDksT-GxICx5CLYBBU+Eyfdbqg2mms9ZRLsnXRBgi-ZX4ZKkCivZas2KRIQ0eoDGmDyJoEKepkilYUrLIojDQyB55IAMv+l-G5e97ktKkOC8xgCLEIp5mPHWAsRWIBSWkzU+iMlZJySNFuBT+lUI3IqkWyq74mpvhXVVCAxqeNICy22mo7qPWdqzb64SFUe1NbfSuYya5B2tSEqa10FkPPxY9I+cqgGetLgbce3sxnT2QLQhe9BA1+OGu-Vlu9sn2vBVGxmMbR7eorjSpVSNjACtgEKiA1rhoNIPhNCFkrNR7wPgWk+58BmXwteXCeD9JkKL0c3Btvdm0701N3Rt-d86DyNQI8BdDhFzR0UOlxIlu6+lmQS+t2SPn4t6aDVutju2gMXfQhxcwxGsMDNalOP9rpRNPQu2hF6xnHMDGwMqp40XWvxVnamjqu4M0Pjs7RjhKDoAqhoDghBfxgAAG7qDKvANdSShrBtwb0j5R6tkaomH3VptynqEPIdKkGT7532IwNB2D8GkOEBQ04KDya6OoAYyh61ubH0vKPddXDsz8OIFMYzd+ScM5J1Ti9DmFgzBAA */
     resetPasswordModel.createMachine({
       context: resetPasswordModel.initialContext,
       tsTypes: {} as import("./ResetPasswordMachine.typegen").Typegen0,
@@ -65,7 +65,7 @@ export function createResetPasswordMachine() {
             ResetPasswordConfirmEmail: {
               on: {
                 COMPLETE: {
-                  target: "ResetPasswordCaptcha",
+                  target: "#resetPassword.ResetPasswordCaptcha",
                 },
                 GO_BACK: {
                   target: "#resetPassword.ReturnToPrevious",
@@ -75,13 +75,24 @@ export function createResetPasswordMachine() {
             ResetPasswordEnterEmail: {
               on: {
                 COMPLETE: {
-                  target: "ResetPasswordCaptcha",
+                  target: "#resetPassword.ResetPasswordCaptcha",
                 },
                 GO_BACK: {
                   target: "#resetPassword.ReturnToPrevious",
                 },
               },
             },
+            // Finished: {
+            //   type: "final",
+            // },
+          },
+          // onDone: {
+          //   target: "ResetPasswordCaptcha",
+          // },
+        },
+        ResetPasswordCaptcha: {
+          initial: "ResetPasswordCaptcha",
+          states: {
             ResetPasswordCaptcha: {
               on: {
                 COMPLETE: {

diff --git a/src/machines/ResetPasswordMachine.typegen.ts b/src/machines/ResetPasswordMachine.typegen.ts
@@ -19,10 +19,6 @@ export interface Typegen0 {
   matchesStates:
     | "AskForEmailOrConfirmEmail"
     | "AskForEmailOrConfirmEmail.AskForEmailOrConfirmEmail"
-    | "AskForEmailOrConfirmEmail.EmailLinkSent"
-    | "AskForEmailOrConfirmEmail.Finished"
-    | "AskForEmailOrConfirmEmail.ProcessCaptcha"
-    | "AskForEmailOrConfirmEmail.ResetPasswordCaptcha"
     | "AskForEmailOrConfirmEmail.ResetPasswordConfirmEmail"
     | "AskForEmailOrConfirmEmail.ResetPasswordEnterEmail"
     | "FinaliseResetPassword"
@@ -35,15 +31,16 @@ export interface Typegen0 {
     | "HandleExtraSecurities.ResetPasswordExternalMFA"
     | "HandleExtraSecurities.ResetPasswordSecurityKey"
     | "ResetPasswordApp"
+    | "ResetPasswordCaptcha"
+    | "ResetPasswordCaptcha.EmailLinkSent"
+    | "ResetPasswordCaptcha.Finished"
+    | "ResetPasswordCaptcha.ProcessCaptcha"
+    | "ResetPasswordCaptcha.ResetPasswordCaptcha"
     | "ReturnToPrevious"
     | "ReturnToPrevious.ReturnToPrevious"
     | {
         "AskForEmailOrConfirmEmail"?:
           | "AskForEmailOrConfirmEmail"
-          | "EmailLinkSent"
-          | "Finished"
-          | "ProcessCaptcha"
-          | "ResetPasswordCaptcha"
           | "ResetPasswordConfirmEmail"
           | "ResetPasswordEnterEmail";
         "FinaliseResetPassword"?: "ResetPasswordSuccess" | "SetNewPassword";
@@ -53,6 +50,7 @@ export interface Typegen0 {
           | "HandleExtraSecurities"
           | "ResetPasswordExternalMFA"
           | "ResetPasswordSecurityKey";
+        "ResetPasswordCaptcha"?: "EmailLinkSent" | "Finished" | "ProcessCaptcha" | "ResetPasswordCaptcha";
         "ReturnToPrevious"?: "ReturnToPrevious";
       };
   tags: never;