@indietabletop/appkit 5.1.0 → 5.2.1

package/lib/account/JoinCard.tsx

@@ -1,6 +1,6 @@
 import { Form, useStoreState } from "@ariakit/react";
 import { type Dispatch, type SetStateAction, useState } from "react";
-import { Link, useLocation } from "wouter";
+import { Link } from "wouter";
 import { useAppConfig, useClient } from "../AppConfig/AppConfig.tsx";
 import { cx } from "../class-names.ts";
 import { interactiveText } from "../common.css.ts";
@@ -163,14 +163,7 @@ type SubmitCodeStepProps = {
 
 function SubmitCodeStep(props: SubmitCodeStepProps) {
   const { tokenId, email, setStep } = props;
-  const [_, navigate] = useLocation();
   const client = useClient();
-  const redirectPath = useRedirectPath();
-
-  // Use redirect path if found in search params, otherwise go the success step.
-  const onSuccess = redirectPath
-    ? () => navigate(redirectPath)
-    : () => setStep({ type: "SUCCESS" });
 
   const { form, submitName } = useForm({
     defaultValues: {
@@ -185,7 +178,9 @@ function SubmitCodeStep(props: SubmitCodeStepProps) {
         });
       });
     },
-    onSuccess,
+    onSuccess() {
+      setStep({ type: "SUCCESS" });
+    },
   });
 
   return (
@@ -218,6 +213,8 @@ function SubmitCodeStep(props: SubmitCodeStepProps) {
 
 function SuccessStep() {
   const { hrefs } = useAppConfig();
+  const redirectPath = useRedirectPath();
+
   return (
     <Letterhead>
       <LetterheadHeader>
@@ -227,8 +224,8 @@ function SuccessStep() {
         </LetterheadParagraph>
       </LetterheadHeader>
 
-      <Link href={hrefs.dashboard()} {...cx(button())}>
-        Go to dashboard
+      <Link href={redirectPath ?? hrefs.dashboard()} {...cx(button())}>
+        {redirectPath ? "Continue" : "Go to dashboard"}
       </Link>
     </Letterhead>
   );

package/lib/store/store.ts

@@ -206,11 +206,27 @@ const config = setup({
       // Otherwise check that user IDs match.
       return context.currentUser.id === event.currentUser.id;
     },
+
+    hasBecomeEligibleForSync: and(["isNotMismatched", "hasBecomeVerified"]),
+
+    hasBecomeVerified: ({ event, context }) => {
+      assertEvent(event, "currentUser");
+
+      if (!context.currentUser) {
+        return false;
+      }
+
+      // User was unverified previously, but now they are verified.
+      return (
+        context.currentUser.isVerified === false &&
+        event.currentUser.isVerified === true
+      );
+    },
   },
 });
 
 export const machine = config.createMachine({
-  /** @xstate-layout N4IgpgJg5mDOIC5QEMAOqDEAnOYAuA2gAwC6ioqA9rAJZ42UB25IAHogLQBMRAbAHQBOQbwCMggOy8ALES7DRAGhABPTvIn8AzAA5B0rdN4BWCRKKDRvAL7XlaVPwCujZE7wALMI3oBjZHiQGL5OWDg+AKqwYFjEZEggVLT0TCzsCMai0vzSejrGRIayvLwSymoIHLmi-MZcvIa6+bk8xrb26M6u7l4+NP6BEMGh4XhRMQSi8RTUdAzMCem5RPw6WlziZryWEqJKqojCK1oSgvXrRMZXRu0gDl1unt5+AUEhYc-jsVzTibMpC1ASx05UOolu9xcj16L0GGGiWAAbjEvnEWEk5qlFoguDoiKDKntwXY7p1oc9+q8hu9RqjSOj-vM0ohpCIhKJClwuFIdnsCaIuEZ+LxcdzpLtpFxMhCyT0KQM3iNPgjJr8MQDmYSOfzBDLHOS+gqhtFYLQmABJRgAM0oaIS6qZ2IQOiF6y0gh0OismQken5goEIp0YolUuJHX1csNVPhcDNjAAoqxUDQcBA7TNko6gYhDDUtIUBUQDBIpTxeASOO6uPwNroJNIBcZPQ2bCT7gbYZB+LAVIxfD2+74aIwoBgIEwwD28K9+B2o12IIP+8vh6OM38s1icwguTJaqIG4IC3sG1oCdzjPxzJJjFpxBz78W9XOF5TBqvVyOx6gnLAPBuDrbmwiAckQNT6HogimPopiGAS0imPwoh6Fy5iSmsegvp277dr2K74WuUD8L+AA2pHfuOk78COiKUAA1lO85PNGH6EV+o4kU45HfggtGUAM8xxIBjLAekRbZPk+gGAWLolOeBwIFYqynMe+QSuB0nYW+RqfoR35cTxo4YDEWCUFgJGkQENpYAAtnOsosYuelDgZZEUaOfGMHRglMMJ9L2qJgIgUpWTZGI5imKWDY6BWilZFotasiYDS5MYurto5MK4Uu7H6Zxv7-pRE6MFO-GMQ5kZOTlLn9m5f4eLx-G+Yw-lqkFmpWL6qzgeYBZELs3L7BUBbIXwBSiLouJiMGXDadVul5a5BUNZRpnmZZ1nmfZzHZYtQ4ccRhWNZ5zUBEJpAiVuwXicYJSrDJvAuni+goRegq1IYZYeqeWRtJlVV7VSn40BApFgBgx1XZiN2gYIfAHkeJxELFLoElI2QodBJ6CnoDbzUDbEHaD4OQ9xpHQxqTobPUPUCp6hQlFKxgEg0gi1FyxjSIhWiyVKBPysD7EkxDlPZiFKFiNovMnOYoqIVwBJeolMtaHUkoNMG4akoDgtEyuADuyBzMZUMBZmMOdVINY+qyBY-WUilPTWWOtJK7oNBIAusXhB1GybY6sLAM6BHOVqBFgAAUogFEQACUGC7XrvuG8b9Drubm6W06WRcrW1vine0HSQSzaaCKyO8EQcgDdztgkowlAQHALAOAy12atwXNCCImwyHICiVmIAhyKlTRc8GL5QjpVLt9nO4cIe2TmIU1exWXa+VkYNQx8GDQyJN-X-RGr4LbPgUd06wbZFwuiXEjIjHlvUjCgYrLwwK3ImN7zkjmAFFQBoAAI3BnPKmO5PSJVOOBXQx4Ni+gJEcVYVxgymCsDoUsc0Aan0JinXwYDxbpAwTWW+eJTB20fgpCoVZuav0MEcT+Uhj46xwcnXKB18pQAIWJQ4PBax33IceShlZDw6Doe-cCaEZBthPjhfaBFlpHXJt+bhsMEAiDEaQ++FDthUNAuFca4FeqyA9BlWRM99YDk4VxIqo5VGdQwjkBoVgUYum9HopSkleZ8DVjwSaVhDw-xqktOqnFCKQHsTnSwNRIrNmELkSUjsKiTW0HdWOHozC3zqDoIJ8irGKP4FaY24MICRJ3H4zQaDGzpQ5DHBBilb7s0PDFQUgoRBbFyULYmYMwBlJChsFC2hJEYLWOYDB6MRSpIihIK4DYhqdMsfwf26cuEX3nhLRsYiTiHyyKWSUAoJk1jVtM2ZiStD12sEAA */
+  /** @xstate-layout N4IgpgJg5mDOIC5QEMAOqDEAnOYAuA2gAwC6ioqA9rAJZ42UB25IAHogLQBMRAbAHQBOQbwCMggOy8ALES7DRAGhABPTvIn8AzAA5B0rdN4BWCRKKDRvAL7XlaVPwCujZE7wALMI3oBjZHiQGL5OWDg+AKqwYFjEZEggVLT0TCzsCEZc-FyiXHqiOtJcvLwSymoI3Fqi-LkiIjkSIrIStvbozq7uXj40-oEQwaHheFExBKLxFNR0DMwJ6dJL-GJ1gkTSwubS5Yj6mjrG602F0ietdiAOnW6e3n4BQSFh92OxXFOJMynzoIs6uwQljaVw6LluPQeAww0SwADcYm84iwkrNUgtEHkiICOKI8SDrhD7n1HoNniMkaQUd85mlELkctktLxDkQdDoJFYuGVVPTREZaoZjMKdNzRFILu1HETev0nsNXrCJp9UT86QhRVkiHVjDIiHwSlxAXiBaJDEVqkRzNVpASOjKofKXpElR9qclaRiENjed67dLusS5YNorBaEwAJKMABmlGRCVVnr+9JKAkE3LyPF4zN0Sl9JoEZukwuMos5Ev9-AdJOhofDjAAoqxUDQcBB49MPejkwhDDUtERqjwDBIuMYszitOnsmaOdJcqW5zZLoTA7LSfxYCpGL5N9vfDRGFAMBAmGBN3hHlX7WvHRA9zuHwejx2vl3fmxMcVpPxjOLNgOeISAYgLcsY-DmJIxjVJYg6iBslbVsGT5Poex6oE4sAeK+ibdp+CDwdqQjSHogimPopiGICxaaAU6bchseS6IIiG3jWkAoVuO5ofwGEADZ8WhJ5nvwh5wpQADW56rnc64DJx+48fxglHggYmUP0cxxDhNJ4ekuQbPwhz6AYA6FCUWjGgIHLCLopj8tqJmsbJd4KdxR68U4AlCTEWCUFgvF8QEsZYAAtteAYuex95cbusVKV5KlQGpjDiZpTDaVSCa6R++n8j+YjmKYo7ATovDGgY2SbCY2YkUczmQtFbnPlAnlYUJp6MOe6lSRFVZschsWoR5GHtap6npYwmUqjl6pWBIOhGdq1r6pyYqAgOtR8MY2q6HkYiag1QYbkN8UjZhHg+WE-mBcF-nhTJjWDfuw2taNl3jalGkBFppA6e+c26tZpksiRFjzgCvpcFwP7QUU46CDoQH8sYR1yRxQ00BAfFgBg73-WiuX0usAh-sBghaOYZWFICUg-nR0HajDejAWjrmY9juPKQTapejkxRLbk7KDoawqAtmgi-tDxhLNBZljmzTUczjGA80m+EFGI2haDrZhyKKxZGr6SNaNrOvjkU2aiqIivPY+ADuyCzEeeMXWren0lIWRkwBFhIzyFQslkdE8DLXBTtmkqgpFT0nS9jvO8erCwJegRVtGgRYAAFKIO1EAAlBgj3HfJQ0J-QL5ZZ2hNzUUWTcrwMMSNBZEmYCpaaI3lN8PqPDAbaIKMJQEBwCwDjujXXrcDLQgiOIdNyAoOKrLUBjjloPDHFOlbggNpIT7zPa4sBEH6gObImBy+qQxUHBGDUueitmMhmufqMrjeUXBgf6vpAbTI6CIKYAC9RLK+jvlIFYa9zakUcu-KU-Uv4bkPGAQSUAaAACMcY-w9kCQy4ckZ4gUGRcQgIKbgRRpsM0RYmhR2LujGK+4cFEw1KOABQDyYRwppOZYMgtC6m1DIUUSNlwIKQnHR8Z0oDMPVOmIg7DgEU1ATicUi0+FwxkLBeCdDP6x1Li9KRnlvJHhkV6EQi0CEcJAbwbh+YCrbW1MtWQiMWIfxjiXDGBjFLnTGtI7KAMvT8jyPwIw1ReBskKFYaCFUjI6z4Pwng1DCq2wkXFbxrVYqQFMT2cQeJT4imECRIoAd6Sm34SYfUiMzDh3HDoFJ+jJHpP4NGJ2OMIDZPwokzQ9l5xHHgrnBaoEpy1DMCRGGMMRBmFEdHRBejPGPixtg-xk8ew5AKNoJmHIdDdw5LTRu2hdTimbsAsU9T5m7nLmhDp+kIbaE5Drfko4ii5D2VkcpRzhTAW5FoWwtggA */
   id: "app",
   context: () => createInitialContext(),
 
@@ -274,6 +290,16 @@ export const machine = config.createMachine({
 
       on: {
         currentUser: [
+          {
+            guard: "hasBecomeEligibleForSync",
+            target: "authenticated",
+            reenter: true,
+
+            actions: {
+              type: "setCurrentUser",
+              params: ({ event }) => event.currentUser,
+            },
+          },
           {
             guard: "isNotMismatched",
             actions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indietabletop/appkit",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "A collection of modules used in apps built by Indie Tabletop Club",
   "private": false,
   "type": "module",