@@ -4,11 +4,10 @@ import { page } from '$app/stores';
44import * as m from ' $i18n/messages'
55import { handleMessage } from ' $lib/components/layout/toast-manager'
66import { i18n } from ' $lib/i18n'
7- import { updateUserDetailsKeys as keys , signUpSchema } from ' $lib/schema/user'
7+ import { signUpSchema , updateUserDetailsKeys as keys } from ' $lib/schema/user'
88import { getLoadingState } from ' $lib/stores/loading'
99import { getNhostClient } from ' $lib/stores/nhost'
1010import { turnstilePassed , turnstileResponse } from ' $lib/stores/stores'
11- import { getAuthenticationResult , signUpEmailPasswordPromise } from ' @nhost/nhost-js'
1211import { getToastStore } from ' @skeletonlabs/skeleton'
1312import { DebugShell } from ' $lib/ui/components'
1413import { Alerts } from ' $lib/ui/components/form'
@@ -49,36 +48,22 @@ const form = superForm(defaults(zod(signUpSchema)), {
4948 if (! form .valid ) return ;
5049
5150 const = form .data ;
52-
53- // FIXME: remove this block after nhost.auth.signUp support headers
54- const = getAuthenticationResult (
55- await signUpEmailPasswordPromise (
56- // biome-ignore lint/style/noNonNullAssertion: <explanation>
57- nhost .auth .client .interpreter ! ,
51+ const = await nhost .auth .signUp (
52+ {
5853 email ,
59- password as string ,
60- {
54+ password ,
55+ options: {
6156 displayName: ` ${firstName } ${lastName } ` ,
6257 locale ,
6358 },
64- {
65- headers: {
66- ' x-cf-turnstile-response ' : $turnstileResponse ,
67- } ,
59+ },
60+ {
61+ headers: {
62+ ' x-cf-turnstile-response ' : $turnstileResponse ,
6863 },
69- ) ,
64+ } ,
7065 );
7166
72- // log.debug('TODO: use turnstileResponse:', $turnstileResponse);
73- // const { session, error } = await nhost.auth.signUp({
74- // email,
75- // password,
76- // options: {
77- // displayName: `${firstName} ${lastName}`,
78- // locale,
79- // },
80- // });
81-
8267 if (error ) {
8368 log .error (error );
8469 // FIXME: workaround for `missing x-cf-turnstile-response`
@@ -140,18 +125,18 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
140125
141126<svelte:head >
142127 <title >Datablocks | Signup</title >
143- <meta name =" description" content =" Create Account" />
128+ <meta name =" description" content =" Create Account"
144129</svelte:head >
145130
146131<!-- Form Level Errors / Messages -->
147- <Alerts errors ={$errors ._errors } message ={$message } />
132+ <Alerts errors ={$errors ._errors } message ={$message }/>
148133<!-- Signup Form -->
149134<form method =" POST" use:enhance >
150135 <div class =" mt-6"
151136 <Form .Field {form } name =" firstName"
152137 <Form .Control let:attrs >
153138 <Form .Label class =" label sr-only"
154- >{m .auth_forms_first_name_label ()}</Form .Label
139+ >{m .auth_forms_first_name_label ()}</Form .Label
155140 >
156141 <input
157142 type =" text"
@@ -162,14 +147,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
162147 bind:value ={$formData .firstName }
163148 />
164149 </Form .Control >
165- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
150+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
166151 </Form .Field >
167152 </div >
168153 <div class =" mt-6"
169154 <Form .Field {form } name =" lastName"
170155 <Form .Control let:attrs >
171156 <Form .Label class =" label sr-only"
172- >{m .auth_forms_last_name_label ()}</Form .Label
157+ >{m .auth_forms_last_name_label ()}</Form .Label
173158 >
174159 <input
175160 type =" text"
@@ -180,14 +165,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
180165 bind:value ={$formData .lastName }
181166 />
182167 </Form .Control >
183- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
168+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
184169 </Form .Field >
185170 </div >
186171 <div class =" mt-6"
187172 <Form .Field {form } name =" email"
188173 <Form .Control let:attrs >
189174 <Form .Label class =" label sr-only"
190- >{m .auth_forms_email_label ()}</Form .Label
175+ >{m .auth_forms_email_label ()}</Form .Label
191176 >
192177 <input
193178 type =" email"
@@ -198,14 +183,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
198183 bind:value ={$formData .email }
199184 />
200185 </Form .Control >
201- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
186+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
202187 </Form .Field >
203188 </div >
204189 <div class =" mt-6"
205190 <Form .Field {form } name =" password"
206191 <Form .Control let:attrs >
207192 <Form .Label class =" label sr-only"
208- >{m .auth_forms_password_label ()}</Form .Label
193+ >{m .auth_forms_password_label ()}</Form .Label
209194 >
210195 <input
211196 type =" password"
@@ -215,14 +200,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
215200 bind:value ={$formData .password }
216201 />
217202 </Form .Control >
218- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
203+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
219204 </Form .Field >
220205 </div >
221206 <div class =" mt-6"
222207 <Form .Field {form } name =" confirmPassword"
223208 <Form .Control let:attrs >
224209 <Form .Label class =" label sr-only"
225- >{m .auth_forms_confirm_password_label ()}</Form .Label
210+ >{m .auth_forms_confirm_password_label ()}</Form .Label
226211 >
227212 <input
228213 type =" password"
@@ -232,13 +217,13 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
232217 bind:value ={$formData .confirmPassword }
233218 />
234219 </Form .Control >
235- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
220+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
236221 </Form .Field >
237222 </div >
238223 <div class =" mt-6"
239224 <Form .Field {form } name ={keys .locale }>
240225 <Form .Control let:attrs >
241- <Form .Label class =" label sr-only" Form .Label >
226+ <Form .Label class =" label sr-only" Form .Label >
242227 <select
243228 class =" select data-[fs-error]:input-error"
244229 {...attrs }
@@ -250,7 +235,7 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
250235 </select >
251236 </Form .Control >
252237 <!-- <Form.Description class="sr-only md:not-sr-only text-sm text-gray-500">User preferred Locale</Form.Description> -->
253- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
238+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
254239 </Form .Field >
255240 </div >
256241 <div class =" mt-6"
@@ -268,11 +253,11 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
268253 <a href =" /terms" class =" text-primaryHover underline" a >
269254 and
270255 <a href =" /privacy" class =" text-primaryHover underline"
271- >privacy policy</a
256+ >privacy policy</a
272257 >
273258 </span >
274259 </Form .Control >
275- <Form .FieldErrors class =" data-[fs-error]:text-error-500" />
260+ <Form .FieldErrors class =" data-[fs-error]:text-error-500"
276261 </Form .Field >
277262 </div >
278263 <div class =" mt-6"
@@ -282,9 +267,9 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
282267 disabled ={! $tainted || ! valid || $submitting }
283268 >
284269 {#if $timeout }
285- <MoreHorizontal class =" animate-ping" />
270+ <MoreHorizontal class =" animate-ping"
286271 {:else if $delayed }
287- <Loader class =" animate-spin" />
272+ <Loader class =" animate-spin"
288273 {:else }
289274 {m .auth_labels_signup ()}
290275 {/if }
@@ -303,14 +288,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
303288 timeout : $timeout
304289 }}
305290 />
306- <br />
307- <SuperDebug label ="Form" data ={$formData } />
308- <br />
309- <SuperDebug label ="Tainted" status ={false } data ={$tainted } />
310- <br />
311- <SuperDebug label ="Errors" status ={false } data ={$errors } />
312- <br />
313- <SuperDebug label ="Constraints" status ={false } data ={$constraints } />
291+ <br />
292+ <SuperDebug label ="Form" data ={$formData }/>
293+ <br />
294+ <SuperDebug label ="Tainted" status ={false } data ={$tainted }/>
295+ <br />
296+ <SuperDebug label ="Errors" status ={false } data ={$errors }/>
297+ <br />
298+ <SuperDebug label ="Constraints" status ={false } data ={$constraints }/>
314299 <!-- <br />
315300 <SuperDebug label="$page data" status={false} data={$page} /> -->
316301</DebugShell >
0 commit comments