@sqrzro/auth 2.0.0-bz.4 → 2.0.0-bz.6

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @sqrzro/auth@2.0.0-bz.2 build /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
+> @sqrzro/auth@2.0.0-bz.5 build /Users/richardcarter/Sites/@sqrzro/sqrzro/packages/auth
 > tsc -p tsconfig.json
 

package/.turbo/turbo-dev.log

@@ -1,640 +1,28 @@
 
-> @sqrzro/auth@2.0.0-bz.3 dev /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
+> @sqrzro/auth@2.0.0-bz.4 dev /Users/richardcarter/Sites/@sqrzro/sqrzro/packages/auth
 > tsc -p tsconfig.json --watch
 
-c[8:24:00 AM] Starting compilation in watch mode...
+c[2:25:34 PM] Starting compilation in watch mode...
 
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
+[2:25:38 PM] Found 0 errors. Watching for file changes.
 
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
+c[2:25:43 PM] File change detected. Starting incremental compilation...
 
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
+[2:25:44 PM] Found 0 errors. Watching for file changes.
 
-[8:24:02 AM] Found 1 error. Watching for file changes.
+c[2:25:49 PM] File change detected. Starting incremental compilation...
 
-c[8:24:05 AM] File change detected. Starting incremental compilation...
+[2:25:50 PM] Found 0 errors. Watching for file changes.
 
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
+c[2:29:41 PM] File change detected. Starting incremental compilation...
 
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
+[2:29:42 PM] Found 0 errors. Watching for file changes.
 
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
+c[2:29:43 PM] File change detected. Starting incremental compilation...
 
-[8:24:05 AM] Found 1 error. Watching for file changes.
+[2:29:43 PM] Found 0 errors. Watching for file changes.
 
