Skip to content

Feat/hasura auth claims defaults #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feat/hasura auth claims defaults #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af7306f
fix: testing CustomClaimsDefaults
xmlking Mar 23, 2025
2b5e49e
Merge branch 'main' into feat/hasura-auth-claims-defaults
xmlking Mar 23, 2025
a670d4e
docs: update seeds section
xmlking Mar 24, 2025
7415d5d
fix: sync with main
xmlking Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN turbo prune --scope=${SCOPE} --docker

###################################################################
# Stage 2: Install dependencies #
# Add lockfile and package.json's of isolated subworkspace #
# Add lockfile and package.json's of isolated subworkspace #
###################################################################
FROM base AS builder

Expand Down
22 changes: 16 additions & 6 deletions apps/console/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,24 @@ Everything you need to build a Svelte project, powered by [`create-svelte`](http

### First Step

1. download latest `traefik.me` certs for _svelte_ dev server.
We will be using [mkcert](https://github.com/FiloSottile/mkcert) to generate certs for local domain: `console.traefik.me`

> NOTE: they will expire every 60 days
```shell
cd apps/console/config/certs
mkcert -key-file traefik.me.key -cert-file traefik.me.crt console.traefik.me
```

> [!WARNING]
> This method is deprecated. use **mkcert**

d~~ownload latest `traefik.me` certs for _svelte_ dev server.~~

```shell
curl traefik.me/fullchain.pem -o apps/console/config/certs/traefik.me.crt
curl traefik.me/privkey.pem -o apps/console/config/certs/traefik.me.key
```
> ~~NOTE: they will expire every 60 days~~

```shell
curl traefik.me/fullchain.pem -o apps/console/config/certs/traefik.me.crt
curl traefik.me/privkey.pem -o apps/console/config/certs/traefik.me.key
```

### Backend

Expand Down
34 changes: 17 additions & 17 deletions apps/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
"test:unit:ui": "dotenv-run -f .env -f .secrets -v -- vitest --ui"
},
"devDependencies": {
"@ai-sdk/azure": "1.3.0",
"@ai-sdk/openai": "1.3.0",
"@ai-sdk/azure": "1.3.6",
"@ai-sdk/openai": "1.3.6",
"@ai-sdk/svelte": "1.1.24",
"@aibrow/dom-types": "1.3.8",
"@aibrow/dom-types": "1.3.9",
"@apollo/utils.sortast": "3.0.0",
"@floating-ui/dom": "1.6.13",
"@fontsource-variable/inter": "5.2.5",
"@inlang/cli": "3.0.7",
"@inlang/cli": "3.0.10",
"@inlang/paraglide-sveltekit": "0.14.0",
"@nhost/nhost-js": "3.2.6",
"@skeletonlabs/skeleton": "2.11.0",
Expand All @@ -51,11 +51,11 @@
"@spectacular/typescript-config": "workspace:*",
"@spectacular/utils": "workspace:*",
"@svelte-plugins/datepicker": "1.0.11",
"@sveltejs/adapter-auto": "4.0.0",
"@sveltejs/adapter-auto": "6.0.0",
"@sveltejs/adapter-node": "5.2.12",
"@sveltejs/adapter-vercel": "5.6.3",
"@sveltejs/enhanced-img": "0.3.10",
"@sveltejs/kit": "2.20.2",
"@sveltejs/kit": "2.20.3",
"@sveltejs/vite-plugin-svelte": "3.1.2",
"@tailwindcss/container-queries": "0.1.1",
"@tailwindcss/forms": "0.5.10",
Expand All @@ -65,17 +65,17 @@
"@types/d3-scale": "4.0.9",
"@types/dom-chromium-ai": "0.0.6",
"@types/js-cookie": "3.0.6",
"@types/node": "22.13.11",
"@types/node": "22.14.0",
"@unovis/svelte": "1.5.1",
"@unovis/ts": "1.5.1",
"@vercel/analytics": "1.5.0",
"@vercel/flags": "3.1.1",
"@vercel/speed-insights": "1.2.0",
"@vercel/toolbar": "0.1.35",
"@vercel/toolbar": "0.1.36",
"@vincjo/datatables": "2.5.0",
"@vitest/coverage-v8": "3.0.9",
"@xyflow/svelte": "0.1.31",
"ai": "4.2.0",
"@vitest/coverage-v8": "3.1.1",
"@xyflow/svelte": "0.1.34",
"ai": "4.2.11",
"autoprefixer": "10.4.21",
"chrome-ai": "1.11.1",
"clsx": "2.1.1",
Expand All @@ -86,14 +86,14 @@
"graphql": "16.10.0",
"graphql-ws": "6.0.4",
"houdini": "1.5.4",
"houdini-svelte": "2.1.8",
"houdini-svelte": "2.1.12",
"js-cookie": "3.0.5",
"jsdom": "26.0.0",
"lucide-svelte": "0.483.0",
"lucide-svelte": "0.487.0",
"neverthrow": "8.2.0",
"node-forge": "1.3.1",
"ollama-ai-provider": "1.2.0",
"openai": "4.89.0",
"openai": "4.91.1",
"openai-zod-to-json-schema": "1.0.3",
"paneforge": "0.0.6",
"postcss": "8.5.3",
Expand All @@ -117,12 +117,12 @@
"tailwindcss-animate": "1.0.7",
"tslib": "2.8.1",
"typescript": "5.8.2",
"vite": "5.4.14",
"vitest": "3.0.9",
"vite": "5.4.17",
"vitest": "3.1.1",
"zod": "3.24.2"
},
"optionalDependencies": {
"@playwright/test": "1.51.1",
"@vitest/ui": "3.0.9"
"@vitest/ui": "3.1.1"
}
}
87 changes: 36 additions & 51 deletions apps/console/src/routes/(auth)/signup/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import { page } from '$app/stores';
import * as m from '$i18n/messages';
import { handleMessage } from '$lib/components/layout/toast-manager';
import { i18n } from '$lib/i18n';
import { updateUserDetailsKeys as keys, signUpSchema } from '$lib/schema/user';
import { signUpSchema, updateUserDetailsKeys as keys } from '$lib/schema/user';
import { getLoadingState } from '$lib/stores/loading';
import { getNhostClient } from '$lib/stores/nhost';
import { turnstilePassed, turnstileResponse } from '$lib/stores/stores';
import { getAuthenticationResult, signUpEmailPasswordPromise } from '@nhost/nhost-js';
import { getToastStore } from '@skeletonlabs/skeleton';
import { DebugShell } from '$lib/ui/components';
import { Alerts } from '$lib/ui/components/form';
Expand Down Expand Up @@ -49,36 +48,22 @@ const form = superForm(defaults(zod(signUpSchema)), {
if (!form.valid) return;

const { firstName, lastName, email, password, locale, redirectTo } = form.data;

// FIXME: remove this block after nhost.auth.signUp support headers
const { session, error } = getAuthenticationResult(
await signUpEmailPasswordPromise(
// biome-ignore lint/style/noNonNullAssertion: <explanation>
nhost.auth.client.interpreter!,
const { session, error } = await nhost.auth.signUp(
{
email,
password as string,
{
password,
options: {
displayName: `${firstName} ${lastName}`,
locale,
},
{
headers: {
'x-cf-turnstile-response': $turnstileResponse,
},
},
{
headers: {
'x-cf-turnstile-response': $turnstileResponse,
},
),
},
);

// log.debug('TODO: use turnstileResponse:', $turnstileResponse);
// const { session, error } = await nhost.auth.signUp({
// email,
// password,
// options: {
// displayName: `${firstName} ${lastName}`,
// locale,
// },
// });

if (error) {
log.error(error);
// FIXME: workaround for `missing x-cf-turnstile-response`
Expand Down Expand Up @@ -140,18 +125,18 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red

<svelte:head>
<title>Datablocks | Signup</title>
<meta name="description" content="Create Account" />
<meta name="description" content="Create Account"/>
</svelte:head>

<!-- Form Level Errors / Messages -->
<Alerts errors={$errors._errors} message={$message} />
<Alerts errors={$errors._errors} message={$message}/>
<!-- Signup Form -->
<form method="POST" use:enhance>
<div class="mt-6">
<Form.Field {form} name="firstName">
<Form.Control let:attrs>
<Form.Label class="label sr-only"
>{m.auth_forms_first_name_label()}</Form.Label
>{m.auth_forms_first_name_label()}</Form.Label
>
<input
type="text"
Expand All @@ -162,14 +147,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
bind:value={$formData.firstName}
/>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
<Form.Field {form} name="lastName">
<Form.Control let:attrs>
<Form.Label class="label sr-only"
>{m.auth_forms_last_name_label()}</Form.Label
>{m.auth_forms_last_name_label()}</Form.Label
>
<input
type="text"
Expand All @@ -180,14 +165,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
bind:value={$formData.lastName}
/>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
<Form.Field {form} name="email">
<Form.Control let:attrs>
<Form.Label class="label sr-only"
>{m.auth_forms_email_label()}</Form.Label
>{m.auth_forms_email_label()}</Form.Label
>
<input
type="email"
Expand All @@ -198,14 +183,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
bind:value={$formData.email}
/>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
<Form.Field {form} name="password">
<Form.Control let:attrs>
<Form.Label class="label sr-only"
>{m.auth_forms_password_label()}</Form.Label
>{m.auth_forms_password_label()}</Form.Label
>
<input
type="password"
Expand All @@ -215,14 +200,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
bind:value={$formData.password}
/>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
<Form.Field {form} name="confirmPassword">
<Form.Control let:attrs>
<Form.Label class="label sr-only"
>{m.auth_forms_confirm_password_label()}</Form.Label
>{m.auth_forms_confirm_password_label()}</Form.Label
>
<input
type="password"
Expand All @@ -232,13 +217,13 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
bind:value={$formData.confirmPassword}
/>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
<Form.Field {form} name={keys.locale}>
<Form.Control let:attrs>
<Form.Label class="label sr-only">Locale</Form.Label>
<Form.Label class="label sr-only">Locale</Form.Label>
<select
class="select data-[fs-error]:input-error"
{...attrs}
Expand All @@ -250,7 +235,7 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
</select>
</Form.Control>
<!-- <Form.Description class="sr-only md:not-sr-only text-sm text-gray-500">User preferred Locale</Form.Description> -->
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
Expand All @@ -268,11 +253,11 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
<a href="/terms" class="text-primaryHover underline">terms</a>
and
<a href="/privacy" class="text-primaryHover underline"
>privacy policy</a
>privacy policy</a
>
</span>
</Form.Control>
<Form.FieldErrors class="data-[fs-error]:text-error-500" />
<Form.FieldErrors class="data-[fs-error]:text-error-500"/>
</Form.Field>
</div>
<div class="mt-6">
Expand All @@ -282,9 +267,9 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
disabled={!$tainted || !valid || $submitting}
>
{#if $timeout}
<MoreHorizontal class="animate-ping" />
<MoreHorizontal class="animate-ping"/>
{:else if $delayed}
<Loader class="animate-spin" />
<Loader class="animate-spin"/>
{:else}
{m.auth_labels_signup()}
{/if}
Expand All @@ -303,14 +288,14 @@ $formData.redirectTo = $page.url.searchParams.get('redirectTo') ?? $formData.red
timeout: $timeout
}}
/>
<br />
<SuperDebug label="Form" data={$formData} />
<br />
<SuperDebug label="Tainted" status={false} data={$tainted} />
<br />
<SuperDebug label="Errors" status={false} data={$errors} />
<br />
<SuperDebug label="Constraints" status={false} data={$constraints} />
<br/>
<SuperDebug label="Form" data={$formData}/>
<br/>
<SuperDebug label="Tainted" status={false} data={$tainted}/>
<br/>
<SuperDebug label="Errors" status={false} data={$errors}/>
<br/>
<SuperDebug label="Constraints" status={false} data={$constraints}/>
<!-- <br />
<SuperDebug label="$page data" status={false} data={$page} /> -->
</DebugShell>
2 changes: 1 addition & 1 deletion apps/console/turbo.json → apps/console/turbo.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"outputLogs": "new-only",
"cache": false, // No outputs will be cached
"persistent": true,
"inputs": ["$TURBO_DEFAULT$", ".env", ".secrets"]
"inputs": ["$TURBO_DEFAULT$", ".env", ".secrets", "$TURBO_ROOT$/.env", "$TURBO_ROOT$/.secrets"]
},
"dev:debug": {
"dependsOn": ["generate"],
Expand Down
8 changes: 4 additions & 4 deletions apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"dependencies": {
"@astrojs/check": "0.9.4",
"@astrojs/node": "9.1.3",
"@astrojs/starlight": "0.32.4",
"@astrojs/starlight": "0.32.5",
"@astrojs/starlight-tailwind": "3.0.1",
"@astrojs/vercel": "8.1.3",
"@fontsource-variable/inter": "5.2.5",
"@fontsource/source-code-pro": "5.2.5",
"@tailwindcss/vite": "4.0.15",
"astro": "5.5.4",
"@tailwindcss/vite": "4.1.2",
"astro": "5.5.6",
"rehype-mermaid": "3.0.0",
"sharp": "0.33.5",
"tailwindcss": "4.0.15",
"tailwindcss": "4.1.2",
"typescript": "5.8.2"
},
"devDependencies": {
Expand Down
0 apps/docs/turbo.json → apps/docs/turbo.jsonc
View file
Open in desktop
File renamed without changes.
Loading
Loading