-c[8:24:09 AM] File change detected. Starting incremental compilation...
+c[2:29:56 PM] File change detected. Starting incremental compilation...
 
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:24:09 AM] Found 1 error. Watching for file changes.
-
-c[8:25:15 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:25:15 AM] Found 1 error. Watching for file changes.
-
-c[8:25:16 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:25:16 AM] Found 1 error. Watching for file changes.
-
-c[8:26:29 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:26:29 AM] Found 1 error. Watching for file changes.
-
-c[8:26:31 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:26:31 AM] Found 1 error. Watching for file changes.
-
-c[8:59:42 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[8:59:42 AM] Found 1 error. Watching for file changes.
-
-c[9:01:14 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:01:14 AM] Found 1 error. Watching for file changes.
-
-c[9:03:32 AM] File change detected. Starting incremental compilation...
-
-src/components/PasswordPage/index.tsx:3:31 - error TS2307: Cannot find module '../PasswordResetForm' or its corresponding type declarations.
-
-3 import PasswordResetForm from '../PasswordResetForm';
-                                ~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/TokenPasswordResetForm/index.tsx:6:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'TokenPasswordResetFormFields'.
-
-6 import type { TokenPasswordResetFormFields } from '@sqrzro/server/auth';
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/TokenPasswordResetForm/index.tsx:31:19 - error TS2552: Cannot find name 'submitTokenPasswordResetForm'. Did you mean 'submitPasswordResetForm'?
-
-31         onSubmit: submitTokenPasswordResetForm,
-                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/TokenPasswordResetForm/index.tsx:51:16 - error TS2552: Cannot find name 'PasswordResetForm'. Did you mean 'TokenPasswordResetForm'?
-
-51 export default PasswordResetForm;
-                  ~~~~~~~~~~~~~~~~~
-
-  src/components/TokenPasswordResetForm/index.tsx:22:10
-    22 function TokenPasswordResetForm({
-                ~~~~~~~~~~~~~~~~~~~~~~
-    'TokenPasswordResetForm' is declared here.
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:03:32 AM] Found 5 errors. Watching for file changes.
-
-c[9:03:45 AM] File change detected. Starting incremental compilation...
-
-src/components/PasswordPage/index.tsx:3:31 - error TS2307: Cannot find module '../PasswordResetForm' or its corresponding type declarations.
-
-3 import PasswordResetForm from '../PasswordResetForm';
-                                ~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/TokenPasswordResetForm/index.tsx:6:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'TokenPasswordResetFormFields'.
-
-6 import type { TokenPasswordResetFormFields } from '@sqrzro/server/auth';
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/TokenPasswordResetForm/index.tsx:8:10 - error TS2724: '"../../server"' has no exported member named 'submitTokenPasswordResetForm'. Did you mean 'submitPasswordResetForm'?
-
-8 import { submitTokenPasswordResetForm } from '../../server';
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  src/server.ts:87:23
-    87 export async function submitPasswordResetForm(
-                             ~~~~~~~~~~~~~~~~~~~~~~~
-    'submitPasswordResetForm' is declared here.
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:03:45 AM] Found 4 errors. Watching for file changes.
-
-c[9:04:10 AM] File change detected. Starting incremental compilation...
-
-src/components/PasswordResetForm/index.tsx:6:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'TokenPasswordResetFormFields'.
-
-6 import type { TokenPasswordResetFormFields } from '@sqrzro/server/auth';
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/components/PasswordResetForm/index.tsx:8:10 - error TS2724: '"../../server"' has no exported member named 'submitTokenPasswordResetForm'. Did you mean 'submitPasswordResetForm'?
-
-8 import { submitTokenPasswordResetForm } from '../../server';
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  src/server.ts:87:23
-    87 export async function submitPasswordResetForm(
-                             ~~~~~~~~~~~~~~~~~~~~~~~
-    'submitPasswordResetForm' is declared here.
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:04:10 AM] Found 3 errors. Watching for file changes.
-
-c[9:04:43 AM] File change detected. Starting incremental compilation...
-
-src/components/PasswordResetForm/index.tsx:7:10 - error TS2724: '"../../server"' has no exported member named 'submitTokenPasswordResetForm'. Did you mean 'submitPasswordResetForm'?
-
-7 import { submitTokenPasswordResetForm } from '../../server';
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  src/server.ts:87:23
-    87 export async function submitPasswordResetForm(
-                             ~~~~~~~~~~~~~~~~~~~~~~~
-    'submitPasswordResetForm' is declared here.
-
-src/components/PasswordResetForm/index.tsx:27:25 - error TS2345: Argument of type '{ token: string; } | "/"' is not assignable to parameter of type 'string'.
-  Type '{ token: string; }' is not assignable to type 'string'.
-
-27             router.push(response || '/');
-                           ~~~~~~~~~~~~~~~
-
-src/components/PasswordResetForm/index.tsx:36:51 - error TS2345: Argument of type '"password"' is not assignable to parameter of type '"token"'.
-
-36                 <PasswordFormField {...fieldProps('password', 'New Password')} />
-                                                     ~~~~~~~~~~
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:04:43 AM] Found 4 errors. Watching for file changes.
-
-c[9:04:51 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:90:36 - error TS2345: Argument of type 'PasswordResetFormFields' is not assignable to parameter of type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-  Property 'old' is missing in type 'PasswordResetFormFields' but required in type 'import("/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index").PasswordResetFormFields'.
-
-90     return handlePasswordResetForm(formData);
-                                      ~~~~~~~~
-
-  ../server/dist/auth/index.d.ts:18:5
-    18     old: string;
-           ~~~
-    'old' is declared here.
-
-[9:04:51 AM] Found 1 error. Watching for file changes.
-
-c[9:05:06 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:4:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleLoginForm'.
-
-4     handleLoginForm,
-      ~~~~~~~~~~~~~~~
-
-src/server.ts:5:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleLogout'.
-
-5     handleLogout,
-      ~~~~~~~~~~~~
-
-src/server.ts:6:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleMFAForm'.
-
-6     handleMFAForm,
-      ~~~~~~~~~~~~~
-
-src/server.ts:7:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handlePasswordForm'.
-
-7     handlePasswordForm,
-      ~~~~~~~~~~~~~~~~~~
-
-src/server.ts:8:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleTokenPasswordResetForm'.
-
-8     handleTokenPasswordResetForm,
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/server.ts:9:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'checkUserHasMFA'.
-
-9     checkUserHasMFA as serverCheckUserHasMFA,
-      ~~~~~~~~~~~~~~~
-
-src/server.ts:10:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'generateMFA'.
-
-10     generateMFA as serverGenerateMFA,
-       ~~~~~~~~~~~
-
-src/server.ts:11:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'getSessionUser'.
-
-11     getSessionUser as serverGetSessionUser,
-       ~~~~~~~~~~~~~~
-
-src/server.ts:12:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'checkMFAEnabled'.
-
-12     checkMFAEnabled as syncCheckMFAEnabled,
-       ~~~~~~~~~~~~~~~
-
-src/server.ts:14:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'LoginFormFields'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                 ~~~~~~~~~~~~~~~
-
-src/server.ts:14:32 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'MFAFormFields'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                                  ~~~~~~~~~~~~~
-
-src/server.ts:14:47 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'UserObject'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                                                 ~~~~~~~~~~
-
-src/server.ts:17:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'MFAFormFields'.
-
-17 export type { MFAFormFields, ScopeObject } from '@sqrzro/server/auth';
-                 ~~~~~~~~~~~~~
-
-src/server.ts:17:30 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'ScopeObject'.
-
-17 export type { MFAFormFields, ScopeObject } from '@sqrzro/server/auth';
-                                ~~~~~~~~~~~
-
-[9:05:06 AM] Found 14 errors. Watching for file changes.
-
-c[9:05:29 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:4:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleLoginForm'.
-
-4     handleLoginForm,
-      ~~~~~~~~~~~~~~~
-
-src/server.ts:5:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleLogout'.
-
-5     handleLogout,
-      ~~~~~~~~~~~~
-
-src/server.ts:6:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handleMFAForm'.
-
-6     handleMFAForm,
-      ~~~~~~~~~~~~~
-
-src/server.ts:7:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handlePasswordForm'.
-
-7     handlePasswordForm,
-      ~~~~~~~~~~~~~~~~~~
-
-src/server.ts:8:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'handlePasswordResetFormWithToken'.
-
-8     handlePasswordResetFormWithToken,
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-src/server.ts:9:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'checkUserHasMFA'.
-
-9     checkUserHasMFA as serverCheckUserHasMFA,
-      ~~~~~~~~~~~~~~~
-
-src/server.ts:10:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'generateMFA'.
-
-10     generateMFA as serverGenerateMFA,
-       ~~~~~~~~~~~
-
-src/server.ts:11:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'getSessionUser'.
-
-11     getSessionUser as serverGetSessionUser,
-       ~~~~~~~~~~~~~~
-
-src/server.ts:12:5 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'checkMFAEnabled'.
-
-12     checkMFAEnabled as syncCheckMFAEnabled,
-       ~~~~~~~~~~~~~~~
-
-src/server.ts:14:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'LoginFormFields'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                 ~~~~~~~~~~~~~~~
-
-src/server.ts:14:32 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'MFAFormFields'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                                  ~~~~~~~~~~~~~
-
-src/server.ts:14:47 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'UserObject'.
-
-14 import type { LoginFormFields, MFAFormFields, UserObject } from '@sqrzro/server/auth';
-                                                 ~~~~~~~~~~
-
-src/server.ts:17:15 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'MFAFormFields'.
-
-17 export type { MFAFormFields, ScopeObject } from '@sqrzro/server/auth';
-                 ~~~~~~~~~~~~~
-
-src/server.ts:17:30 - error TS2305: Module '"@sqrzro/server/auth"' has no exported member 'ScopeObject'.
-
-17 export type { MFAFormFields, ScopeObject } from '@sqrzro/server/auth';
-                                ~~~~~~~~~~~
-
-[9:05:29 AM] Found 14 errors. Watching for file changes.
-
-c[9:08:07 AM] File change detected. Starting incremental compilation...
-
-[9:08:08 AM] Found 0 errors. Watching for file changes.
-
-c[9:08:26 AM] File change detected. Starting incremental compilation...
-
-[9:08:26 AM] Found 0 errors. Watching for file changes.
-
-c[9:08:28 AM] File change detected. Starting incremental compilation...
-
-[9:08:28 AM] Found 0 errors. Watching for file changes.
-
-c[9:08:51 AM] File change detected. Starting incremental compilation...
-
-[9:08:51 AM] Found 0 errors. Watching for file changes.
-
-c[9:08:53 AM] File change detected. Starting incremental compilation...
-
-src/server.ts:8:5 - error TS2724: '"@sqrzro/server/auth"' has no exported member named 'handlePasswordResetFormWithToken'. Did you mean 'handlePasswordResetWithTokenForm'?
-
-8     handlePasswordResetFormWithToken,
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-[9:08:53 AM] Found 1 error. Watching for file changes.
-
-c[9:09:17 AM] File change detected. Starting incremental compilation...
-
-[9:09:17 AM] Found 0 errors. Watching for file changes.
-
-c[9:10:53 AM] File change detected. Starting incremental compilation...
-
-[9:10:53 AM] Found 0 errors. Watching for file changes.
-
-c[9:10:54 AM] File change detected. Starting incremental compilation...
-
-[9:10:55 AM] Found 0 errors. Watching for file changes.
-
-c[9:11:14 AM] File change detected. Starting incremental compilation...
-
-[9:11:14 AM] Found 0 errors. Watching for file changes.
-
-c[9:11:16 AM] File change detected. Starting incremental compilation...
-
-[9:11:16 AM] Found 0 errors. Watching for file changes.
-
-c[9:12:41 AM] File change detected. Starting incremental compilation...
-
-[9:12:41 AM] Found 0 errors. Watching for file changes.
-
-c[9:12:42 AM] File change detected. Starting incremental compilation...
-
-[9:12:42 AM] Found 0 errors. Watching for file changes.
-
-c[9:13:23 AM] File change detected. Starting incremental compilation...
-
-[9:13:23 AM] Found 0 errors. Watching for file changes.
-
-c[9:13:24 AM] File change detected. Starting incremental compilation...
-
-[9:13:25 AM] Found 0 errors. Watching for file changes.
-
-c[9:42:55 AM] File change detected. Starting incremental compilation...
-
-[9:42:55 AM] Found 0 errors. Watching for file changes.
-
-c[9:42:57 AM] File change detected. Starting incremental compilation...
-
-[9:42:57 AM] Found 0 errors. Watching for file changes.
-
-c[9:43:01 AM] File change detected. Starting incremental compilation...
-
-[9:43:01 AM] Found 0 errors. Watching for file changes.
-
-c[9:43:02 AM] File change detected. Starting incremental compilation...
-
-[9:43:03 AM] Found 0 errors. Watching for file changes.
-
-c[9:43:25 AM] File change detected. Starting incremental compilation...
-
-[9:43:25 AM] Found 0 errors. Watching for file changes.
-
-c[9:43:27 AM] File change detected. Starting incremental compilation...
-
-[9:43:27 AM] Found 0 errors. Watching for file changes.
-
-c[11:38:35 AM] File change detected. Starting incremental compilation...
-
-[11:38:35 AM] Found 0 errors. Watching for file changes.
-
-c[11:39:22 AM] File change detected. Starting incremental compilation...
-
-[11:39:23 AM] Found 0 errors. Watching for file changes.
-
-c[11:39:40 AM] File change detected. Starting incremental compilation...
-
-[11:39:40 AM] Found 0 errors. Watching for file changes.
-
-c[11:40:02 AM] File change detected. Starting incremental compilation...
-
-[11:40:02 AM] Found 0 errors. Watching for file changes.
-
-c[11:40:46 AM] File change detected. Starting incremental compilation...
-
-[11:40:46 AM] Found 0 errors. Watching for file changes.
-
-c[11:40:52 AM] File change detected. Starting incremental compilation...
-
-[11:40:53 AM] Found 0 errors. Watching for file changes.
-
-c[11:48:43 AM] File change detected. Starting incremental compilation...
-
-[11:48:43 AM] Found 0 errors. Watching for file changes.
-
-c[2:00:33 PM] File change detected. Starting incremental compilation...
-
-[2:00:33 PM] Found 0 errors. Watching for file changes.
-
-c[2:01:10 PM] File change detected. Starting incremental compilation...
-
-[2:01:11 PM] Found 0 errors. Watching for file changes.
-
-c[2:01:30 PM] File change detected. Starting incremental compilation...
-
-[2:01:30 PM] Found 0 errors. Watching for file changes.
-
-c[2:01:32 PM] File change detected. Starting incremental compilation...
-
-[2:01:32 PM] Found 0 errors. Watching for file changes.
-
-c[2:02:21 PM] File change detected. Starting incremental compilation...
-
-[2:02:21 PM] Found 0 errors. Watching for file changes.
-
-c[2:02:23 PM] File change detected. Starting incremental compilation...
-
-[2:02:23 PM] Found 0 errors. Watching for file changes.
-
-c[2:04:32 PM] File change detected. Starting incremental compilation...
-
-[2:04:32 PM] Found 0 errors. Watching for file changes.
-
-c[2:04:34 PM] File change detected. Starting incremental compilation...
-
-[2:04:34 PM] Found 0 errors. Watching for file changes.
-
-c[2:04:58 PM] File change detected. Starting incremental compilation...
-
-[2:04:59 PM] Found 0 errors. Watching for file changes.
-
-c[2:05:05 PM] File change detected. Starting incremental compilation...
-
-[2:05:05 PM] Found 0 errors. Watching for file changes.
-
-c[2:05:41 PM] File change detected. Starting incremental compilation...
-
-[2:05:41 PM] Found 0 errors. Watching for file changes.
-
-c[2:05:55 PM] File change detected. Starting incremental compilation...
-
-[2:05:55 PM] Found 0 errors. Watching for file changes.
-
-c[2:08:37 PM] File change detected. Starting incremental compilation...
-
-[2:08:37 PM] Found 0 errors. Watching for file changes.
-
-c[2:08:39 PM] File change detected. Starting incremental compilation...
-
-[2:08:39 PM] Found 0 errors. Watching for file changes.
-
-c[2:37:30 PM] File change detected. Starting incremental compilation...
-
-[2:37:30 PM] Found 0 errors. Watching for file changes.
-
-c[2:37:54 PM] File change detected. Starting incremental compilation...
-
-[2:37:54 PM] Found 0 errors. Watching for file changes.
-
-c[2:38:58 PM] File change detected. Starting incremental compilation...
-
-[2:38:58 PM] Found 0 errors. Watching for file changes.
-
-c[2:39:00 PM] File change detected. Starting incremental compilation...
-
-[2:39:00 PM] Found 0 errors. Watching for file changes.
-
-c[2:39:36 PM] File change detected. Starting incremental compilation...
-
-[2:39:36 PM] Found 0 errors. Watching for file changes.
-
-c[2:39:38 PM] File change detected. Starting incremental compilation...
-
-[2:39:38 PM] Found 0 errors. Watching for file changes.
-
-c[2:55:34 PM] File change detected. Starting incremental compilation...
-
-[2:55:34 PM] Found 0 errors. Watching for file changes.
+[2:29:56 PM] Found 0 errors. Watching for file changes.
 

package/dist/components/Auth/index.d.ts

@@ -4,6 +4,7 @@ import type { ScopeObject } from '../../server';
 export interface AuthClassNames {
     actions: string;
     footer: string;
+    form: string;
     link: string;
     logo: string;
     root: string;

package/dist/components/LoginForm/index.js

@@ -8,6 +8,6 @@ function LoginForm({ classNames, searchParams }) {
     const { fieldProps, formData, formProps } = useLoginForm(submitLoginForm, {
         redirect: searchParams.r,
     });
-    return (_jsxs(Fragment, { children: [_jsx("h1", { className: tw('text-center', classNames?.title), children: "Sign in to continue" }), _jsxs(Form, { ...formProps, children: [_jsx(TextFormField, { ...fieldProps('email'), hasAssistiveError: true }), _jsx(PasswordFormField, { ...fieldProps('password'), hasAssistiveError: true }), _jsx("div", { className: tw('', classNames?.actions), children: _jsx(FormSubmit, { children: "Sign In" }) }), _jsx("footer", { className: tw('text-center', classNames?.footer), children: _jsx(Link, { className: classNames?.link, href: `/auth/password${formData.email ? `?email=${formData.email}` : ''}`, children: "Forgot Password?" }) })] })] }));
+    return (_jsxs(Fragment, { children: [_jsx("h1", { className: tw('text-center', classNames?.title), children: "Sign in to continue" }), _jsxs(Form, { ...formProps, classNames: { root: classNames?.form }, children: [_jsx(TextFormField, { ...fieldProps('email'), hasAssistiveError: true }), _jsx(PasswordFormField, { ...fieldProps('password'), hasAssistiveError: true }), _jsx("div", { className: tw('', classNames?.actions), children: _jsx(FormSubmit, { children: "Sign In" }) }), _jsx("footer", { className: tw('text-center', classNames?.footer), children: _jsx(Link, { className: classNames?.link, href: `/auth/password${formData.email ? `?email=${formData.email}` : ''}`, children: "Forgot Password?" }) })] })] }));
 }
 export default LoginForm;

package/dist/components/MFAForm/index.d.ts

@@ -1,8 +1,5 @@
 /// <reference types="react" />
-import type { AuthClassNames } from '../Auth';
 export interface MFAFormProps {
-    classNames?: Partial<AuthClassNames>;
-    hasAssistiveSubmit?: boolean;
 }
-declare function MFAForm({ hasAssistiveSubmit }: Readonly<MFAFormProps>): React.ReactElement;
+declare function MFAForm(): React.ReactElement;
 export default MFAForm;

package/dist/components/MFAForm/index.js

@@ -1,29 +1,10 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
-import { CodeFormField, Form, FormSubmit, tw } from '@sqrzro/components';
-import { useForm } from '@sqrzro/hooks';
-import { useRouter } from 'next/navigation';
+import { CodeFormField, Form, FormSubmit } from '@sqrzro/components';
+import useMFAForm from '../../hooks/useMFAForm';
 import { submitMFAForm } from '../../server';
-function MFAForm({ hasAssistiveSubmit }) {
-    const router = useRouter();
-    const [errorCount, setErrorCount] = useState(0);
-    const { fieldProps, formProps, resetForm, submitForm } = useForm({
-        onSubmit: submitMFAForm,
-        onSuccess: () => {
-            router.push('/');
-        },
-        onValidationError: () => {
-            setErrorCount((count) => count + 1);
-        },
-        toasts: {
-            success: false,
-            validation: "There seems to be an issue with the code you've entered. Please try again.",
-        },
-    });
-    useEffect(() => {
-        resetForm();
-    }, [errorCount]);
-    return (_jsxs(Form, { ...formProps, children: [_jsx(CodeFormField, { ...fieldProps('token'), onFinalChange: submitForm, hasAssistiveLabel: true, isAutoFocus: true }, errorCount), _jsx("div", { className: tw(hasAssistiveSubmit ? 'sr-only' : ''), children: _jsx(FormSubmit, { children: "Verify" }) })] }));
+function MFAForm() {
+    const { formProps, fieldProps, key, submitForm } = useMFAForm({ onSubmit: submitMFAForm });
+    return (_jsxs(Form, { ...formProps, children: [_jsx(CodeFormField, { ...fieldProps('token'), onFinalChange: submitForm, hasAssistiveLabel: true, isAutoFocus: true }, key), _jsx(FormSubmit, { children: "Verify" })] }));
 }
 export default MFAForm;

package/dist/components/MFAPage/index.js

@@ -16,6 +16,6 @@ async function MFAPage({ classNames }) {
     if (!userHasMFA) {
         return _jsx(MFASetup, { classNames: classNames });
     }
-    return (_jsxs("div", { children: [_jsx("h1", { className: tw('text-center', classNames?.title), children: "Multi-Factor Authentication" }), _jsx("p", { className: "mb-6 text-center", children: "Enter the 6-digit code listed in your authentication app:" }), _jsx(MFAForm, { classNames: classNames, hasAssistiveSubmit: true })] }));
+    return (_jsxs("div", { children: [_jsx("h1", { className: tw('text-center', classNames?.title), children: "Multi-Factor Authentication" }), _jsx("p", { className: "mb-6 text-center", children: "Enter the 6-digit code listed in your authentication app:" }), _jsx(MFAForm, {})] }));
 }
 export default MFAPage;

package/dist/components/MFASetupForm/index.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import type { AuthClassNames } from '../Auth';
-export interface MFASetupProps {
+export interface MFASetupFormProps {
     classNames?: Partial<AuthClassNames>;
     url: string;
 }
-declare function MFASetupForm({ classNames, url }: Readonly<MFASetupProps>): React.ReactElement;
+declare function MFASetupForm({ classNames, url }: Readonly<MFASetupFormProps>): React.ReactElement;
 export default MFASetupForm;

package/dist/components/MFASetupForm/index.js

@@ -12,9 +12,6 @@ function MFASetupForm({ classNames, url }) {
         event.preventDefault();
         setStep(1);
     }
-    if (step === 1) {
-        return (_jsxs(Fragment, { children: [_jsx("p", { className: "mb-4", children: "You'll need to setup an additional authentication step before you can continue." }), _jsx("figure", { className: "flex justify-center rounded border p-2", children: _jsx("img", { alt: "qrcode", src: url }) }), _jsxs("p", { className: "mb-4", children: [_jsx("strong", { children: "Step 1:" }), " Scan the QR code, or enter the secret below, in the Google Authentictor app."] }), _jsx(Button, { onClick: nextStep, variant: "primary", isFullWidth: true, children: "Continue" })] }));
-    }
-    return (_jsxs(Fragment, { children: [_jsxs("p", { className: "mb-4", children: [_jsx("strong", { children: "Step 2:" }), " Enter the 6-digit code listed in the Google Authenticator app:"] }), _jsx(MFAForm, {}), _jsx(Link, { className: classNames?.link, onClick: previousStep, children: "Scan QRcode again" })] }));
+    return (_jsxs(Fragment, { children: [_jsxs("div", { className: step === 1 ? null : 'sr-only', children: [_jsx("p", { className: "mb-4", children: "You'll need to setup an additional authentication step before you can continue." }), _jsx("figure", { className: "flex justify-center rounded border p-2", children: _jsx("img", { alt: "qrcode", src: url }) }), _jsxs("p", { className: "mb-4", children: [_jsx("strong", { children: "Step 1:" }), " Scan the QR code, or enter the secret below, in the Google Authenticator app."] }), _jsx(Button, { onClick: nextStep, variant: "primary", isFullWidth: true, children: "Continue" })] }), _jsxs("div", { className: step === 2 ? null : 'sr-only', children: [_jsxs("p", { className: "mb-4", children: [_jsx("strong", { children: "Step 2:" }), " Enter the 6-digit code listed in the Google Authenticator app:"] }), _jsx(MFAForm, {}), _jsx(Link, { className: classNames?.link, onClick: previousStep, children: "Scan QRcode again" })] })] }));
 }
 export default MFASetupForm;

package/dist/components/PasswordForm/index.js

@@ -23,6 +23,6 @@ function PasswordForm({ classNames, email }) {
         setFormData('email', '');
         setSentCount(0);
     }
-    return (_jsxs(Fragment, { children: [_jsx("div", { className: tw('', sentCount === 0 ? 'block' : 'hidden'), children: _jsxs(Form, { ...formProps, children: [_jsxs("div", { children: [_jsx("h1", { className: classNames?.title, children: "Reset Your Password" }), _jsx("p", { className: "text-sm", children: "Enter the email address associated with your account and we'll send you a link to reset your password." })] }), _jsx(TextFormField, { ...fieldProps('email'), hasAssistiveLabel: true }), _jsx("div", { className: tw('', classNames?.actions), children: _jsx(FormSubmit, { children: "Send Email" }) })] }) }), _jsxs("div", { className: tw('-mt-1 text-sm', sentCount > 0 ? 'block' : 'hidden'), children: [_jsx("h1", { className: classNames?.title, children: "Check Your Email" }), sentCount === 1 ? (_jsxs(Fragment, { children: [_jsxs("p", { className: "mb-4", children: ["If ", formData.email, " matches an email we have on file, then we've sent you an email containing further instructions for resetting your password."] }), _jsxs("p", { children: ["If you haven't received an email in 5 minutes, check your spam,", ' ', _jsx(Link, { className: classNames?.link, onClick: handleResend, children: "resend" }), ", or", ' ', _jsx(Link, { className: classNames?.link, onClick: handleReset, children: "try a different email address" }), "."] })] })) : (_jsxs(Fragment, { children: [_jsxs("p", { className: "mb-4", children: ["We've resent password reset instructions to ", formData.email, ", if it is an email we have on file."] }), _jsxs("p", { children: ["Please check again. If you still haven't received an email,", ' ', _jsx(Link, { className: classNames?.link, onClick: handleReset, children: "try a different email address" }), "."] })] }))] })] }));
+    return (_jsxs(Fragment, { children: [_jsx("div", { className: tw('', sentCount === 0 ? 'block' : 'hidden'), children: _jsxs(Form, { ...formProps, classNames: { root: classNames?.form }, children: [_jsxs("div", { children: [_jsx("h1", { className: classNames?.title, children: "Reset Your Password" }), _jsx("p", { className: "text-sm", children: "Enter the email address associated with your account and we'll send you a link to reset your password." })] }), _jsx(TextFormField, { ...fieldProps('email'), hasAssistiveLabel: true }), _jsx("div", { className: tw('', classNames?.actions), children: _jsx(FormSubmit, { children: "Send Email" }) })] }) }), _jsxs("div", { className: tw('-mt-1 text-sm', sentCount > 0 ? 'block' : 'hidden'), children: [_jsx("h1", { className: classNames?.title, children: "Check Your Email" }), sentCount === 1 ? (_jsxs(Fragment, { children: [_jsxs("p", { className: "mb-4", children: ["If ", formData.email, " matches an email we have on file, then we've sent you an email containing further instructions for resetting your password."] }), _jsxs("p", { children: ["If you haven't received an email in 5 minutes, check your spam,", ' ', _jsx(Link, { className: classNames?.link, onClick: handleResend, children: "resend" }), ", or", ' ', _jsx(Link, { className: classNames?.link, onClick: handleReset, children: "try a different email address" }), "."] })] })) : (_jsxs(Fragment, { children: [_jsxs("p", { className: "mb-4", children: ["We've resent password reset instructions to ", formData.email, ", if it is an email we have on file."] }), _jsxs("p", { children: ["Please check again. If you still haven't received an email,", ' ', _jsx(Link, { className: classNames?.link, onClick: handleReset, children: "try a different email address" }), "."] })] }))] })] }));
 }
 export default PasswordForm;

package/dist/components/PasswordResetForm/index.js

@@ -15,6 +15,6 @@ function PasswordResetForm({ classNames, token, }) {
         },
         toasts: { success: false },
     });
-    return (_jsxs(Form, { ...formProps, children: [_jsx("h1", { className: classNames?.title, children: "Reset Your Password" }), _jsx("div", { className: "relative", children: _jsx(PasswordFormField, { ...fieldProps('password', 'New Password') }) }), _jsx("div", { className: "mt-8", children: _jsx(FormSubmit, { children: "Reset Password" }) })] }));
+    return (_jsxs(Form, { ...formProps, classNames: { root: classNames?.form }, children: [_jsx("h1", { className: classNames?.title, children: "Reset Your Password" }), _jsx("div", { className: "relative", children: _jsx(PasswordFormField, { ...fieldProps('password', 'New Password') }) }), _jsx("div", { className: "mt-8", children: _jsx(FormSubmit, { children: "Reset Password" }) })] }));
 }
 export default PasswordResetForm;

package/dist/hooks/useMFAForm.d.ts

@@ -0,0 +1,10 @@
+import type { UseFormArgs, UseFormReturn } from '@sqrzro/hooks';
+import type { MFAFormFields } from '../server';
+export interface UseMFAFormArgs {
+    onSubmit: UseFormArgs<MFAFormFields, boolean>['onSubmit'];
+}
+export interface UseMFAFormReturn extends UseFormReturn<MFAFormFields> {
+    key: number;
+}
+declare function useMFAForm({ onSubmit }: UseMFAFormArgs): UseMFAFormReturn;
+export default useMFAForm;

package/dist/hooks/useMFAForm.js

@@ -0,0 +1,26 @@
+'use client';
+import { useEffect, useState } from 'react';
+import { useForm } from '@sqrzro/hooks';
+import { useRouter } from 'next/navigation';
+function useMFAForm({ onSubmit }) {
+    const router = useRouter();
+    const [errorCount, setErrorCount] = useState(0);
+    const form = useForm({
+        onSubmit,
+        onSuccess: () => {
+            router.push('/');
+        },
+        onValidationError: () => {
+            setErrorCount((count) => count + 1);
+        },
+        toasts: {
+            success: false,
+            validation: "There seems to be an issue with the code you've entered. Please try again.",
+        },
+    });
+    useEffect(() => {
+        form.resetForm();
+    }, [errorCount]);
+    return { ...form, key: errorCount };
+}
+export default useMFAForm;

package/dist/index.d.ts

@@ -1,3 +1,7 @@
 export { default as Auth } from './components/Auth';
 export type { AuthClassNames, AuthProps } from './components/Auth';
+export type { MFASetupProps } from './components/MFASetup';
+export { default as MFASetup } from './components/MFASetup';
 export { default as LogoutButton } from './components/LogoutButton';
+export type { UseMFAFormArgs, UseMFAFormReturn } from './hooks/useMFAForm';
+export { default as useMFAForm } from './hooks/useMFAForm';

package/dist/index.js

@@ -1,2 +1,4 @@
 export { default as Auth } from './components/Auth';
+export { default as MFASetup } from './components/MFASetup';
 export { default as LogoutButton } from './components/LogoutButton';
+export { default as useMFAForm } from './hooks/useMFAForm';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqrzro/auth",
   "type": "module",
-  "version": "2.0.0-bz.4",
+  "version": "2.0.0-bz.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {

package/src/components/Auth/index.tsx

@@ -12,6 +12,7 @@ import type { ScopeObject } from '../../server';
 export interface AuthClassNames {
     actions: string;
     footer: string;
+    form: string;
     link: string;
     logo: string;
     root: string;

package/src/components/LoginForm/index.tsx

@@ -22,7 +22,7 @@ function LoginForm({ classNames, searchParams }: Readonly<LoginFormProps>): Reac
     return (
         <Fragment>
             <h1 className={tw('text-center', classNames?.title)}>Sign in to continue</h1>
-            <Form {...formProps}>
+            <Form {...formProps} classNames={{ root: classNames?.form }}>
                 <TextFormField {...fieldProps('email')} hasAssistiveError />
                 <PasswordFormField {...fieldProps('password')} hasAssistiveError />
                 <div className={tw('', classNames?.actions)}>

package/src/components/MFAForm/index.tsx

@@ -1,57 +1,25 @@
 'use client';
 
-import { useEffect, useState } from 'react';
-
-import { CodeFormField, Form, FormSubmit, tw } from '@sqrzro/components';
-import { useForm } from '@sqrzro/hooks';
-import { useRouter } from 'next/navigation';
+import { CodeFormField, Form, FormSubmit } from '@sqrzro/components';
 
+import useMFAForm from '../../hooks/useMFAForm';
 import { submitMFAForm } from '../../server';
-import type { MFAFormFields } from '../../server';
-
-import type { AuthClassNames } from '../Auth';
-
-export interface MFAFormProps {
-    classNames?: Partial<AuthClassNames>;
-    hasAssistiveSubmit?: boolean;
-}
-
-function MFAForm({ hasAssistiveSubmit }: Readonly<MFAFormProps>): React.ReactElement {
-    const router = useRouter();
-
-    const [errorCount, setErrorCount] = useState(0);
 
-    const { fieldProps, formProps, resetForm, submitForm } = useForm<MFAFormFields, boolean>({
-        onSubmit: submitMFAForm,
-        onSuccess: () => {
-            router.push('/');
-        },
-        onValidationError: () => {
-            setErrorCount((count) => count + 1);
-        },
-        toasts: {
-            success: false,
-            validation:
-                "There seems to be an issue with the code you've entered. Please try again.",
-        },
-    });
+export interface MFAFormProps {}
 
-    useEffect(() => {
-        resetForm();
-    }, [errorCount]);
+function MFAForm(): React.ReactElement {
+    const { formProps, fieldProps, key, submitForm } = useMFAForm({ onSubmit: submitMFAForm });
 
     return (
         <Form {...formProps}>
             <CodeFormField
-                key={errorCount}
+                key={key}
                 {...fieldProps('token')}
                 onFinalChange={submitForm}
                 hasAssistiveLabel
                 isAutoFocus
             />
-            <div className={tw(hasAssistiveSubmit ? 'sr-only' : '')}>
-                <FormSubmit>Verify</FormSubmit>
-            </div>
+            <FormSubmit>Verify</FormSubmit>
         </Form>
     );
 }

package/src/components/MFAPage/index.tsx

@@ -34,7 +34,7 @@ async function MFAPage({ classNames }: Readonly<MFAPageProps>): Promise<React.Re
             <p className="mb-6 text-center">
                 Enter the 6-digit code listed in your authentication app:
             </p>
-            <MFAForm classNames={classNames} hasAssistiveSubmit />
+            <MFAForm />
         </div>
     );
 }

package/src/components/MFASetupForm/index.tsx

@@ -7,12 +7,12 @@ import { Button, Link } from '@sqrzro/components';
 import type { AuthClassNames } from '../Auth';
 import MFAForm from '../MFAForm';
 
-export interface MFASetupProps {
+export interface MFASetupFormProps {
     classNames?: Partial<AuthClassNames>;
     url: string;
 }
 
-function MFASetupForm({ classNames, url }: Readonly<MFASetupProps>): React.ReactElement {
+function MFASetupForm({ classNames, url }: Readonly<MFASetupFormProps>): React.ReactElement {
     const [step, setStep] = useState(1);
 
     function nextStep(): void {
@@ -24,9 +24,9 @@ function MFASetupForm({ classNames, url }: Readonly<MFASetupProps>): React.React
         setStep(1);
     }
 
-    if (step === 1) {
-        return (
-            <Fragment>
+    return (
+        <Fragment>
+            <div className={step === 1 ? null : 'sr-only'}>
                 <p className="mb-4">
                     You&#39;ll need to setup an additional authentication step before you can
                     continue.
@@ -36,25 +36,22 @@ function MFASetupForm({ classNames, url }: Readonly<MFASetupProps>): React.React
                 </figure>
                 <p className="mb-4">
                     <strong>Step 1:</strong> Scan the QR code, or enter the secret below, in the
-                    Google Authentictor app.
+                    Google Authenticator app.
                 </p>
                 <Button onClick={nextStep} variant="primary" isFullWidth>
                     Continue
                 </Button>
-            </Fragment>
-        );
-    }
-
-    return (
-        <Fragment>
-            <p className="mb-4">
-                <strong>Step 2:</strong> Enter the 6-digit code listed in the Google Authenticator
-                app:
-            </p>
-            <MFAForm />
-            <Link className={classNames?.link} onClick={previousStep}>
-                Scan QRcode again
-            </Link>
+            </div>
+            <div className={step === 2 ? null : 'sr-only'}>
+                <p className="mb-4">
+                    <strong>Step 2:</strong> Enter the 6-digit code listed in the Google
+                    Authenticator app:
+                </p>
+                <MFAForm />
+                <Link className={classNames?.link} onClick={previousStep}>
+                    Scan QRcode again
+                </Link>
+            </div>
         </Fragment>
     );
 }

package/src/components/PasswordForm/index.tsx

@@ -48,7 +48,7 @@ function PasswordForm({ classNames, email }: Readonly<PasswordFormProps>): React
     return (
         <Fragment>
             <div className={tw('', sentCount === 0 ? 'block' : 'hidden')}>
-                <Form {...formProps}>
+                <Form {...formProps} classNames={{ root: classNames?.form }}>
                     <div>
                         <h1 className={classNames?.title}>Reset Your Password</h1>
                         <p className="text-sm">

package/src/components/PasswordResetForm/index.tsx

@@ -30,7 +30,7 @@ function PasswordResetForm({
     });
 
     return (
-        <Form {...formProps}>
+        <Form {...formProps} classNames={{ root: classNames?.form }}>
             <h1 className={classNames?.title}>Reset Your Password</h1>
             <div className="relative">
                 <PasswordFormField {...fieldProps('password', 'New Password')} />

package/src/hooks/useMFAForm.ts

@@ -0,0 +1,46 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+
+import { useForm } from '@sqrzro/hooks';
+import type { UseFormArgs, UseFormReturn } from '@sqrzro/hooks';
+import { useRouter } from 'next/navigation';
+
+import type { MFAFormFields } from '../server';
+
+export interface UseMFAFormArgs {
+    onSubmit: UseFormArgs<MFAFormFields, boolean>['onSubmit'];
+}
+
+export interface UseMFAFormReturn extends UseFormReturn<MFAFormFields> {
+    key: number;
+}
+
+function useMFAForm({ onSubmit }: UseMFAFormArgs): UseMFAFormReturn {
+    const router = useRouter();
+
+    const [errorCount, setErrorCount] = useState(0);
+
+    const form = useForm<MFAFormFields, boolean>({
+        onSubmit,
+        onSuccess: () => {
+            router.push('/');
+        },
+        onValidationError: () => {
+            setErrorCount((count) => count + 1);
+        },
+        toasts: {
+            success: false,
+            validation:
+                "There seems to be an issue with the code you've entered. Please try again.",
+        },
+    });
+
+    useEffect(() => {
+        form.resetForm();
+    }, [errorCount]);
+
+    return { ...form, key: errorCount };
+}
+
+export default useMFAForm;

package/src/index.ts

@@ -1,3 +1,10 @@
 export { default as Auth } from './components/Auth';
 export type { AuthClassNames, AuthProps } from './components/Auth';
+
+export type { MFASetupProps } from './components/MFASetup';
+export { default as MFASetup } from './components/MFASetup';
+
 export { default as LogoutButton } from './components/LogoutButton';
+
+export type { UseMFAFormArgs, UseMFAFormReturn } from './hooks/useMFAForm';
+export { default as useMFAForm } from './hooks/useMFAForm';

package/dist/components/TokenPasswordResetForm/index.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-import type { AuthClassNames } from '../Auth';
-interface TokenPasswordResetFormProps {
-    classNames?: Partial<AuthClassNames>;
-    token: string;
-}
-declare function TokenPasswordResetForm({ classNames, token, }: Readonly<TokenPasswordResetFormProps>): React.ReactElement;
-export default TokenPasswordResetForm;

package/dist/components/TokenPasswordResetForm/index.js

@@ -1,20 +0,0 @@
-'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Form, FormSubmit, PasswordFormField } from '@sqrzro/components';
-import { useForm } from '@sqrzro/hooks';
-import { useRouter } from 'next/navigation';
-import { submitTokenPasswordResetForm } from '../../server';
-function TokenPasswordResetForm({ classNames, token, }) {
-    const router = useRouter();
-    const { fieldProps, formProps } = useForm({
-        defaults: { token },
-        hiddenFields: ['token'],
-        onSubmit: submitTokenPasswordResetForm,
-        onSuccess: (response) => {
-            router.push(response || '/');
-        },
-        toasts: { success: false },
-    });
-    return (_jsxs(Form, { ...formProps, children: [_jsx("h1", { className: classNames?.title, children: "Reset Your Password" }), _jsx("div", { className: "relative", children: _jsx(PasswordFormField, { ...fieldProps('password', 'New Password') }) }), _jsx("div", { className: "mt-8", children: _jsx(FormSubmit, { children: "Reset Password" }) })] }));
-}
-export default TokenPasswordResetForm;

package/src/components/MFAPage/index.js

@@ -1,78 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var components_1 = require("@sqrzro/components");
-var navigation_1 = require("next/navigation");
-var MFAForm_1 = require("../MFAForm");
-var MFASetup_1 = require("../MFASetup");
-var server_1 = require("../../server");
-function MFAPage(_a) {
-    return __awaiter(this, arguments, void 0, function (_b) {
-        var user, userHasMFA;
-        var classNames = _b.classNames;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, server_1.checkMFAEnabled)()];
-                case 1:
-                    if (!(_c.sent())) {
-                        return [2 /*return*/, (0, navigation_1.notFound)()];
-                    }
-                    return [4 /*yield*/, (0, server_1.getSessionUser)()];
-                case 2:
-                    user = _c.sent();
-                    if (!user) {
-                        return [2 /*return*/, <div>Error</div>];
-                    }
-                    return [4 /*yield*/, (0, server_1.checkUserHasMFA)(user)];
-                case 3:
-                    userHasMFA = _c.sent();
-                    if (!userHasMFA) {
-                        return [2 /*return*/, <MFASetup_1.default classNames={classNames}/>];
-                    }
-                    return [2 /*return*/, (<div>
-            <h1 className={(0, components_1.tw)('text-center', classNames === null || classNames === void 0 ? void 0 : classNames.title)}>Multi-Factor Authentication</h1>
-            <p className="mb-6 text-center">
-                Enter the 6-digit code listed in your authentication app:
-            </p>
-            <MFAForm_1.default classNames={classNames} hasAssistiveSubmit/>
-        </div>)];
-            }
-        });
-    });
-}
-exports.default = MFAPage;