The minimalistic document archiving platform.
refactor(auth): integrated better-auth (#69)
Corentin THOMASSET02b7f70393ef
diff --git a/apps/papra-client/package.json b/apps/papra-client/package.jsonindex e27feea7..3a40c94e 100644--- a/apps/papra-client/package.json+++ b/apps/papra-client/package.json@@ -38,6 +38,7 @@"@tanstack/solid-query": "^5.61.5","@tanstack/solid-table": "^8.20.5","@unocss/reset": "^0.64.0",+ "better-auth": "^1.1.11","class-variance-authority": "^0.7.0","clsx": "^2.1.1","cmdk-solid": "^1.1.0",diff --git a/apps/papra-client/src/modules/auth/auth.constants.ts b/apps/papra-client/src/modules/auth/auth.constants.tsnew file mode 100644index 00000000..b4fd5fba--- /dev/null+++ b/apps/papra-client/src/modules/auth/auth.constants.ts@@ -0,0 +1,7 @@+export const ssoProviders = [+ {+ key: 'github',+ name: 'GitHub',+ icon: 'i-tabler-brand-github',+ },+] as const;diff --git a/apps/papra-client/src/modules/auth/auth.models.ts b/apps/papra-client/src/modules/auth/auth.models.tsdeleted file mode 100644index b222a79c..00000000--- a/apps/papra-client/src/modules/auth/auth.models.ts+++ /dev/null@@ -1,12 +0,0 @@-export {- isAccessTokenExpired,-};--function isAccessTokenExpired({ accessToken }: { accessToken: string }) {- try {- const token = JSON.parse(atob(accessToken.split('.')[1]));- return token.exp < Date.now() / 1000;- } catch {- return true;- }-}diff --git a/apps/papra-client/src/modules/auth/auth.services.ts b/apps/papra-client/src/modules/auth/auth.services.tsindex d5e163f0..5978a806 100644--- a/apps/papra-client/src/modules/auth/auth.services.ts+++ b/apps/papra-client/src/modules/auth/auth.services.ts@@ -1,58 +1,11 @@+import { createAuthClient } from 'better-auth/solid';import { config } from '../config/config';-import { apiClient } from '../shared/http/api-client';-import { httpClient } from '../shared/http/http-client';-export { login };+export const {+ useSession,+ signIn,+ signOut,-async function login({ email, password }: { email: string; password: string }) {- const { accessToken } = await apiClient<{ accessToken: string }>({- path: 'api/auth/login',- method: 'POST',- body: {- email,- password,- },- });-- return { accessToken };-}--export async function requestAuthTokensRefresh() {- // Do not use apiClient here top prevent loops since requestAuthTokensRefresh might be called from apiClient- const { accessToken } = await httpClient<{ accessToken: string }>({- baseUrl: config.baseApiUrl,- url: '/api/auth/refresh',- method: 'POST',-- // Required to send the refresh token- credentials: 'include',- });-- return { accessToken };-}--export async function logout() {- await apiClient({- path: '/api/auth/logout',- method: 'POST',- credentials: 'include',- });-}--export async function requestMagicLink({ email }: { email: string }) {- await apiClient({- path: '/api/auth/magic-link',- method: 'POST',- body: { email },- });-}--export async function verifyMagicLink({ token }: { token: string }) {- const { accessToken } = await apiClient<{ accessToken: string }>({- path: '/api/auth/magic-link/verification',- method: 'POST',- body: { token },- });-- return { accessToken };-}+} = createAuthClient({+ baseURL: config.baseApiUrl,+});diff --git a/apps/papra-client/src/modules/auth/auth.store.ts b/apps/papra-client/src/modules/auth/auth.store.tsdeleted file mode 100644index 62c14f5b..00000000--- a/apps/papra-client/src/modules/auth/auth.store.ts+++ /dev/null@@ -1,87 +0,0 @@-import { safely } from '@corentinth/chisels';-import { makePersisted } from '@solid-primitives/storage';-import { createRoot, createSignal } from 'solid-js';-import { createHook, createWaitForHook } from '../shared/hooks/hooks';-import { isAccessTokenExpired } from './auth.models';-import { logout, requestAuthTokensRefresh } from './auth.services';--export const authStore = createRoot(() => {- const [getAccessToken, setAccessTokenValue] = makePersisted(createSignal<string | null>(null), { name: 'papra_access_token', storage: localStorage });- const onAuthChangeHook = createHook<{ isAuthenticated: boolean }>();- const [getRedirectUrl, setRedirectUrl] = makePersisted(createSignal<string | null>(null), { name: 'papra_redirect_url', storage: localStorage });- const [getIsRefreshTokenInProgress, setIsRefreshTokenInProgress] = createSignal(false);- const [getMagicLinkRequestEmail, setMagicLinkRequestEmail] = createSignal<string | undefined>(undefined);-- const waitForRefreshTokenHook = createWaitForHook();-- const refreshToken = async () => {- setIsRefreshTokenInProgress(true);-- const { accessToken } = await requestAuthTokensRefresh();-- setAccessTokenValue(accessToken);- setIsRefreshTokenInProgress(false);- waitForRefreshTokenHook.trigger();- await onAuthChangeHook.trigger({ isAuthenticated: false });- };-- const getIsAuthenticated = async () => {- const accessToken = getAccessToken();-- if (!accessToken) {- return false;- }-- const isExpired = isAccessTokenExpired({ accessToken });-- if (isExpired && !getIsRefreshTokenInProgress()) {- await safely(refreshToken());- }-- return Boolean(getAccessToken());- };-- const setAccessToken = async ({ accessToken }: { accessToken: string }) => {- setAccessTokenValue(accessToken);- await onAuthChangeHook.trigger({ isAuthenticated: true });- };-- const clearAccessToken = async () => {- setAccessTokenValue(null);- await onAuthChangeHook.trigger({ isAuthenticated: false });- };-- return {- setAccessToken,- getAccessToken,- clearAccessToken,- getIsAuthenticated,- getRedirectUrl,- setRedirectUrl,-- getIsRefreshTokenInProgress,- setIsRefreshTokenInProgress,-- getMagicLinkRequestEmail,- setMagicLinkRequestEmail,-- async waitForRefreshTokenToBeRefreshed() {- if (!getIsRefreshTokenInProgress()) {- return;- }-- return waitForRefreshTokenHook.waitFor();- },-- refreshToken,-- async logout() {- await safely(logout());- await clearAccessToken();-- window.location.href = '/login';- },-- onAuthChange: onAuthChangeHook.on,- };-});diff --git a/apps/papra-client/src/modules/auth/components/auth-layout.component.tsx b/apps/papra-client/src/modules/auth/components/auth-layout.component.tsxnew file mode 100644index 00000000..6f3aa54d--- /dev/null+++ b/apps/papra-client/src/modules/auth/components/auth-layout.component.tsx@@ -0,0 +1,17 @@+import type { ParentComponent } from 'solid-js';++export const AuthLayout: ParentComponent = (props) => {+ return (+ <div class="flex justify-center h-screen">++ {/* <div class="hidden xl:block flex-grow-1 p-8">+ <div class="h-full w-full bg-card rounded-lg border bg-[linear-gradient(to_right,#80808015_1px,transparent_1px),linear-gradient(to_bottom,#80808015_1px,transparent_1px)] bg-[size:48px_48px]">+ </div>+ </div> */}+ <div class="flex-grow-1 max-w-60%">+ {props.children}+ </div>++ </div>+ );+};diff --git a/apps/papra-client/src/modules/auth/components/sso-provider-button.component.tsx b/apps/papra-client/src/modules/auth/components/sso-provider-button.component.tsxnew file mode 100644index 00000000..9b7072d4--- /dev/null+++ b/apps/papra-client/src/modules/auth/components/sso-provider-button.component.tsx@@ -0,0 +1,20 @@+import type { Component } from 'solid-js';+import { cn } from '@/modules/shared/style/cn';+import { Button } from '@/modules/ui/components/button';+import { createSignal } from 'solid-js';++export const SsoProviderButton: Component<{ name: string; icon: string; onClick: () => Promise<void>; label: string }> = (props) => {+ const [getIsLoading, setIsLoading] = createSignal(false);++ const navigateToProvider = async () => {+ setIsLoading(true);+ await props.onClick();+ };++ return (+ <Button variant="secondary" class="block w-full flex items-center justify-center" onClick={navigateToProvider} disabled={getIsLoading()}>+ <span class={cn(`mr-2 text-lg inline-block`, getIsLoading() ? 'i-tabler-loader-2 animate-spin' : props.icon)} />+ {props.label}+ </Button>+ );+};diff --git a/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx b/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsxindex 304fa384..106b17fa 100644--- a/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx+++ b/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx@@ -1,14 +1,16 @@-import { useCurrentUser } from '@/modules/users/composables/useCurrentUser';import { Navigate } from '@solidjs/router';-import { type Component, createResource, Suspense } from 'solid-js';+import { type Component, Suspense } from 'solid-js';import { Dynamic } from 'solid-js/web';import { match } from 'ts-pattern';-import { authStore } from '../auth.store';+import { useSession } from '../auth.services';export function createProtectedPage({ authType, component }: { authType: 'public' | 'private' | 'public-only' | 'admin'; component: Component }) {return () => {- const [getIsAuthenticated] = createResource(async () => await authStore.getIsAuthenticated());- const { user } = ['public', 'public-only'].includes(authType) ? {} : useCurrentUser();+ const session = useSession();++ // const { user } = ['public', 'public-only'].includes(authType) ? {} : useCurrentUser();++ const getIsAuthenticated = () => Boolean(session()?.data?.user);return (<Suspense>@@ -16,12 +18,15 @@ export function createProtectedPage({ authType, component }: { authType: 'publicmatch({authType,isAuthenticated: getIsAuthenticated(),- isAdmin: user?.roles.includes('admin'),+ isPending: session().isPending,+ // isAdmin: user?.roles.includes('admin'),})++ .with({ isPending: true }, () => <div>Authenticating...</div>).with({ authType: 'private', isAuthenticated: false }, () => <Navigate href="/login" />).with({ authType: 'public-only', isAuthenticated: true }, () => <Navigate href="/" />)- .with({ authType: 'admin', isAuthenticated: false }, () => <Navigate href="/login" />)- .with({ authType: 'admin', isAuthenticated: true, isAdmin: false }, () => <Navigate href="/" />)+ // .with({ authType: 'admin', isAuthenticated: false }, () => <Navigate href="/login" />)+ // .with({ authType: 'admin', isAuthenticated: true, isAdmin: false }, () => <Navigate href="/" />).otherwise(() => <Dynamic component={component} />)}</Suspense>diff --git a/apps/papra-client/src/modules/auth/pages/confirm.page.tsx b/apps/papra-client/src/modules/auth/pages/confirm.page.tsxdeleted file mode 100644index 2e263668..00000000--- a/apps/papra-client/src/modules/auth/pages/confirm.page.tsx+++ /dev/null@@ -1,43 +0,0 @@-import type { Component } from 'solid-js';-import { useLocation, useNavigate } from '@solidjs/router';-import { createSignal, onMount } from 'solid-js';-import { authStore } from '../auth.store';--export const ConfirmPage: Component = () => {- const [getError, setError] = createSignal<string | null>(null);-- const location = useLocation();- const navigate = useNavigate();-- onMount(async () => {- if (await authStore.getIsAuthenticated()) {- navigate('/', { replace: true });- return;- }-- const { hash } = location;-- // Parse the hash to get the access token (same format as query string)- const hashParams = new URLSearchParams(hash.slice(1));-- const accessToken = hashParams.get('accessToken');-- if (!accessToken) {- setError('Access token not found');- return;- }-- await authStore.setAccessToken({ accessToken });-- navigate('/', { replace: true });- });-- return (- <div class="flex items-center justify-center h-screen flex-col gap-4">- <div class="i-tabler-loader-2 animate-spin text-4xl text-muted-foreground"></div>- <div class="text-lg font-semibold">Authenticating...</div>-- {getError() && <div class="text-red-500">{getError()}</div>}- </div>- );-};diff --git a/apps/papra-client/src/modules/auth/pages/generic-auth.page.tsx b/apps/papra-client/src/modules/auth/pages/generic-auth.page.tsxindex 11b58563..6b04921e 100644--- a/apps/papra-client/src/modules/auth/pages/generic-auth.page.tsx+++ b/apps/papra-client/src/modules/auth/pages/generic-auth.page.tsx@@ -6,6 +6,7 @@ import { Button } from '@/modules/ui/components/button';import { Separator } from '@/modules/ui/components/separator';import { A } from '@solidjs/router';import { createSignal, For } from 'solid-js';+import { signIn } from '../auth.services';const InlineLink: ParentComponent<{ href: string }> = props => (<Button variant="link" as={A} href={props.href} class="inline px-0">@@ -13,12 +14,12 @@ const InlineLink: ParentComponent<{ href: string }> = props => (</Button>);-const SsoProviderButton: Component<{ name: string; icon: string; url: string; label: string }> = (props) => {+const SsoProviderButton: Component<{ name: string; icon: string; onClick: () => Promise<void>; label: string }> = (props) => {const [getIsLoading, setIsLoading] = createSignal(false);- const navigateToProvider = () => {+ const navigateToProvider = async () => {setIsLoading(true);- window.location.href = props.url;+ await props.onClick();};return (@@ -30,8 +31,6 @@ const SsoProviderButton: Component<{ name: string; icon: string; url: string; la};export const GenericAuthPage: Component<{ type: 'login' | 'register' }> = (props) => {- const { baseApiUrl } = config;-const ssoProviders = [// {// name: 'Google',@@ -45,7 +44,9 @@ export const GenericAuthPage: Component<{ type: 'login' | 'register' }> = (props{name: 'GitHub',icon: 'i-tabler-brand-github',- url: new URL('/api/auth/github', baseApiUrl).toString(),+ onClick: async () => {+ await signIn.social({ provider: 'github' });+ },labels: {login: 'Login with GitHub',register: 'Register with GitHub',diff --git a/apps/papra-client/src/modules/auth/pages/login.page.tsx b/apps/papra-client/src/modules/auth/pages/login.page.tsxnew file mode 100644index 00000000..49c0e4f4--- /dev/null+++ b/apps/papra-client/src/modules/auth/pages/login.page.tsx@@ -0,0 +1,115 @@+import { createForm } from '@/modules/shared/form/form';+import { createVitrineUrl } from '@/modules/shared/utils/urls';+import { Button } from '@/modules/ui/components/button';+import { TextField, TextFieldLabel, TextFieldRoot } from '@/modules/ui/components/textfield';+import { A } from '@solidjs/router';+import { type Component, For } from 'solid-js';+import * as v from 'valibot';+import { ssoProviders } from '../auth.constants';+import { signIn } from '../auth.services';+import { AuthLayout } from '../components/auth-layout.component';+import { SsoProviderButton } from '../components/sso-provider-button.component';++export const EmailLoginForm: Component = () => {+ const { form, Form, Field } = createForm({+ onSubmit: async ({ email, password }) => {+ const { error } = await signIn.email({ email, password });++ if (error) {+ throw error;+ }+ },+ schema: v.object({+ email: v.pipe(+ v.string(),+ v.trim(),+ v.nonEmpty('Please enter your email address'),+ v.email('This is not a valid email address'),+ ),+ password: v.pipe(+ v.string('Password is required'),+ v.nonEmpty('Please enter your password'),+ ),+ }),++ });++ return (+ <Form>+ <Field name="email">+ {(field, inputProps) => (+ <TextFieldRoot class="flex flex-col gap-1 mb-4">+ <TextFieldLabel for="email">Email</TextFieldLabel>+ <TextField type="email" id="email" placeholder="Eg. [email protected]" {...inputProps} autoFocus value={field.value} aria-invalid={Boolean(field.error)} />+ {field.error && <div class="text-red-500 text-sm">{field.error}</div>}+ </TextFieldRoot>+ )}+ </Field>++ <Field name="password">+ {(field, inputProps) => (+ <TextFieldRoot class="flex flex-col gap-1 mb-4">+ <TextFieldLabel for="password">Password</TextFieldLabel>+ <TextField type="password" id="password" placeholder="Your password" {...inputProps} autoFocus value={field.value} aria-invalid={Boolean(field.error)} />+ {field.error && <div class="text-red-500 text-sm">{field.error}</div>}+ </TextFieldRoot>+ )}+ </Field>++ <Button type="submit" class="w-full">Login</Button>++ <div class="text-red-500 text-sm mt-4">{form.response.message}</div>++ </Form>+ );+};++export const LoginPage: Component = () => {+ const loginWithProvider = async (provider: typeof ssoProviders[number]) => {+ await signIn.social({ provider: provider.key });+ };++ return (+ <AuthLayout>+ <div class="flex items-center justify-center min-h-screen p-6 pb-18">+ <div class="max-w-sm w-full">+ <h1 class="text-xl font-bold">+ Login to Papra+ </h1>+ <p class="text-muted-foreground mt-1 mb-4">+ Enter your email or use social login to access your Papra account.+ </p>++ {/* <EmailLoginForm />++ <Separator class="my-4" /> */}++ <For each={ssoProviders}>+ {provider => (+ <SsoProviderButton name={provider.name} icon={provider.icon} onClick={() => loginWithProvider(provider)} label={`Login with ${provider.name}`} />+ )}+ </For>++ <p class="text-muted-foreground mt-4">+ Don't have an account?+ {' '}+ <Button variant="link" as={A} class="inline px-0" href="/register">+ Register+ </Button>+ </p>++ <p class="text-muted-foreground mt-2">+ By continuing, you acknowledge that you understand and agree to the+ {' '}+ <Button variant="link" as={A} class="inline px-0" href={createVitrineUrl({ path: 'terms-of-service' })}>Terms of Service</Button>+ {' '}+ and+ {' '}+ <Button variant="link" as={A} class="inline px-0" href={createVitrineUrl({ path: 'privacy-policy' })}>Privacy Policy</Button>+ .+ </p>+ </div>+ </div>+ </AuthLayout>+ );+};diff --git a/apps/papra-client/src/modules/auth/pages/magic-link-sent.page.tsx b/apps/papra-client/src/modules/auth/pages/magic-link-sent.page.tsxdeleted file mode 100644index c35e5a47..00000000--- a/apps/papra-client/src/modules/auth/pages/magic-link-sent.page.tsx+++ /dev/null@@ -1,58 +0,0 @@-import { Button } from '@/modules/ui/components/button';-import { A } from '@solidjs/router';-import { Show } from 'solid-js';-import { authStore } from '../auth.store';-import { getEmailProvider } from '../magic-link/magic-link.models';-import { createProtectedPage } from '../middleware/protected-page.middleware';--export const MagicLinkSentPage = createProtectedPage({- authType: 'public-only',- component: () => {- const { getMagicLinkRequestEmail } = authStore;-- const getProvider = () => {- const { provider } = getEmailProvider({ email: getMagicLinkRequestEmail() });-- if (!provider) {- return undefined;- }-- return provider;- };-- return (- <div class="flex items-center justify-center min-h-screen">- <div class="max-w-sm w-full">- <div class="flex flex-col items-start py-8">- <div class="i-tabler-mail-check text-7xl text-primary" />- <h2 class="text-2xl font-semibold my-3">Magic link sent</h2>- <p class="text-muted-foreground">- We've sent you a magic link to- {' '}- <span class="text-primary">{getMagicLinkRequestEmail() ?? 'your email'}</span>- .- </p>- <p class="text-muted-foreground">Click on the link in the email to login.</p>-- <div class="w-full flex gap-2 mt-6">- <Show when={getProvider()}>- {providerUrl => (- <Button as="a" href={providerUrl().url} target="_blank" rel="noopener noreferrer">- Open- {' '}- {providerUrl().name}- <span class="i-tabler-external-link ml-2 text-lg" />- </Button>- )}- </Show>-- <Button as={A} href="/login" variant="secondary" class="flex items-center justify-center">- Go back to login- </Button>- </div>- </div>- </div>- </div>- );- },-});diff --git a/apps/papra-client/src/modules/auth/pages/verify-magic-link.page.tsx b/apps/papra-client/src/modules/auth/pages/verify-magic-link.page.tsxdeleted file mode 100644index 506b7156..00000000--- a/apps/papra-client/src/modules/auth/pages/verify-magic-link.page.tsx+++ /dev/null@@ -1,56 +0,0 @@-import { useAsyncState } from '@/modules/shared/signals/async-state';-import { Button } from '@/modules/ui/components/button';-import { A, useNavigate, useParams } from '@solidjs/router';-import { createSignal } from 'solid-js';-import { verifyMagicLink } from '../auth.services';-import { authStore } from '../auth.store';-import { createProtectedPage } from '../middleware/protected-page.middleware';--export const PendingMagicLinkPage = createProtectedPage({- authType: 'public-only',- component: () => {- const params = useParams();- const navigate = useNavigate();-- const [getHasError, setHasError] = createSignal(false);-- const { execute, onSuccess, onError } = useAsyncState(verifyMagicLink);-- execute({ token: params.token });-- onSuccess(async ({ data: { accessToken } }) => {- await authStore.setAccessToken({ accessToken });-- navigate('/', { replace: true });- });-- onError(() => {- setHasError(true);- });-- return (- <div class="flex items-center justify-center h-screen flex-col gap-4">- {getHasError()- ? (- <>- <div class="i-tabler-alert-triangle text-4xl text-red-500" />- <div class="text-lg font-semibold">Invalid or expired magic link</div>-- <div>- <Button as={A} href="/login" variant="secondary" class="block w-full flex items-center justify-center">- Go back to login- <span class="i-tabler-arrow-right ml-2 text-lg " />- </Button>- </div>- </>- )- : (- <>- <div class="i-tabler-loader-2 animate-spin text-4xl text-muted-foreground"></div>- <div class="text-lg font-semibold">Authenticating...</div>- </>- )}- </div>- );- },-});diff --git a/apps/papra-client/src/modules/config/config.ts b/apps/papra-client/src/modules/config/config.tsindex 20feac44..8cf7cda2 100644--- a/apps/papra-client/src/modules/config/config.ts+++ b/apps/papra-client/src/modules/config/config.ts@@ -2,7 +2,7 @@ export const config = {papraVersion: import.meta.env.VITE_PAPRA_VERSION,baseApiUrl: (import.meta.env.VITE_BASE_API_URL ?? window.location.origin) as string,vitrineBaseUrl: (import.meta.env.VITE_VITRINE_BASE_URL ?? 'http://localhost:3000/') as string,- isRegistrationEnabled: import.meta.env.VITE_IS_REGISTRATION_ENABLED === 'true',+ isRegistrationEnabled: import.meta.env.VITE_IS_REGISTRATION_ENABLED !== 'false',isDemoMode: import.meta.env.VITE_IS_DEMO_MODE === 'true',} as const;diff --git a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsxindex 576f106e..9cbdd52a 100644--- a/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/create-first-organization.page.tsx@@ -12,10 +12,10 @@ export const CreateFirstOrganizationPage: Component = () => {const navigate = useNavigate();const getOrganizationName = () => {- const fullName = user.fullName;+ const { name } = user;- if (fullName && fullName.length > 0) {- return `${fullName}'s organization`;+ if (name && name.length > 0) {+ return `${name}'s organization`;}return `My organization`;diff --git a/apps/papra-client/src/modules/shared/http/api-client.ts b/apps/papra-client/src/modules/shared/http/api-client.tsindex 74f3339b..2693d12b 100644--- a/apps/papra-client/src/modules/shared/http/api-client.ts+++ b/apps/papra-client/src/modules/shared/http/api-client.ts@@ -1,8 +1,7 @@-import { authStore } from '@/modules/auth/auth.store';import { config } from '@/modules/config/config';import { safely } from '@corentinth/chisels';-import { buildAuthHeader, shouldRefreshAuthTokens } from './api-client.models';import { httpClient, type HttpClientOptions, type ResponseType } from './http-client';+import { isHttpErrorWithStatusCode } from './http-errors';export async function apiClient<T, R extends ResponseType = 'json'>({path,@@ -10,22 +9,17 @@ export async function apiClient<T, R extends ResponseType = 'json'>({}: {path: string;} & Omit<HttpClientOptions<R>, 'url'>) {- const accessToken = authStore.getAccessToken();-const requestConfig: HttpClientOptions<R> = {baseUrl: config.baseApiUrl,url: path,+ credentials: 'include',...rest,- headers: {- ...buildAuthHeader({ accessToken }),- ...rest.headers,- },};const [response, error] = await safely(httpClient<T, R>(requestConfig));- if (shouldRefreshAuthTokens({ error })) {- return refreshTokensAndRetry<T, R>({ requestConfig });+ if (isHttpErrorWithStatusCode({ error, statusCode: 401 })) {+ window.location.href = '/login';}if (error) {@@ -34,29 +28,3 @@ export async function apiClient<T, R extends ResponseType = 'json'>({return response;}--async function refreshTokensAndRetry<T, R extends ResponseType = 'json'>({ requestConfig }: { requestConfig: HttpClientOptions<R> }) {- try {- // If a refresh token refresh request is already in progress, wait for it to finish- if (authStore.getIsRefreshTokenInProgress()) {- await authStore.waitForRefreshTokenToBeRefreshed();- } else {- await authStore.refreshToken();- }-- const accessToken = authStore.getAccessToken();-- return httpClient<T, R>({- ...requestConfig,- headers: {- ...requestConfig.headers,- ...buildAuthHeader({ accessToken }),- },- });- } catch (err) {- await authStore.clearAccessToken();- window.location.href = '/login';- console.error('Refresh token expired or invalid', err);- throw err;- }-}diff --git a/apps/papra-client/src/modules/ui/layouts/admin.layout.tsx b/apps/papra-client/src/modules/ui/layouts/admin.layout.tsxindex 0f1d42bf..143a9ff7 100644--- a/apps/papra-client/src/modules/ui/layouts/admin.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/admin.layout.tsx@@ -1,8 +1,8 @@-import { authStore } from '@/modules/auth/auth.store';+import { signOut } from '@/modules/auth/auth.services';import { cn } from '@/modules/shared/style/cn';-import { useThemeStore } from '@/modules/theme/theme.store';+import { useThemeStore } from '@/modules/theme/theme.store';import { Button } from '@/modules/ui/components/button';import { A, useNavigate } from '@solidjs/router';import { type Component, type ParentComponent, Show, Suspense } from 'solid-js';@@ -60,8 +60,8 @@ const SideNav: Component = () => {{label: 'Logout',icon: 'i-tabler-logout',- onClick: () => {- authStore.logout();+ onClick: async () => {+ await signOut();navigate('/login');},},diff --git a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsxindex a2fe7ec9..4ce24739 100644--- a/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx+++ b/apps/papra-client/src/modules/ui/layouts/sidenav.layout.tsx@@ -1,17 +1,17 @@import type { TooltipTriggerProps } from '@kobalte/core/tooltip';-import { authStore } from '@/modules/auth/auth.store';+import { signOut } from '@/modules/auth/auth.services';import { useCommandPalette } from '@/modules/command-palette/command-palette.provider';import { config } from '@/modules/config/config';import { GlobalDropArea } from '@/modules/documents/components/global-drop-area.component';-import { uploadDocument } from '@/modules/documents/documents.services';+import { uploadDocument } from '@/modules/documents/documents.services';import { promptUploadFiles } from '@/modules/shared/files/upload';import { queryClient } from '@/modules/shared/query/query-client';import { cn } from '@/modules/shared/style/cn';-import { useThemeStore } from '@/modules/theme/theme.store';+import { useThemeStore } from '@/modules/theme/theme.store';import { Button } from '@/modules/ui/components/button';-import { A, useParams } from '@solidjs/router';+import { A, useNavigate, useParams } from '@solidjs/router';import { type Component, type ComponentProps, type JSX, type ParentComponent, Suspense } from 'solid-js';import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '../components/dropdown-menu';import { Sheet, SheetContent, SheetTrigger } from '../components/sheet';@@ -150,6 +150,7 @@ export const SidenavLayout: ParentComponent<{const themeStore = useThemeStore();const params = useParams();const { openCommandPalette } = useCommandPalette();+ const navigate = useNavigate();const uploadDocuments = async (files: File[]) => {for (const file of files) {@@ -230,7 +231,13 @@ export const SidenavLayout: ParentComponent<{Account settings</DropdownMenuItem>- <DropdownMenuItem onClick={() => authStore.logout()} class="flex items-center gap-2 cursor-pointer">+ <DropdownMenuItem+ onClick={async () => {+ await signOut();+ navigate('/login');+ }}+ class="flex items-center gap-2 cursor-pointer"+ ><div class="i-tabler-logout size-4 text-muted-foreground"></div>Logout</DropdownMenuItem>diff --git a/apps/papra-client/src/modules/users/pages/user-settings.page.tsx b/apps/papra-client/src/modules/users/pages/user-settings.page.tsxindex 765e6e27..5201f972 100644--- a/apps/papra-client/src/modules/users/pages/user-settings.page.tsx+++ b/apps/papra-client/src/modules/users/pages/user-settings.page.tsx@@ -1,23 +1,25 @@-import { authStore } from '@/modules/auth/auth.store';+import { signOut } from '@/modules/auth/auth.services';import { createForm } from '@/modules/shared/form/form';import { Button } from '@/modules/ui/components/button';import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/modules/ui/components/card';import { createToast } from '@/modules/ui/components/sonner';import { TextField, TextFieldLabel, TextFieldRoot } from '@/modules/ui/components/textfield';-import { A } from '@solidjs/router';+import { A, useNavigate } from '@solidjs/router';import { createQuery } from '@tanstack/solid-query';import { type Component, createSignal, Show, Suspense } from 'solid-js';import * as v from 'valibot';import { useUpdateCurrentUser } from '../users.composables';-import { fullNameSchema } from '../users.schemas';+import { nameSchema } from '../users.schemas';import { fetchCurrentUser } from '../users.services';const LogoutCard: Component = () => {const [getIsLoading, setIsLoading] = createSignal(false);+ const navigate = useNavigate();const handleLogout = async () => {setIsLoading(true);- await authStore.logout();+ await signOut();+ navigate('/login');};return (@@ -54,19 +56,19 @@ const UserEmailCard: Component<{ email: string }> = (props) => {);};-const UpdateFullNameCard: Component<{ fullName: string }> = (props) => {+const UpdateFullNameCard: Component<{ name: string }> = (props) => {const { updateCurrentUser } = useUpdateCurrentUser();const { form, Form, Field } = createForm({schema: v.object({- fullName: fullNameSchema,+ name: nameSchema,}),initialValues: {- fullName: props.fullName,+ name: props.name,},- onSubmit: async ({ fullName }) => {+ onSubmit: async ({ name }) => {await updateCurrentUser({- fullName: fullName.trim(),+ name: name.trim(),});createToast({ type: 'success', message: 'Your full name has been updated' });@@ -82,16 +84,16 @@ const UpdateFullNameCard: Component<{ fullName: string }> = (props) => {<Form><CardContent class="pt-6">- <Field name="fullName">+ <Field name="name">{(field, inputProps) => (<TextFieldRoot class="flex flex-col gap-1">- <TextFieldLabel for="fullName" class="sr-only">+ <TextFieldLabel for="name" class="sr-only">Full name</TextFieldLabel><div class="flex gap-2 flex-col sm:flex-row"><TextFieldtype="text"- id="fullName"+ id="name"placeholder="Eg. John Doe"{...inputProps}value={field.value}@@ -101,7 +103,7 @@ const UpdateFullNameCard: Component<{ fullName: string }> = (props) => {type="submit"isLoading={form.submitting}class="flex-shrink-0"- disabled={field.value?.trim() === props.fullName}+ disabled={field.value?.trim() === props.name}>Update name</Button>@@ -140,7 +142,7 @@ export const UserSettingsPage: Component = () => {<div class="mt-6 flex flex-col gap-6"><UserEmailCard email={getUser().email} />- <UpdateFullNameCard fullName={getUser().fullName} />+ <UpdateFullNameCard name={getUser().name} /><LogoutCard /></div></>diff --git a/apps/papra-client/src/modules/users/users.composables.ts b/apps/papra-client/src/modules/users/users.composables.tsindex eec6dc04..818cc185 100644--- a/apps/papra-client/src/modules/users/users.composables.ts+++ b/apps/papra-client/src/modules/users/users.composables.ts@@ -3,8 +3,8 @@ import { updateUser } from './users.services';export function useUpdateCurrentUser() {return {- updateCurrentUser: async ({ fullName }: { fullName: string }) => {- await updateUser({ fullName });+ updateCurrentUser: async ({ name }: { name: string }) => {+ await updateUser({ name });await queryClient.invalidateQueries({queryKey: ['users'],diff --git a/apps/papra-client/src/modules/users/users.schemas.ts b/apps/papra-client/src/modules/users/users.schemas.tsindex 9a0ff9b6..a736258d 100644--- a/apps/papra-client/src/modules/users/users.schemas.ts+++ b/apps/papra-client/src/modules/users/users.schemas.ts@@ -1,6 +1,6 @@import * as v from 'valibot';-export const fullNameSchema = v.pipe(+export const nameSchema = v.pipe(v.string(),v.trim(),v.minLength(1, 'Full name must be at least 2 characters'),diff --git a/apps/papra-client/src/modules/users/users.services.ts b/apps/papra-client/src/modules/users/users.services.tsindex 23393958..e816ad90 100644--- a/apps/papra-client/src/modules/users/users.services.ts+++ b/apps/papra-client/src/modules/users/users.services.ts@@ -10,11 +10,11 @@ export async function fetchCurrentUser() {return { user };}-export async function updateUser({ fullName }: { fullName: string }) {+export async function updateUser({ name }: { name: string }) {const { user } = await apiClient<{ user: UserMe }>({path: '/api/users/me',method: 'PUT',- body: { fullName },+ body: { name },});return { user };diff --git a/apps/papra-client/src/modules/users/users.types.ts b/apps/papra-client/src/modules/users/users.types.tsindex 60002025..8ab93d59 100644--- a/apps/papra-client/src/modules/users/users.types.ts+++ b/apps/papra-client/src/modules/users/users.types.ts@@ -2,7 +2,7 @@ export type UserMe = {id: string;email: string;planId: string;- fullName: string;+ name: string;roles: string[];};diff --git a/apps/papra-client/src/routes.tsx b/apps/papra-client/src/routes.tsxindex e8e29f09..485d5ce8 100644--- a/apps/papra-client/src/routes.tsx+++ b/apps/papra-client/src/routes.tsx@@ -2,10 +2,8 @@ import { Navigate, type RouteDefinition, useParams } from '@solidjs/router';import { createQuery } from '@tanstack/solid-query';import { Match, Show, Suspense, Switch } from 'solid-js';import { createProtectedPage } from './modules/auth/middleware/protected-page.middleware';-import { ConfirmPage } from './modules/auth/pages/confirm.page';import { GenericAuthPage } from './modules/auth/pages/generic-auth.page';-import { MagicLinkSentPage } from './modules/auth/pages/magic-link-sent.page';-import { PendingMagicLinkPage } from './modules/auth/pages/verify-magic-link.page';+import { LoginPage } from './modules/auth/pages/login.page';import { DeletedDocumentsPage } from './modules/documents/pages/deleted-documents.page';import { DocumentPage } from './modules/documents/pages/document.page';import { DocumentsPage } from './modules/documents/pages/documents.page';@@ -130,24 +128,12 @@ export const routes: RouteDefinition[] = [},{path: '/login',- component: createProtectedPage({ authType: 'public-only', component: () => <GenericAuthPage type="login" /> }),+ component: createProtectedPage({ authType: 'public-only', component: LoginPage }),},{path: '/register',component: createProtectedPage({ authType: 'public-only', component: () => <GenericAuthPage type="register" /> }),},- {- path: '/magic-link',- component: createProtectedPage({ authType: 'public-only', component: MagicLinkSentPage }),- },- {- path: '/magic-link/:token',- component: createProtectedPage({ authType: 'public-only', component: PendingMagicLinkPage }),- },- {- path: '/confirm',- component: createProtectedPage({ authType: 'public-only', component: ConfirmPage }),- },{path: '*404',component: NotFoundPage,diff --git a/apps/papra-server/drizzle.config.ts b/apps/papra-server/drizzle.config.tsindex 662f0f77..4f3e24e6 100644--- a/apps/papra-server/drizzle.config.ts+++ b/apps/papra-server/drizzle.config.ts@@ -2,7 +2,7 @@ import { env } from 'node:process';import { defineConfig } from 'drizzle-kit';export default defineConfig({- schema: ['./src/modules/**/*.table.ts'],+ schema: ['./src/modules/**/*.table.ts', './src/modules/**/*.tables.ts'],dialect: 'turso',out: './migrations',dbCredentials: {diff --git a/apps/papra-server/migrations/0000_initial_schema_setup.sql b/apps/papra-server/migrations/0000_initial_schema_setup.sqlindex 20d57d63..e7110468 100644--- a/apps/papra-server/migrations/0000_initial_schema_setup.sql+++ b/apps/papra-server/migrations/0000_initial_schema_setup.sql@@ -1,15 +1,3 @@-CREATE TABLE `auth_tokens` (- `id` text PRIMARY KEY NOT NULL,- `created_at` integer NOT NULL,- `token` text,- `user_id` text NOT NULL,- `expires_at` integer,- FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE cascade ON DELETE cascade-);---> statement-breakpoint-CREATE INDEX `auth_tokens_token_index` ON `auth_tokens` (`token`);--> statement-breakpoint-CREATE INDEX `auth_tokens_expires_at_index` ON `auth_tokens` (`expires_at`);--> statement-breakpoint-CREATE INDEX `auth_tokens_token_user_id_expires_at_index` ON `auth_tokens` (`token`,`user_id`,`expires_at`);--> statement-breakpointCREATE TABLE `documents` (`id` text PRIMARY KEY NOT NULL,`created_at` integer NOT NULL,@@ -65,8 +53,47 @@ CREATE TABLE `users` (`created_at` integer NOT NULL,`updated_at` integer NOT NULL,`email` text NOT NULL,- `full_name` text+ `email_verified` integer DEFAULT false NOT NULL,+ `name` text,+ `image` text);--> statement-breakpointCREATE UNIQUE INDEX `users_email_unique` ON `users` (`email`);--> statement-breakpoint-CREATE INDEX `users_email_index` ON `users` (`email`);\ No newline at end of file+CREATE INDEX `users_email_index` ON `users` (`email`);--> statement-breakpoint+CREATE TABLE `auth_accounts` (+ `id` text PRIMARY KEY NOT NULL,+ `created_at` integer NOT NULL,+ `updated_at` integer NOT NULL,+ `user_id` text,+ `account_id` text NOT NULL,+ `provider_id` text NOT NULL,+ `access_token` text,+ `refresh_token` text,+ `access_token_expires_at` integer,+ `refresh_token_expires_at` integer,+ `scope` text,+ `id_token` text,+ `password` text,+ FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE cascade ON DELETE cascade+);+--> statement-breakpoint+CREATE TABLE `auth_sessions` (+ `id` text PRIMARY KEY NOT NULL,+ `created_at` integer NOT NULL,+ `updated_at` integer NOT NULL,+ `token` text NOT NULL,+ `user_id` text,+ `expires_at` integer NOT NULL,+ `ip_address` text,+ `user_agent` text,+ FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE cascade ON DELETE cascade+);+--> statement-breakpoint+CREATE TABLE `auth_verifications` (+ `id` text PRIMARY KEY NOT NULL,+ `created_at` integer NOT NULL,+ `updated_at` integer NOT NULL,+ `identifier` text NOT NULL,+ `value` text NOT NULL,+ `expires_at` integer NOT NULL+);diff --git a/apps/papra-server/migrations/meta/0000_snapshot.json b/apps/papra-server/migrations/meta/0000_snapshot.jsonindex 7c251642..e4ba1152 100644--- a/apps/papra-server/migrations/meta/0000_snapshot.json+++ b/apps/papra-server/migrations/meta/0000_snapshot.json@@ -1,92 +1,9 @@{"version": "6","dialect": "sqlite",- "id": "371b2e20-533e-4329-abf4-300ceb7c7010",+ "id": "5e528f3f-6da7-4bda-bc61-b157c495681a","prevId": "00000000-0000-0000-0000-000000000000","tables": {- "auth_tokens": {- "name": "auth_tokens",- "columns": {- "id": {- "name": "id",- "type": "text",- "primaryKey": true,- "notNull": true,- "autoincrement": false- },- "created_at": {- "name": "created_at",- "type": "integer",- "primaryKey": false,- "notNull": true,- "autoincrement": false- },- "token": {- "name": "token",- "type": "text",- "primaryKey": false,- "notNull": false,- "autoincrement": false- },- "user_id": {- "name": "user_id",- "type": "text",- "primaryKey": false,- "notNull": true,- "autoincrement": false- },- "expires_at": {- "name": "expires_at",- "type": "integer",- "primaryKey": false,- "notNull": false,- "autoincrement": false- }- },- "indexes": {- "auth_tokens_token_index": {- "name": "auth_tokens_token_index",- "columns": [- "token"- ],- "isUnique": false- },- "auth_tokens_expires_at_index": {- "name": "auth_tokens_expires_at_index",- "columns": [- "expires_at"- ],- "isUnique": false- },- "auth_tokens_token_user_id_expires_at_index": {- "name": "auth_tokens_token_user_id_expires_at_index",- "columns": [- "token",- "user_id",- "expires_at"- ],- "isUnique": false- }- },- "foreignKeys": {- "auth_tokens_user_id_users_id_fk": {- "name": "auth_tokens_user_id_users_id_fk",- "tableFrom": "auth_tokens",- "tableTo": "users",- "columnsFrom": [- "user_id"- ],- "columnsTo": [- "id"- ],- "onDelete": "cascade",- "onUpdate": "cascade"- }- },- "compositePrimaryKeys": {},- "uniqueConstraints": {},- "checkConstraints": {}- },"documents": {"name": "documents","columns": {@@ -472,8 +389,23 @@"notNull": true,"autoincrement": false},- "full_name": {- "name": "full_name",+ "email_verified": {+ "name": "email_verified",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": false+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "image": {+ "name": "image","type": "text","primaryKey": false,"notNull": false,@@ -500,6 +432,253 @@"compositePrimaryKeys": {},"uniqueConstraints": {},"checkConstraints": {}+ },+ "auth_accounts": {+ "name": "auth_accounts",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "account_id": {+ "name": "account_id",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "provider_id": {+ "name": "provider_id",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "access_token": {+ "name": "access_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "refresh_token": {+ "name": "refresh_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "access_token_expires_at": {+ "name": "access_token_expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "refresh_token_expires_at": {+ "name": "refresh_token_expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "scope": {+ "name": "scope",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "id_token": {+ "name": "id_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "password": {+ "name": "password",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "auth_accounts_user_id_users_id_fk": {+ "name": "auth_accounts_user_id_users_id_fk",+ "tableFrom": "auth_accounts",+ "tableTo": "users",+ "columnsFrom": [+ "user_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "cascade"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}+ },+ "auth_sessions": {+ "name": "auth_sessions",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "token": {+ "name": "token",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "expires_at": {+ "name": "expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "ip_address": {+ "name": "ip_address",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "user_agent": {+ "name": "user_agent",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "auth_sessions_user_id_users_id_fk": {+ "name": "auth_sessions_user_id_users_id_fk",+ "tableFrom": "auth_sessions",+ "tableTo": "users",+ "columnsFrom": [+ "user_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "cascade"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}+ },+ "auth_verifications": {+ "name": "auth_verifications",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "identifier": {+ "name": "identifier",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "value": {+ "name": "value",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "expires_at": {+ "name": "expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}}},"views": {},diff --git a/apps/papra-server/migrations/meta/0001_snapshot.json b/apps/papra-server/migrations/meta/0001_snapshot.jsonindex 372136b4..065652b0 100644--- a/apps/papra-server/migrations/meta/0001_snapshot.json+++ b/apps/papra-server/migrations/meta/0001_snapshot.json@@ -1,92 +1,9 @@{- "id": "a09c4d4c-5d2c-4b04-acbe-9e9b468ba135",- "prevId": "371b2e20-533e-4329-abf4-300ceb7c7010",+ "id": "449e7226-178b-4119-ac7d-6880323b2974",+ "prevId": "5e528f3f-6da7-4bda-bc61-b157c495681a","version": "6","dialect": "sqlite","tables": {- "auth_tokens": {- "name": "auth_tokens",- "columns": {- "id": {- "name": "id",- "type": "text",- "primaryKey": true,- "notNull": true,- "autoincrement": false- },- "created_at": {- "name": "created_at",- "type": "integer",- "primaryKey": false,- "notNull": true,- "autoincrement": false- },- "token": {- "name": "token",- "type": "text",- "primaryKey": false,- "notNull": false,- "autoincrement": false- },- "user_id": {- "name": "user_id",- "type": "text",- "primaryKey": false,- "notNull": true,- "autoincrement": false- },- "expires_at": {- "name": "expires_at",- "type": "integer",- "primaryKey": false,- "notNull": false,- "autoincrement": false- }- },- "indexes": {- "auth_tokens_token_index": {- "name": "auth_tokens_token_index",- "columns": [- "token"- ],- "isUnique": false- },- "auth_tokens_expires_at_index": {- "name": "auth_tokens_expires_at_index",- "columns": [- "expires_at"- ],- "isUnique": false- },- "auth_tokens_token_user_id_expires_at_index": {- "name": "auth_tokens_token_user_id_expires_at_index",- "columns": [- "token",- "user_id",- "expires_at"- ],- "isUnique": false- }- },- "foreignKeys": {- "auth_tokens_user_id_users_id_fk": {- "name": "auth_tokens_user_id_users_id_fk",- "tableFrom": "auth_tokens",- "columnsFrom": [- "user_id"- ],- "tableTo": "users",- "columnsTo": [- "id"- ],- "onUpdate": "cascade",- "onDelete": "cascade"- }- },- "compositePrimaryKeys": {},- "uniqueConstraints": {},- "checkConstraints": {}- },"documents": {"name": "documents","columns": {@@ -472,8 +389,23 @@"notNull": true,"autoincrement": false},- "full_name": {- "name": "full_name",+ "email_verified": {+ "name": "email_verified",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": false+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "image": {+ "name": "image","type": "text","primaryKey": false,"notNull": false,@@ -500,6 +432,253 @@"compositePrimaryKeys": {},"uniqueConstraints": {},"checkConstraints": {}+ },+ "auth_accounts": {+ "name": "auth_accounts",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "account_id": {+ "name": "account_id",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "provider_id": {+ "name": "provider_id",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "access_token": {+ "name": "access_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "refresh_token": {+ "name": "refresh_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "access_token_expires_at": {+ "name": "access_token_expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "refresh_token_expires_at": {+ "name": "refresh_token_expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "scope": {+ "name": "scope",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "id_token": {+ "name": "id_token",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "password": {+ "name": "password",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "auth_accounts_user_id_users_id_fk": {+ "name": "auth_accounts_user_id_users_id_fk",+ "tableFrom": "auth_accounts",+ "columnsFrom": [+ "user_id"+ ],+ "tableTo": "users",+ "columnsTo": [+ "id"+ ],+ "onUpdate": "cascade",+ "onDelete": "cascade"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}+ },+ "auth_sessions": {+ "name": "auth_sessions",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "token": {+ "name": "token",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "expires_at": {+ "name": "expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "ip_address": {+ "name": "ip_address",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "user_agent": {+ "name": "user_agent",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "auth_sessions_user_id_users_id_fk": {+ "name": "auth_sessions_user_id_users_id_fk",+ "tableFrom": "auth_sessions",+ "columnsFrom": [+ "user_id"+ ],+ "tableTo": "users",+ "columnsTo": [+ "id"+ ],+ "onUpdate": "cascade",+ "onDelete": "cascade"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}+ },+ "auth_verifications": {+ "name": "auth_verifications",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "identifier": {+ "name": "identifier",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "value": {+ "name": "value",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "expires_at": {+ "name": "expires_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "checkConstraints": {}}},"views": {},diff --git a/apps/papra-server/migrations/meta/_journal.json b/apps/papra-server/migrations/meta/_journal.jsonindex 0d0aca1d..fc1b4020 100644--- a/apps/papra-server/migrations/meta/_journal.json+++ b/apps/papra-server/migrations/meta/_journal.json@@ -5,14 +5,14 @@{"idx": 0,"version": "6",- "when": 1736211100443,+ "when": 1736857762863,"tag": "0000_initial_schema_setup","breakpoints": true},{"idx": 1,"version": "6",- "when": 1736211135498,+ "when": 1736857770412,"tag": "0001_documents_fts","breakpoints": true}diff --git a/apps/papra-server/package.json b/apps/papra-server/package.jsonindex cbc17676..ed9b3c89 100644--- a/apps/papra-server/package.json+++ b/apps/papra-server/package.json@@ -34,6 +34,7 @@"@hono/oauth-providers": "^0.6.2","@libsql/client": "^0.14.0","@paralleldrive/cuid2": "^2.2.2",+ "better-auth": "^1.1.11","date-fns": "^4.1.0","drizzle-kit": "^0.30.1","drizzle-orm": "^0.38.3",diff --git a/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.repository.ts b/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.repository.tsdeleted file mode 100644index bd0010c3..00000000--- a/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.repository.ts+++ /dev/null@@ -1,44 +0,0 @@-import type { Database } from '../../database/database.types';-import { injectArguments } from '@corentinth/chisels';-import { and, eq, gt, lt } from 'drizzle-orm';-import { size } from 'lodash-es';-import { authTokensTable } from './auth-tokens.table';--export type AuthTokensRepository = ReturnType<typeof createAuthTokensRepository>;--export function createAuthTokensRepository({ db }: { db: Database }) {- return injectArguments(- {- saveAuthToken,- getAuthTokenValidity,- deleteAuthToken,- deleteExpiredAuthTokens,- },- { db },- );-}--async function saveAuthToken({ db, userId, token, expiresAt }: { db: Database; userId: string; token: string; expiresAt: Date }) {- const [authTokenDetails] = await db.insert(authTokensTable).values({ userId, token, expiresAt }).returning();-- return { authTokenDetails };-}--async function getAuthTokenValidity({ db, token, userId, now = new Date() }: { db: Database; token: string; userId: string; now?: Date }) {- const [authTokenDetails] = await db- .select()- .from(authTokensTable)- .where(and(eq(authTokensTable.token, token), eq(authTokensTable.userId, userId), gt(authTokensTable.expiresAt, now)));-- return { isValid: Boolean(authTokenDetails) };-}--async function deleteAuthToken({ db, token }: { db: Database; token: string }) {- await db.delete(authTokensTable).where(eq(authTokensTable.token, token));-}--async function deleteExpiredAuthTokens({ db, now = new Date() }: { db: Database; now?: Date }) {- const deletedRecords = await db.delete(authTokensTable).where(lt(authTokensTable.expiresAt, now)).returning({ id: authTokensTable.id });-- return { deletedCount: size(deletedRecords) };-}diff --git a/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.table.ts b/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.table.tsdeleted file mode 100644index 233a0301..00000000--- a/apps/papra-server/src/modules/app/auth/auth-tokens/auth-tokens.table.ts+++ /dev/null@@ -1,26 +0,0 @@-import { index, integer, sqliteTable, text } from 'drizzle-orm/sqlite-core';-import { createCreatedAtField, createPrimaryKeyField } from '../../../shared/db/columns.helpers';-import { usersTable } from '../../../users/users.table';--export const authTokensTable = sqliteTable(- 'auth_tokens',- {- ...createPrimaryKeyField({ prefix: 'at' }),- ...createCreatedAtField(),-- token: text('token'),- userId: text('user_id')- .notNull()- .references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),- expiresAt: integer('expires_at', { mode: 'timestamp_ms' }),-- },- table => [- // To get a token record by its value- index('auth_tokens_token_index').on(table.token),- // To easily remove expired tokens- index('auth_tokens_expires_at_index').on(table.expiresAt),- // To rotate tokens- index('auth_tokens_token_user_id_expires_at_index').on(table.token, table.userId, table.expiresAt),- ],-);diff --git a/apps/papra-server/src/modules/app/auth/auth.config.ts b/apps/papra-server/src/modules/app/auth/auth.config.tsnew file mode 100644index 00000000..70741e6c--- /dev/null+++ b/apps/papra-server/src/modules/app/auth/auth.config.ts@@ -0,0 +1,38 @@+import type { ConfigDefinition } from 'figue';+import { z } from 'zod';++export const authConfig = {+ secret: {+ doc: 'The secret for the auth',+ schema: z.string(),+ default: 'change-me-for-god-sake',+ env: 'AUTH_SECRET',+ },+ isRegistrationEnabled: {+ doc: 'Whether registration is enabled',+ schema: z+ .string()+ .trim()+ .toLowerCase()+ .transform(x => x === 'true')+ .pipe(z.boolean()),+ default: 'true',+ env: 'AUTH_IS_REGISTRATION_ENABLED',+ },+ providers: {+ github: {+ clientId: {+ doc: 'The client id for Github OAuth',+ schema: z.string(),+ default: 'set-me',+ env: 'AUTH_PROVIDERS_GITHUB_CLIENT_ID',+ },+ clientSecret: {+ doc: 'The client secret for Github OAuth',+ schema: z.string(),+ default: 'set-me',+ env: 'AUTH_PROVIDERS_GITHUB_CLIENT_SECRET',+ },+ },+ },+} as const satisfies ConfigDefinition;diff --git a/apps/papra-server/src/modules/app/auth/auth.models.test.ts b/apps/papra-server/src/modules/app/auth/auth.models.test.tsdeleted file mode 100644index 70f190da..00000000--- a/apps/papra-server/src/modules/app/auth/auth.models.test.ts+++ /dev/null@@ -1,13 +0,0 @@-import { describe, expect, test } from 'vitest';-import { createAccessTokenRedirectionUrl } from './auth.models';--describe('auth models', () => {- describe('createAccessTokenRedirectionUrl', () => {- test('set the access token as a hash fragment in the redirection url', () => {- const redirectionBaseUrl = 'https://example.com/confirm';- const accessToken = 'foo';-- expect(createAccessTokenRedirectionUrl({ redirectionBaseUrl, accessToken })).to.eql('https://example.com/confirm#accessToken=foo');- });- });-});diff --git a/apps/papra-server/src/modules/app/auth/auth.models.ts b/apps/papra-server/src/modules/app/auth/auth.models.tsindex d231aa3b..68b11db0 100644--- a/apps/papra-server/src/modules/app/auth/auth.models.ts+++ b/apps/papra-server/src/modules/app/auth/auth.models.ts@@ -1,31 +1,26 @@import type { Context } from '../server.types';-import { buildUrl } from '@corentinth/chisels';import { createError } from '../../shared/errors/errors';-export { createAccessTokenRedirectionUrl, getAuthUserId };+export function getUser({ context }: { context: Context }) {+ const user = context.get('user');-function getAuthUserId({ context }: { context: Context }) {- const userId = context.get('userId');- const authUserId = context.get('authUserId');-- if (!userId || !authUserId) {+ if (!user) {throw createError({- message: 'User ID or Auth User ID not found in context',- code: 'users.id_not_found',- statusCode: 500,+ message: 'User not found in context',+ code: 'users.not_found',+ statusCode: 403,isInternal: true,});}return {- userId,- authUserId,+ user,+ userId: user.id,};}-function createAccessTokenRedirectionUrl({ redirectionBaseUrl, accessToken }: { redirectionBaseUrl: string; accessToken: string }) {- return buildUrl({- baseUrl: redirectionBaseUrl,- hash: `accessToken=${accessToken}`,- });+export function getSession({ context }: { context: Context }) {+ const session = context.get('session');++ return { session };}diff --git a/apps/papra-server/src/modules/app/auth/auth.routes.ts b/apps/papra-server/src/modules/app/auth/auth.routes.tsindex e4e911a7..bc58f4f0 100644--- a/apps/papra-server/src/modules/app/auth/auth.routes.ts+++ b/apps/papra-server/src/modules/app/auth/auth.routes.ts@@ -1,63 +1,35 @@import type { ServerInstance } from '../server.types';import { getConfig } from '../../config/config.models';-import { createRolesRepository } from '../../roles/roles.repository';-import { createLogger } from '../../shared/logger/logger';-import { createCookieRepository } from '../cookies/cookies.repository';import { getDb } from '../database/database.models';-import { createAuthTokensRepository } from './auth-tokens/auth-tokens.repository';-import { renewAuthTokens } from './auth.usecases';-import { registerGithubProviderOauthRoute, registerGoogleProviderOauthRoute } from './oauth-providers/oauth-providers.routes';-import { createRefreshTokenCookieRepository } from './refresh-tokens/refresh-token.cookie.repository';--export function registerAuthPublicRoutes({ app }: { app: ServerInstance }) {- registerRefreshTokenRoute({ app });- registerGithubProviderOauthRoute({ app });- registerGoogleProviderOauthRoute({ app });-}--export function registerAuthPrivateRoutes({ app }: { app: ServerInstance }) {- registerLogoutRoute({ app });-}+import { getAuth } from './auth.services';-const logger = createLogger({ namespace: 'auth.routes' });--function registerLogoutRoute({ app }: { app: ServerInstance }) {- app.post('/api/auth/logout', async (context) => {- const { config } = getConfig({ context });+export function registerAuthRoutes({ app }: { app: ServerInstance }) {+ app.on(['POST', 'GET'], '/api/auth/*', (context) => {const { db } = getDb({ context });- const refreshTokenCookieRepository = createRefreshTokenCookieRepository({ config, cookiesRepository: createCookieRepository({ context }) });- const authTokenRepository = createAuthTokensRepository({ db });-- const { refreshToken } = await refreshTokenCookieRepository.getRefreshTokenFromCookie();+ const { config } = getConfig({ context });- if (refreshToken) {- await authTokenRepository.deleteAuthToken({ token: refreshToken });- await refreshTokenCookieRepository.deleteRefreshTokenCookie();- } else {- logger.warn('No refresh token found in cookies when trying to logout');- }+ const { auth } = getAuth({ db, config });- return context.body(null, 204);+ return auth.handler(context.req.raw);});-}-function registerRefreshTokenRoute({ app }: { app: ServerInstance }) {- app.post('/api/auth/refresh', async (context) => {+ app.use('*', async (context, next) => {const { db } = getDb({ context });const { config } = getConfig({ context });- const authTokensRepository = createAuthTokensRepository({ db });- const refreshTokenCookieRepository = createRefreshTokenCookieRepository({ config, cookiesRepository: createCookieRepository({ context }) });- const rolesRepository = createRolesRepository({ db });+ const { auth } = getAuth({ db, config });- const { accessToken } = await renewAuthTokens({- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- config,- });+ const session = await auth.api.getSession({ headers: context.req.raw.headers });++ if (!session) {+ context.set('user', null);+ context.set('session', null);+ return next();+ }- return context.json({ accessToken });+ context.set('user', session.user);+ context.set('session', session.session);+ return next();});}diff --git a/apps/papra-server/src/modules/app/auth/auth.services.ts b/apps/papra-server/src/modules/app/auth/auth.services.tsindex 8aa29f62..c60b9597 100644--- a/apps/papra-server/src/modules/app/auth/auth.services.ts+++ b/apps/papra-server/src/modules/app/auth/auth.services.ts@@ -1,79 +1,93 @@-import { addDays } from 'date-fns';-import { sign, verify } from 'hono/jwt';-import { isString } from 'lodash-es';-import { createUnauthorizedError } from './auth.errors';--export async function generateUserJwt({- userId,- jwtSecret,- roles = [],- now = new Date(),-}: {- userId: string;- jwtSecret: string;- roles?: string[];- now?: Date;-}) {- const token = await sign({- sub: userId,- // TODO: extract token expiration delay to config- exp: Math.floor(now.getTime() / 1000) + 60 * 10,- roles,- }, jwtSecret);-- return { token };-}--export async function verifyJwt({ token, jwtSecret }: { token: string; jwtSecret: string }) {- const jwtPayload = await verify(token, jwtSecret);-- if (!jwtPayload) {- throw createUnauthorizedError();- }-- return jwtPayload;-}--export async function verifyUserJwt({ token, jwtSecret }: { token: string; jwtSecret: string }) {- const jwtPayload = await verify(token, jwtSecret);-- if (!jwtPayload) {- throw createUnauthorizedError();- }-- const userId = jwtPayload.sub;-- if (!userId || !isString(userId)) {- throw createUnauthorizedError();- }-- return { userId };-}--export async function verifyUserRefreshToken({ refreshToken, jwtRefreshSecret }: { refreshToken: string; jwtRefreshSecret: string }) {- const jwtPayload = await verify(refreshToken, jwtRefreshSecret);-- if (!jwtPayload) {- throw createUnauthorizedError();- }-- const userId = jwtPayload.sub;-- if (!userId || !isString(userId)) {- throw createUnauthorizedError();- }+import type { Config } from '../../config/config.types';+import type { Database } from '../database/database.types';+import { betterAuth } from 'better-auth';+import { drizzleAdapter } from 'better-auth/adapters/drizzle';+import { APIError } from 'better-auth/api';+import { createLogger } from '../../shared/logger/logger';+import { usersTable } from '../../users/users.table';+import { accountsTable, sessionsTable, verificationsTable } from './auth.tables';++export type Auth = ReturnType<typeof getAuth>['auth'];++const logger = createLogger({ namespace: 'auth' });++export function getAuth({ db, config }: { db: Database; config: Config }) {+ const { secret } = config.auth;++ const auth = betterAuth({+ secret,++ baseURL: config.server.baseUrl,+ trustedOrigins: [config.client.baseUrl],+ logger: {+ disabled: false,+ log: (baseLevel, message) => {+ const level = (baseLevel in logger ? baseLevel : 'info') as keyof typeof logger;++ logger[level](message);+ },+ },+ emailAndPassword: {+ enabled: true,+ requireEmailVerification: true,+ },+ appName: 'Papra',+ account: {+ accountLinking: {+ enabled: true,+ },+ },+ emailVerification: {+ sendVerificationEmail: async ({ user, url, token }) => {+ // eslint-disable-next-line no-console+ console.log('sendVerificationEmail', { user, url, token });+ },+ },- return { userId };-}+ database: drizzleAdapter(+ db,+ {+ provider: 'sqlite',+ schema: {+ user: usersTable,+ account: accountsTable,+ session: sessionsTable,+ verification: verificationsTable,+ },+ },+ ),++ databaseHooks: {+ user: {+ create: {+ before: async (data) => {+ if (!config.auth.isRegistrationEnabled) {+ throw new APIError('FORBIDDEN', { message: 'Registration is disabled' });+ }++ return { data };+ },+ },+ },+ },-export async function generateUserRefreshToken({ userId, jwtSecret, now = new Date(), expiresAt = addDays(now, 14) }: { userId: string; jwtSecret: string; now?: Date; expiresAt?: Date }) {- const refreshToken = await sign(- {- sub: userId,- exp: Math.floor(expiresAt.getTime() / 1000),+ advanced: {+ // Drizzle tables handle the id generation+ generateId: false,+ },+ socialProviders: {+ github: {+ clientId: config.auth.providers.github.clientId,+ clientSecret: config.auth.providers.github.clientSecret,+ },+ },+ user: {+ changeEmail: { enabled: false },+ deleteUser: { enabled: false },},- jwtSecret,- );+ });- return { refreshToken };+ return {+ auth,+ };}diff --git a/apps/papra-server/src/modules/app/auth/auth.tables.ts b/apps/papra-server/src/modules/app/auth/auth.tables.tsnew file mode 100644index 00000000..d0cf96e0--- /dev/null+++ b/apps/papra-server/src/modules/app/auth/auth.tables.ts@@ -0,0 +1,39 @@+import { integer, sqliteTable, text } from 'drizzle-orm/sqlite-core';+import { createPrimaryKeyField, createTimestampColumns } from '../../shared/db/columns.helpers';+import { usersTable } from '../../users/users.table';++export const sessionsTable = sqliteTable('auth_sessions', {+ ...createPrimaryKeyField({ prefix: 'auth_ses' }),+ ...createTimestampColumns(),++ token: text('token').notNull(),+ userId: text('user_id').references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),+ expiresAt: integer('expires_at', { mode: 'timestamp' }).notNull(),+ ipAddress: text('ip_address'),+ userAgent: text('user_agent'),+});++export const accountsTable = sqliteTable('auth_accounts', {+ ...createPrimaryKeyField({ prefix: 'auth_acc' }),+ ...createTimestampColumns(),++ userId: text('user_id').references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),+ accountId: text('account_id').notNull(),+ providerId: text('provider_id').notNull(),+ accessToken: text('access_token'),+ refreshToken: text('refresh_token'),+ accessTokenExpiresAt: integer('access_token_expires_at', { mode: 'timestamp' }),+ refreshTokenExpiresAt: integer('refresh_token_expires_at', { mode: 'timestamp' }),+ scope: text('scope'),+ idToken: text('id_token'),+ password: text('password'),+});++export const verificationsTable = sqliteTable('auth_verifications', {+ ...createPrimaryKeyField({ prefix: 'auth_ver' }),+ ...createTimestampColumns(),++ identifier: text('identifier').notNull(),+ value: text('value').notNull(),+ expiresAt: integer('expires_at', { mode: 'timestamp' }).notNull(),+});diff --git a/apps/papra-server/src/modules/app/auth/auth.usecases.ts b/apps/papra-server/src/modules/app/auth/auth.usecases.tsdeleted file mode 100644index fa408fd5..00000000--- a/apps/papra-server/src/modules/app/auth/auth.usecases.ts+++ /dev/null@@ -1,116 +0,0 @@-import type { Config } from '../../config/config.types';-import type { RolesRepository } from '../../roles/roles.repository';-import type { UsersRepository } from '../../users/users.repository';-import type { DbInsertableUser } from '../../users/users.types';-import type { AuthTokensRepository } from './auth-tokens/auth-tokens.repository';-import type { RefreshTokenCookieRepository } from './refresh-tokens/refresh-token.cookie.repository';-import { addDays } from 'date-fns';-import { createUser } from '../../users/users.usecases';-import { createUnauthorizedError } from './auth.errors';-import { generateUserJwt, generateUserRefreshToken, verifyUserRefreshToken } from './auth.services';-import { REFRESH_TOKEN_DURATION_IN_DAYS } from './refresh-tokens/refresh-token.constants';--export async function getOrCreateUserFromProvider({- usersRepository,- providerUser,- config,-}: {- usersRepository: UsersRepository;- providerUser: DbInsertableUser;- config: Config;-}) {- const { email } = providerUser;-- const { user: existingUser } = await usersRepository.getUserByEmail({ email });-- if (existingUser) {- return {- user: existingUser,- };- }-- const { user: newUser } = await createUser({- user: providerUser,- usersRepository,- config,- });-- return {- user: newUser,- };-}--export async function createAuthTokens({- userId,- config,- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- now = new Date(),-}: {- userId: string;- config: Config;- authTokensRepository: AuthTokensRepository;- refreshTokenCookieRepository: RefreshTokenCookieRepository;- rolesRepository: RolesRepository;- now?: Date;-}) {- const { jwtSecret, jwtRefreshSecret } = config.auth;-- const { roles } = await rolesRepository.getUserRoles({ userId });-- const { token: accessToken } = await generateUserJwt({ userId, jwtSecret, roles });- const { refreshToken } = await generateUserRefreshToken({ userId, jwtSecret: jwtRefreshSecret });-- // TODO: create a refreshTokenRepository as a wrapper around the authTokensRepository- // Save the refresh token in the database- await authTokensRepository.saveAuthToken({ userId, token: refreshToken, expiresAt: addDays(now, REFRESH_TOKEN_DURATION_IN_DAYS) });-- // Store the refresh token in a cookie- await refreshTokenCookieRepository.saveRefreshTokenInCookie({ refreshToken });-- return { accessToken };-}--export async function renewAuthTokens({- config,- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- now = new Date(),-}: {- config: Config;- authTokensRepository: AuthTokensRepository;- refreshTokenCookieRepository: RefreshTokenCookieRepository;- rolesRepository: RolesRepository;- now?: Date;-}) {- const { jwtRefreshSecret } = config.auth;-- // Get the refresh token from the cookies- const { refreshToken } = await refreshTokenCookieRepository.getRefreshTokenFromCookieOrThrow();-- // Verify the refresh token is a valid JWT token- const { userId } = await verifyUserRefreshToken({ refreshToken, jwtRefreshSecret });-- // Verify the refresh token is in the DB and not expired- const { isValid } = await authTokensRepository.getAuthTokenValidity({ token: refreshToken, userId });-- // Delete the refresh token from the database to prevent replay attacks- await authTokensRepository.deleteAuthToken({ token: refreshToken });-- if (!isValid) {- throw createUnauthorizedError();- }-- const { accessToken } = await createAuthTokens({- userId,- config,- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- now,- });-- return { accessToken };-}diff --git a/apps/papra-server/src/modules/app/auth/e2e/logout.e2e.test.ts b/apps/papra-server/src/modules/app/auth/e2e/logout.e2e.test.tsdeleted file mode 100644index 26f23563..00000000--- a/apps/papra-server/src/modules/app/auth/e2e/logout.e2e.test.ts+++ /dev/null@@ -1,92 +0,0 @@-import { describe, expect, test } from 'vitest';-import { overrideConfig } from '../../../config/config.test-utils';-import { usersTable } from '../../../users/users.table';-import { createInMemoryDatabase } from '../../database/database.test-utils';-import { createServer } from '../../server';-import { generateUserJwt } from '../auth.services';--describe('auth routes e2e', () => {- describe('logout', () => {- test('when login out, if no refresh token is present in cookies, the logout should succeed, nothing happens', async () => {- const jwtSecret = 'jwt-secret';- const { db } = await createInMemoryDatabase();- const { app } = createServer({ db, config: overrideConfig({ auth: { jwtSecret } }) });-- await db- .insert(usersTable)- .values({- email: '[email protected]',- id: 'user-1',- })- .returning()- .execute();-- const { token } = await generateUserJwt({ userId: 'user-1', jwtSecret });-- const response = await app.request('/api/auth/logout', {- method: 'POST',- headers: {- Authorization: `Bearer ${token}`,- },- });-- expect(response.status).to.eql(204);- });-- // test('if a refresh token is present in request cookies and in db, it should be deleted from the cookies and db', async () => {- // const { request, db, createAuthHeaderForUser } = await setupTestApp({ config: { auth: { jwtRefreshSecret: 'jwt-refresh-token-secret' } } });-- // const [user] = await db- // .insert(usersTable)- // .values({- // email: '[email protected]',- // id: 'cbu-1',- // })- // .returning()- // .execute();-- // await db.insert(authTokensTable).values({- // token: 'refresh-token-value',- // userId: 'cbu-1',- // expiresAt: new Date('3000-01-01'),- // }).execute();-- // const initialTokens = await db.select().from(authTokensTable).execute();-- // expect(- // _.map(initialTokens, ({ token, userId }) => ({ token, userId })),- // ).to.eql([- // { token: 'refresh-token-value', userId: 'cbu-1' },- // ]);-- // const response = await request({- // url: '/api/auth/logout',- // method: 'POST',- // headers: {- // ...await createAuthHeaderForUser({ userId: user.id }),- // Cookie: 'refreshToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJjYnVfMDFqMmh5YXF6MTQzanl5eGhtN2I4YnBlc2siLCJleHAiOjE3MjQzNTU2OTd9.GRjXLWdQAIa05OnlMLvNlODl0TNJUnPggO4BUJ_FMxQ',- // },- // });-- // expect(response.status).to.eql(204);-- // const authTokens = await db.select().from(authTokensTable).execute();-- // expect(_.size(authTokens)).to.eql(0, 'The refresh token should have been deleted from the db');- // });-- test('if the user is not logged in, the logout rejects with 401', async () => {- const { db } = await createInMemoryDatabase();- const { app } = createServer({ db });-- const response = await app.request('/api/auth/logout', {- method: 'POST',- });-- expect(response.status).to.eql(401);- expect(await response.json()).to.eql({- error: { code: 'auth.unauthorized', message: 'Unauthorized' },- });- });- });-});diff --git a/apps/papra-server/src/modules/app/auth/middlewares/auth.middleware.ts b/apps/papra-server/src/modules/app/auth/middlewares/auth.middleware.tsdeleted file mode 100644index a34ecaaf..00000000--- a/apps/papra-server/src/modules/app/auth/middlewares/auth.middleware.ts+++ /dev/null@@ -1,43 +0,0 @@-import type { ServerInstanceGenerics } from '../../server.types';-import { createMiddleware } from 'hono/factory';-import { getConfig } from '../../../config/config.models';-import { getAuthorizationHeader } from '../../../shared/headers/headers.models';-import { createCookieRepository } from '../../cookies/cookies.repository';-import { createUnauthorizedError } from '../auth.errors';-import { verifyJwt } from '../auth.services';-import { createRefreshTokenCookieRepository } from '../refresh-tokens/refresh-token.cookie.repository';--export const jwtValidationMiddleware = createMiddleware<ServerInstanceGenerics>(async (context, next) => {- const { authorizationHeader } = getAuthorizationHeader({ context });- const { config } = getConfig({ context });-- const { deleteRefreshTokenCookie } = createRefreshTokenCookieRepository({ config, cookiesRepository: createCookieRepository({ context }) });-- if (!authorizationHeader) {- throw createUnauthorizedError();- }-- const tokenParts = authorizationHeader.trim().split(' ');-- if (tokenParts.length !== 2) {- throw createUnauthorizedError();- }-- const token = tokenParts[1];-- const {- auth: { jwtSecret },- } = config;-- try {- const jwtPayload = await verifyJwt({ token, jwtSecret });-- context.set('jwtPayload', jwtPayload);-- await next();- } catch (_ignored) {- await deleteRefreshTokenCookie();-- throw createUnauthorizedError();- }-});diff --git a/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.test.ts b/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.test.tsdeleted file mode 100644index 8a6d41d2..00000000--- a/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.test.ts+++ /dev/null@@ -1,152 +0,0 @@-import type { Context } from '../../server.types';-import { describe, expect, test } from 'vitest';-import { impersonationMiddleware } from './impersonation.middleware';--function createContext({ jwtPayload, xUserId }: { jwtPayload: Record<string, unknown>; xUserId?: string }) {- let isNextCalled = false;- const contextDatas: Record<string, unknown> = {};-- const context = {- get: (key: string) => {- if (key === 'jwtPayload') {- return jwtPayload;- }-- throw new Error(`Unknown key: ${key}`);- },- set: (key: string, value: any) => {- contextDatas[key] = value;- },- req: {- header: (name: string) => {- if (name === 'x-user-id') {- return xUserId;- }-- throw new Error(`Unknown header: ${name}`);- },- },- } as Context;-- const next = async () => {- isNextCalled = true;- };-- return {- context,- getIsNextCalled: () => isNextCalled,- getContextDatas: () => contextDatas,- next,- };-}--describe('impersonation middleware', () => {- describe('impersonationMiddleware', () => {- test('for the standard user, the userId is extracted from the sub field of the jwtPayload', async () => {- const {- context,- getIsNextCalled,- next,- getContextDatas,- } = createContext({ jwtPayload: { sub: '123' }, xUserId: undefined });-- await impersonationMiddleware(context, next);-- expect(getIsNextCalled()).to.eql(true);- expect(getContextDatas()).to.eql({ authUserId: '123', userId: '123' });- });-- test('when the userId in the jwtPayload is not a string, an error should be thrown', async () => {- const {- context,- getIsNextCalled,- next,- } = createContext({- jwtPayload: {- sub: 123 as any,- },- xUserId: undefined,- });-- await expect(impersonationMiddleware(context, next)).rejects.toThrowError('Forbidden');-- expect(getIsNextCalled()).to.eql(false);- });-- test('when the x-user-id header is present and the user has the admin role, the userId is extracted from the x-user-id header and the authUserId is the one of the admin', async () => {- const {- context,- getIsNextCalled,- next,- getContextDatas,- } = createContext({- jwtPayload: {- sub: '123',- roles: ['admin'],- },- xUserId: '456',- });-- await impersonationMiddleware(context, next);-- expect(getIsNextCalled()).to.eql(true);- expect(getContextDatas()).to.eql({ authUserId: '123', userId: '456' });- });-- test('when the x-user-id header is present and the user does not have the admin role, an error should be thrown', async () => {- const {- context,- getIsNextCalled,- next,- } = createContext({- jwtPayload: {- sub: '123',- roles: [],- },- xUserId: '456',- });-- await expect(impersonationMiddleware(context, next)).rejects.toThrowError('Forbidden');-- expect(getIsNextCalled()).to.eql(false);- });-- test('when the x-user-id header is not a string, an error should be thrown', async () => {- const {- context,- getIsNextCalled,- next,- } = createContext({- jwtPayload: {- sub: '123',- roles: ['admin'],- },- xUserId: 456 as any,- });-- await expect(impersonationMiddleware(context, next)).rejects.toThrowError('Forbidden');-- expect(getIsNextCalled()).to.eql(false);- });-- test('when the x-user-id header is not present, the userId should be the same as the authUserId', async () => {- const {- context,- getIsNextCalled,- next,- getContextDatas,- } = createContext({- jwtPayload: {- sub: '123',- roles: ['admin'],- },- xUserId: undefined,- });-- await impersonationMiddleware(context, next);-- expect(getIsNextCalled()).to.eql(true);- expect(getContextDatas()).to.eql({ authUserId: '123', userId: '123' });- });- });-});diff --git a/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.ts b/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.tsdeleted file mode 100644index e30e0c31..00000000--- a/apps/papra-server/src/modules/app/auth/middlewares/impersonation.middleware.ts+++ /dev/null@@ -1,38 +0,0 @@-import type { ServerInstanceGenerics } from '../../server.types';-import { createMiddleware } from 'hono/factory';-import { get, isString } from 'lodash-es';-import { ADMIN_ROLE } from '../../../roles/roles.constants';-import { areSomeRolesInJwtPayload } from '../../../roles/roles.models';-import { getImpersonatedUserIdFromHeader } from '../../../shared/headers/headers.models';-import { addLogContext } from '../../../shared/logger/logger';-import { createForbiddenError } from '../auth.errors';--export const impersonationMiddleware = createMiddleware<ServerInstanceGenerics>(async (context, next) => {- const jwtPayload = context.get('jwtPayload');- const authUserId = get(jwtPayload, 'sub') as string;-- if (!isString(authUserId)) {- throw createForbiddenError();- }-- const { impersonatedUserId } = getImpersonatedUserIdFromHeader({ context });-- if (impersonatedUserId && !isString(impersonatedUserId)) {- throw createForbiddenError();- }-- const isAdmin = areSomeRolesInJwtPayload({ roles: [ADMIN_ROLE], jwtPayload });-- if (impersonatedUserId && !isAdmin) {- throw createForbiddenError();- }-- const userId = impersonatedUserId ?? authUserId;-- context.set('authUserId', authUserId);- context.set('userId', userId);-- addLogContext({ userId, authUserId });-- await next();-});diff --git a/apps/papra-server/src/modules/app/auth/oauth-providers/oauth-providers.routes.ts b/apps/papra-server/src/modules/app/auth/oauth-providers/oauth-providers.routes.tsdeleted file mode 100644index ad21e6b1..00000000--- a/apps/papra-server/src/modules/app/auth/oauth-providers/oauth-providers.routes.ts+++ /dev/null@@ -1,126 +0,0 @@-import type { ServerInstance } from '../../server.types';-import { githubAuth } from '@hono/oauth-providers/github';-import { googleAuth } from '@hono/oauth-providers/google';-import { getConfig } from '../../../config/config.models';-import { createRolesRepository } from '../../../roles/roles.repository';-import { createUsersRepository } from '../../../users/users.repository';-import { createCookieRepository } from '../../cookies/cookies.repository';-import { getDb } from '../../database/database.models';-import { createAuthTokensRepository } from '../auth-tokens/auth-tokens.repository';-import { createUnauthorizedError } from '../auth.errors';-import { createAccessTokenRedirectionUrl } from '../auth.models';-import { createAuthTokens, getOrCreateUserFromProvider } from '../auth.usecases';-import { createRefreshTokenCookieRepository } from '../refresh-tokens/refresh-token.cookie.repository';--export function registerGithubProviderOauthRoute({ app }: { app: ServerInstance }) {- app.get(- '/api/auth/github',- (context, next) => {- const { config } = getConfig({ context });- const { clientId, clientSecret } = config.auth.providers.github;-- const oauthMiddleware = githubAuth({- oauthApp: true,- scope: ['read:user', 'user:email'],- client_id: clientId,- client_secret: clientSecret,- });-- return oauthMiddleware(context, next);- },- async (context) => {- const githubUser = context.get('user-github');- const { db } = getDb({ context });- const { config } = getConfig({ context });-- const authTokensRepository = createAuthTokensRepository({ db });- const refreshTokenCookieRepository = createRefreshTokenCookieRepository({ config, cookiesRepository: createCookieRepository({ context }) });- const rolesRepository = createRolesRepository({ db });-- if (!githubUser || !githubUser.email) {- throw createUnauthorizedError();- }-- const usersRepository = createUsersRepository({ db });-- const { user } = await getOrCreateUserFromProvider({- usersRepository,- providerUser: {- email: githubUser.email,- fullName: githubUser.name,- },- config,- });-- const userId = user.id;-- const { accessToken } = await createAuthTokens({- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- userId,- config,- });-- const redirectUrl = createAccessTokenRedirectionUrl({ accessToken, redirectionBaseUrl: config.client.oauthRedirectUrl });-- return context.redirect(redirectUrl);- },- );-}--export function registerGoogleProviderOauthRoute({ app }: { app: ServerInstance }) {- app.get(- '/api/auth/google',- (context, next) => {- const { config } = getConfig({ context });- const { clientId, clientSecret } = config.auth.providers.google;-- const oauthMiddleware = googleAuth({- scope: ['email', 'profile'],- client_id: clientId,- client_secret: clientSecret,- });-- return oauthMiddleware(context, next);- },- async (context) => {- const googleUser = context.get('user-google');- const { db } = getDb({ context });- const { config } = getConfig({ context });-- const authTokensRepository = createAuthTokensRepository({ db });- const refreshTokenCookieRepository = createRefreshTokenCookieRepository({ config, cookiesRepository: createCookieRepository({ context }) });- const rolesRepository = createRolesRepository({ db });-- if (!googleUser || !googleUser.email) {- throw createUnauthorizedError();- }-- const usersRepository = createUsersRepository({ db });-- const { user } = await getOrCreateUserFromProvider({- usersRepository,- providerUser: {- email: googleUser.email,- fullName: googleUser.name,- },- config,- });-- const userId = user.id;-- const { accessToken } = await createAuthTokens({- authTokensRepository,- refreshTokenCookieRepository,- rolesRepository,- userId,- config,- });-- const redirectUrl = createAccessTokenRedirectionUrl({ accessToken, redirectionBaseUrl: config.client.oauthRedirectUrl });-- return context.redirect(redirectUrl);- },- );-}diff --git a/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.constants.ts b/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.constants.tsdeleted file mode 100644index 4319d35e..00000000--- a/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.constants.ts+++ /dev/null@@ -1,3 +0,0 @@-export const REFRESH_TOKEN_DURATION_IN_DAYS = 14;-export const REFRESH_TOKEN_COOKIE_NAME = 'refreshToken';-export const REFRESH_TOKEN_COOKIE_DURATION_IN_DAYS = REFRESH_TOKEN_DURATION_IN_DAYS;diff --git a/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.cookie.repository.ts b/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.cookie.repository.tsdeleted file mode 100644index 999eca1d..00000000--- a/apps/papra-server/src/modules/app/auth/refresh-tokens/refresh-token.cookie.repository.ts+++ /dev/null@@ -1,74 +0,0 @@-import type { Config } from '../../../config/config.types';-import type { CookieRepository } from '../../cookies/cookies.repository';-import { injectArguments } from '@corentinth/chisels';-import { addDays } from 'date-fns';-import { createUnauthorizedError } from '../auth.errors';-import { REFRESH_TOKEN_COOKIE_DURATION_IN_DAYS, REFRESH_TOKEN_COOKIE_NAME } from './refresh-token.constants';--export type RefreshTokenCookieRepository = ReturnType<typeof createRefreshTokenCookieRepository>;--export function createRefreshTokenCookieRepository({ cookiesRepository, config }: { cookiesRepository: CookieRepository; config: Config }) {- return injectArguments(- {- saveRefreshTokenInCookie,- getRefreshTokenFromCookie,- getRefreshTokenFromCookieOrThrow,- deleteRefreshTokenCookie,- },- { cookiesRepository, config },- );-}--async function saveRefreshTokenInCookie({- cookiesRepository,- config,- refreshToken,- now = new Date(),- expiresAt = addDays(now, REFRESH_TOKEN_COOKIE_DURATION_IN_DAYS),-}: {- refreshToken: string;- cookiesRepository: CookieRepository;- config: Config;- now?: Date;- expiresAt?: Date;-}) {- await cookiesRepository.setSignedCookie({- cookieName: REFRESH_TOKEN_COOKIE_NAME,- value: refreshToken,- secret: config.auth.refreshTokenCookieSecret,- options: {- expires: expiresAt,- httpOnly: true,- secure: true,- },- });-}--async function getRefreshTokenFromCookieOrThrow({ cookiesRepository, config }: { cookiesRepository: CookieRepository; config: Config }) {- const { refreshToken } = await getRefreshTokenFromCookie({ cookiesRepository, config });-- if (!refreshToken) {- throw createUnauthorizedError();- }-- return { refreshToken };-}--async function getRefreshTokenFromCookie({ cookiesRepository, config }: { cookiesRepository: CookieRepository; config: Config }) {- const refreshToken = await cookiesRepository.getSignedCookie({- cookieName: REFRESH_TOKEN_COOKIE_NAME,- secret: config.auth.refreshTokenCookieSecret,- });-- return { refreshToken };-}--async function deleteRefreshTokenCookie({ cookiesRepository }: { cookiesRepository: CookieRepository }) {- await cookiesRepository.deleteCookie({- cookieName: REFRESH_TOKEN_COOKIE_NAME,- options: {- httpOnly: true,- secure: true,- },- });-}diff --git a/apps/papra-server/src/modules/app/server.routes.ts b/apps/papra-server/src/modules/app/server.routes.tsindex 928c8d38..c5604f43 100644--- a/apps/papra-server/src/modules/app/server.routes.ts+++ b/apps/papra-server/src/modules/app/server.routes.ts@@ -2,26 +2,38 @@ import type { ServerInstance } from './server.types';import { registerDocumentsPrivateRoutes } from '../documents/documents.routes';import { registerOrganizationsPrivateRoutes } from '../organizations/organizations.routes';import { registerUsersPrivateRoutes } from '../users/users.routes';-import { registerAuthPrivateRoutes, registerAuthPublicRoutes } from './auth/auth.routes';-import { jwtValidationMiddleware } from './auth/middlewares/auth.middleware';-import { impersonationMiddleware } from './auth/middlewares/impersonation.middleware';+import { createUnauthorizedError } from './auth/auth.errors';+import { getSession } from './auth/auth.models';+import { registerAuthRoutes } from './auth/auth.routes';+// import { jwtValidationMiddleware } from './auth/middlewares/auth.middleware';+// import { impersonationMiddleware } from './auth/middlewares/impersonation.middleware';import { registerHealthCheckRoutes } from './health-check/health-check.routes';export function registerRoutes({ app }: { app: ServerInstance }) {+ registerAuthRoutes({ app });+registerPublicRoutes({ app });registerPrivateRoutes({ app });}function registerPublicRoutes({ app }: { app: ServerInstance }) {registerHealthCheckRoutes({ app });- registerAuthPublicRoutes({ app });}function registerPrivateRoutes({ app }: { app: ServerInstance }) {- app.use(jwtValidationMiddleware);- app.use(impersonationMiddleware);+ // app.use(jwtValidationMiddleware);+ // app.use(impersonationMiddleware);++ app.use(async (context, next) => {+ const { session } = getSession({ context });++ if (!session) {+ throw createUnauthorizedError();+ }++ await next();+ });- registerAuthPrivateRoutes({ app });registerUsersPrivateRoutes({ app });registerOrganizationsPrivateRoutes({ app });registerDocumentsPrivateRoutes({ app });diff --git a/apps/papra-server/src/modules/app/server.types.ts b/apps/papra-server/src/modules/app/server.types.tsindex 235ed0ab..d4204793 100644--- a/apps/papra-server/src/modules/app/server.types.ts+++ b/apps/papra-server/src/modules/app/server.types.ts@@ -1,14 +1,14 @@import type { Context as BaseContext, Hono } from 'hono';import type { Config } from '../config/config.types';+import type { getAuth } from './auth/auth.services';import type { Database } from './database/database.types';export type ServerInstanceGenerics = {Variables: {config: Config;db: Database;- jwtPayload: Record<string, unknown>;- userId?: string;- authUserId?: string;+ user: ReturnType<typeof getAuth>['auth']['$Infer']['Session']['user'] | null;+ session: ReturnType<typeof getAuth>['auth']['$Infer']['Session']['session'] | null;};};diff --git a/apps/papra-server/src/modules/config/config.ts b/apps/papra-server/src/modules/config/config.tsindex 71a19e90..d1524bba 100644--- a/apps/papra-server/src/modules/config/config.ts+++ b/apps/papra-server/src/modules/config/config.ts@@ -3,6 +3,7 @@ import process from 'node:process';import { safelySync } from '@corentinth/chisels';import { defineConfig } from 'figue';import { z } from 'zod';+import { authConfig } from '../app/auth/auth.config';import { createLogger } from '../shared/logger/logger';import { documentStorageConfig } from './fragments/document-storage.config';@@ -14,6 +15,12 @@ export const configDefinition = {env: 'NODE_ENV',},server: {+ baseUrl: {+ doc: 'The base URL of the server',+ schema: z.string().url(),+ default: 'http://localhost:1221',+ env: 'SERVER_BASE_URL',+ },port: {doc: 'The port to listen on when using node server',schema: z.coerce.number().min(1024).max(65535),@@ -109,7 +116,8 @@ export const configDefinition = {},},documentsStorage: documentStorageConfig,- auth: {+ auth: authConfig,+ authLegacy: {isRegistrationEnabled: {doc: 'Whether registration is enabled',schema: zdiff --git a/apps/papra-server/src/modules/documents/documents.routes.ts b/apps/papra-server/src/modules/documents/documents.routes.tsindex deecc8b6..ea983b4b 100644--- a/apps/papra-server/src/modules/documents/documents.routes.ts+++ b/apps/papra-server/src/modules/documents/documents.routes.ts@@ -1,7 +1,7 @@import type { ServerInstance } from '../app/server.types';import { bodyLimit } from 'hono/body-limit';import { z } from 'zod';-import { getAuthUserId } from '../app/auth/auth.models';+import { getUser } from '../app/auth/auth.models';import { getDb } from '../app/database/database.models';import { getConfig } from '../config/config.models';import { organizationIdRegex } from '../organizations/organizations.constants';@@ -53,7 +53,7 @@ function setupCreateDocumentRoute({ app }: { app: ServerInstance }) {organizationId: z.string().regex(organizationIdRegex),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { config } = getConfig({ context });@@ -108,7 +108,7 @@ function setupGetDocumentsRoute({ app }: { app: ServerInstance }) {}),),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId } = context.req.valid('param');@@ -148,7 +148,7 @@ function setupGetDeletedDocumentsRoute({ app }: { app: ServerInstance }) {}),),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId } = context.req.valid('param');@@ -183,7 +183,7 @@ function setupGetDocumentRoute({ app }: { app: ServerInstance }) {documentId: z.string(),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId, documentId } = context.req.valid('param');@@ -210,7 +210,7 @@ function setupDeleteDocumentRoute({ app }: { app: ServerInstance }) {documentId: z.string(),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId, documentId } = context.req.valid('param');@@ -238,7 +238,7 @@ function setupRestoreDocumentRoute({ app }: { app: ServerInstance }) {documentId: z.string(),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId, documentId } = context.req.valid('param');@@ -269,7 +269,7 @@ function setupGetDocumentFileRoute({ app }: { app: ServerInstance }) {documentId: z.string(),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { config } = getConfig({ context });@@ -312,7 +312,7 @@ function setupSearchDocumentsRoute({ app }: { app: ServerInstance }) {}),),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId } = context.req.valid('param');diff --git a/apps/papra-server/src/modules/organizations/organizations.routes.ts b/apps/papra-server/src/modules/organizations/organizations.routes.tsindex 8d176c8f..e6ceeed5 100644--- a/apps/papra-server/src/modules/organizations/organizations.routes.ts+++ b/apps/papra-server/src/modules/organizations/organizations.routes.ts@@ -1,6 +1,6 @@import type { ServerInstance } from '../app/server.types';import { z } from 'zod';-import { getAuthUserId } from '../app/auth/auth.models';+import { getUser } from '../app/auth/auth.models';import { getDb } from '../app/database/database.models';import { validateJsonBody, validateParams } from '../shared/validation/validation';import { organizationIdRegex } from './organizations.constants';@@ -18,7 +18,7 @@ export async function registerOrganizationsPrivateRoutes({ app }: { app: ServerIfunction setupGetOrganizationsRoute({ app }: { app: ServerInstance }) {app.get('/api/organizations', async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const organizationsRepository = createOrganizationsRepository({ db });@@ -38,7 +38,7 @@ function setupCreateOrganizationRoute({ app }: { app: ServerInstance }) {name: z.string().min(3).max(50),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { name } = context.req.valid('json');@@ -60,7 +60,7 @@ function setupGetOrganizationRoute({ app }: { app: ServerInstance }) {organizationId: z.string().regex(organizationIdRegex),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId } = context.req.valid('param');@@ -91,7 +91,7 @@ function setupUpdateOrganizationRoute({ app }: { app: ServerInstance }) {organizationId: z.string().regex(organizationIdRegex),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { name } = context.req.valid('json');const { organizationId } = context.req.valid('param');@@ -116,7 +116,7 @@ function setupDeleteOrganizationRoute({ app }: { app: ServerInstance }) {organizationId: z.string().regex(organizationIdRegex),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const { organizationId } = context.req.valid('param');diff --git a/apps/papra-server/src/modules/roles/middlewares/roles.middleware.ts b/apps/papra-server/src/modules/roles/middlewares/roles.middleware.tsdeleted file mode 100644index a0faf819..00000000--- a/apps/papra-server/src/modules/roles/middlewares/roles.middleware.ts+++ /dev/null@@ -1,24 +0,0 @@-import type { ServerInstanceGenerics } from '../../app/server.types';-import type { Role } from '../roles.types';-import { createMiddleware } from 'hono/factory';-import { createForbiddenError } from '../../app/auth/auth.errors';-import { areSomeRolesInJwtPayload } from '../roles.models';--export function createRoleGuardMiddleware({ allowedRoles }: { allowedRoles: Role[] }) {- return createMiddleware<ServerInstanceGenerics>(async (context, next) => {- const jwtPayload = context.get('jwtPayload');-- const hasRole = areSomeRolesInJwtPayload({- roles: allowedRoles,- jwtPayload,- });-- if (!hasRole) {- throw createForbiddenError();- }-- await next();- });-}--export const adminGuardMiddleware = createRoleGuardMiddleware({ allowedRoles: ['admin'] });diff --git a/apps/papra-server/src/modules/users/users.repository.ts b/apps/papra-server/src/modules/users/users.repository.tsindex 559943dc..9ade1ec3 100644--- a/apps/papra-server/src/modules/users/users.repository.ts+++ b/apps/papra-server/src/modules/users/users.repository.ts@@ -67,8 +67,8 @@ async function getUserByIdOrThrow({ userId, db, errorFactory = createUsersNotFoureturn { user };}-async function updateUser({ userId, fullName, db }: { userId: string; fullName: string; db: Database }) {- const [user] = await db.update(usersTable).set({ fullName }).where(eq(usersTable.id, userId)).returning();+async function updateUser({ userId, name, db }: { userId: string; name: string; db: Database }) {+ const [user] = await db.update(usersTable).set({ name }).where(eq(usersTable.id, userId)).returning();return { user };}diff --git a/apps/papra-server/src/modules/users/users.routes.ts b/apps/papra-server/src/modules/users/users.routes.tsindex 09dc5729..6ed1cc14 100644--- a/apps/papra-server/src/modules/users/users.routes.ts+++ b/apps/papra-server/src/modules/users/users.routes.ts@@ -1,7 +1,7 @@import type { ServerInstance } from '../app/server.types';import { pick } from 'lodash-es';import { z } from 'zod';-import { getAuthUserId } from '../app/auth/auth.models';+import { getUser } from '../app/auth/auth.models';import { getDb } from '../app/database/database.models';import { createRolesRepository } from '../roles/roles.repository';import { validateJsonBody } from '../shared/validation/validation';@@ -14,7 +14,7 @@ export async function registerUsersPrivateRoutes({ app }: { app: ServerInstancefunction setupGetCurrentUserRoute({ app }: { app: ServerInstance }) {app.get('/api/users/me', async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });const usersRepository = createUsersRepository({ db });@@ -36,7 +36,7 @@ function setupGetCurrentUserRoute({ app }: { app: ServerInstance }) {['id','email',- 'fullName',+ 'name','createdAt','updatedAt','planId',@@ -51,17 +51,17 @@ function setupUpdateUserRoute({ app }: { app: ServerInstance }) {app.put('/api/users/me',validateJsonBody(z.object({- fullName: z.string().min(1).max(50),+ name: z.string().min(1).max(50),})),async (context) => {- const { userId } = getAuthUserId({ context });+ const { userId } = getUser({ context });const { db } = getDb({ context });- const { fullName } = context.req.valid('json');+ const { name } = context.req.valid('json');const usersRepository = createUsersRepository({ db });- const { user } = await usersRepository.updateUser({ userId, fullName });+ const { user } = await usersRepository.updateUser({ userId, name });return context.json({ user });},diff --git a/apps/papra-server/src/modules/users/users.table.ts b/apps/papra-server/src/modules/users/users.table.tsindex 724673a9..eb573a1a 100644--- a/apps/papra-server/src/modules/users/users.table.ts+++ b/apps/papra-server/src/modules/users/users.table.ts@@ -1,4 +1,4 @@-import { index, sqliteTable, text } from 'drizzle-orm/sqlite-core';+import { index, integer, sqliteTable, text } from 'drizzle-orm/sqlite-core';import { createPrimaryKeyField, createTimestampColumns } from '../shared/db/columns.helpers';export const usersTable = sqliteTable(@@ -8,7 +8,9 @@ export const usersTable = sqliteTable(...createTimestampColumns(),email: text('email').notNull().unique(),- fullName: text('full_name'),+ emailVerified: integer('email_verified', { mode: 'boolean' }).notNull().default(false),+ name: text('name'),+ image: text('image'),},table => [index('users_email_index').on(table.email),diff --git a/apps/papra-server/src/modules/users/users.usecases.ts b/apps/papra-server/src/modules/users/users.usecases.tsindex dfb1b7b6..43fd5338 100644--- a/apps/papra-server/src/modules/users/users.usecases.ts+++ b/apps/papra-server/src/modules/users/users.usecases.ts@@ -1,23 +1,13 @@-import type { Config } from '../config/config.types';import type { UsersRepository } from './users.repository';import type { DbInsertableUser } from './users.types';-import { createUserAccountCreationDisabledError } from './users.errors';export async function createUser({user: userPartials,usersRepository,- config,}: {user: DbInsertableUser;usersRepository: UsersRepository;- config: Config;}) {- const { isRegistrationEnabled } = config.auth;-- if (!isRegistrationEnabled) {- throw createUserAccountCreationDisabledError();- }-const { user } = await usersRepository.createUser({ user: userPartials });return { user };diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 0818cd78..cad875ed 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -96,6 +96,9 @@ importers:'@unocss/reset':specifier: ^0.64.0version: 0.64.1+ better-auth:+ specifier: ^1.1.11+ version: 1.1.11class-variance-authority:specifier: ^0.7.0version: 0.7.1@@ -202,6 +205,9 @@ importers:'@paralleldrive/cuid2':specifier: ^2.2.2version: 2.2.2+ better-auth:+ specifier: ^1.1.11+ version: 1.1.11date-fns:specifier: ^4.1.0version: 4.1.0@@ -210,7 +216,7 @@ importers:version: 0.30.1drizzle-orm:specifier: ^0.38.3- version: 0.38.3(@libsql/[email protected])([email protected])figue:specifier: ^2.2.0version: 2.2.0([email protected])@@ -594,6 +600,12 @@ packages:resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}engines: {node: '>=6.9.0'}+ '@better-auth/[email protected]':+ resolution: {integrity: sha512-Ap1GaSmo6JYhJhxJOpUB0HobkKPTNzfta+bLV89HfpyCAHN7p8ntCrmNFHNAVD0F6v0mywFVEUg1FUhNCc81Rw==}++ '@better-fetch/[email protected]':+ resolution: {integrity: sha512-B3bfloI/2UBQWIATRN6qmlORrvx3Mp0kkNjmXLv0b+DtbtR+pP4/I5kQA/rDUv+OReLywCCldf6co4LdDmh8JA==}+'@clack/[email protected]':resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==}@@ -1438,6 +1450,9 @@ packages:'@floating-ui/[email protected]':resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}+ '@hexagon/[email protected]':+ resolution: {integrity: sha512-lhqDEAvWixy3bZ+UOYbPwUbBkwBq5C1LAJ/xPC8Oi+lL54oyakv/npbA0aU2hgCsx/1NUd4IBvV03+aUBWxerw==}+'@hono/[email protected]':resolution: {integrity: sha512-kTfUMsoloVKtRA2fLiGSd9qBddmru9KadNyhJCwgKBxTiNkaAJEwkVN9KV/rS4HtmmNRtUh6P+YpmjRMl0d9vQ==}engines: {node: '>=18.14.1'}@@ -1623,6 +1638,9 @@ packages:peerDependencies:solid-js: ^1.8.8+ '@levischuck/[email protected]':+ resolution: {integrity: sha512-f5CnPw997Y2GQ8FAvtuVVC19FX8mwNNC+1XJcIi16n/LTJifKO6QBgGLgN3YEmqtGMk17SKSuoWES3imJVxAVw==}+'@libsql/[email protected]':resolution: {integrity: sha512-/9HEKfn6fwXB5aTEEoMeFh4CtG0ZzbncBb1e++OCdVpgKZ/xyMsIVYXm0w7Pv4RUel803vE6LwniB3PqD72R0Q==}@@ -1749,6 +1767,9 @@ packages:'@neon-rs/[email protected]':resolution: {integrity: sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw==}+ '@noble/[email protected]':+ resolution: {integrity: sha512-mIbq/R9QXk5/cTfESb1OKtyFnk7oc1Om/8onA1158K9/OZUQFDEVy55jVTato+xmp3XX6F6Qh0zz0Nc1AxAlRQ==}+'@noble/[email protected]':resolution: {integrity: sha512-pq5D8h10hHBjyqX+cfBm0i8JUXJ0UhczFc4r74zbuT9XgewFo2E3J1cOaGtdZynILNmQ685YWGzGE1Zv6io50w==}engines: {node: ^14.21.3 || >=16}@@ -1807,6 +1828,21 @@ packages:peerDependencies:solid-js: '>=1.5.0'+ '@peculiar/[email protected]':+ resolution: {integrity: sha512-8U2TIj59cRlSXTX2d0mzUKP7whfWGFMzTeC3qPgAbccXFrPNZLaDhpNEdG5U2QZ/tBv/IHlCJ8s+KYXpJeop6w==}++ '@peculiar/[email protected]':+ resolution: {integrity: sha512-/HtR91dvgog7z/WhCVdxZJ/jitJuIu8iTqiyWVgRE9Ac5imt2sT/E4obqIVGKQw7PIy+X6i8lVBoT6wC73XUgA==}++ '@peculiar/[email protected]':+ resolution: {integrity: sha512-p6hsanvPhexRtYSOHihLvUUgrJ8y0FtOM97N5UEpC+VifFYyZa0iZ5cXjTkZoDwxJ/TTJ1IJo3HVTB2JJTpXvg==}++ '@peculiar/[email protected]':+ resolution: {integrity: sha512-QPeD8UA8axQREpgR5UTAfu2mqQmm97oUqahDtNdBcfj3qAnoXzFdQW+aNf/tD2WVXF8Fhmftxoj0eMIT++gX2w==}++ '@peculiar/[email protected]':+ resolution: {integrity: sha512-0dK5xqTqSLaxv1FHXIcd4Q/BZNuopg+u1l23hT9rOmQ1g4dNtw0g/RnEi+TboB0gOwGtrWn269v27cMgchFIIg==}+'@pkgr/[email protected]':resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}@@ -1944,6 +1980,13 @@ packages:'@shikijs/[email protected]':resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==}+ '@simplewebauthn/[email protected]':+ resolution: {integrity: sha512-WuHZ/PYvyPJ9nxSzgHtOEjogBhwJfC8xzYkPC+rR/+8chl/ft4ngjiK8kSU5HtRJfczupyOh33b25TjYbvwAcg==}++ '@simplewebauthn/[email protected]':+ resolution: {integrity: sha512-vGz9sgzoN0c0IySnpdG0TG0B71GM75basrlTpXHDAw8tQ/JUH5O73x6s3UXzDWHlv7d2E4Hy4aX5ugoHkW4udg==}+ engines: {node: '>=20.0.0'}+'@smithy/[email protected]':resolution: {integrity: sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==}engines: {node: '>=18.0.0'}@@ -2645,6 +2688,10 @@ packages:resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}engines: {node: '>=8'}+ resolution: {integrity: sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==}+ engines: {node: '>=12.0.0'}+resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}engines: {node: '>=12'}@@ -2726,6 +2773,12 @@ packages:resolution: {integrity: sha512-9IIS3UPrvIa1Ej+lVDdDwO7zLehjqsaByECw0bu2RRGP73jALm6FYbzI5gWbgHLvNdkvfXB5YrSbocZdOS0c0w==}+ resolution: {integrity: sha512-F6a+LquF4UnfG9q501KwtypJQG0YvCPuZ8TfOxeM/RHAFQORlAe+1mvmlINc5hID+mVJst1UZ+xrw2zRhZY0pA==}++ resolution: {integrity: sha512-N4lDVm0NGmFfDJ0XMQ4O83Zm/3dPlvIQdxvwvgSLSkjFX5PM4GUYSVAuxNzXN27QZMHDkrJTWUqxBrm4tPC3eA==}+resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}engines: {node: '>=8'}@@ -3906,6 +3959,9 @@ packages:resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}hasBin: true+ resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==}+resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==}@@ -3989,6 +4045,10 @@ packages:resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}+ resolution: {integrity: sha512-s7hZHcQeSNKpzCkHRm8yA+0JPLjncSWnjb+2TIElwS2JAqYr+Kv3Ess+9KFfJS0C1xcQ1i9NkNHpWwCYpHMWsA==}+ engines: {node: '>=14.0.0'}+resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}engines: {node: '>= 0.8.0'}@@ -4585,6 +4645,13 @@ packages:resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}engines: {node: '>=6'}+ resolution: {integrity: sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==}++ resolution: {integrity: sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==}+ engines: {node: '>=6.0.0'}+resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}@@ -4745,6 +4812,9 @@ packages:engines: {node: '>=18.0.0', npm: '>=8.0.0'}hasBin: true+ resolution: {integrity: sha512-OXMmJ3zRk2xeXFGfA3K+EOPHC5u7RDFG7lIOx0X1pdnhUkI8MdVrbV+sNsD80ElpUZ+MRHdyxPnFthq9VHs8uQ==}+resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==}@@ -6465,6 +6535,12 @@ snapshots:'@babel/helper-string-parser': 7.25.9'@babel/helper-validator-identifier': 7.25.9+ '@better-auth/[email protected]':+ dependencies:+ uncrypto: 0.1.3++ '@better-fetch/[email protected]': {}+'@clack/[email protected]':dependencies:picocolors: 1.1.1@@ -6986,6 +7062,8 @@ snapshots:'@floating-ui/[email protected]': {}+ '@hexagon/[email protected]': {}+'@hono/[email protected]([email protected])':dependencies:hono: 4.6.16@@ -7158,6 +7236,8 @@ snapshots:'@solid-primitives/utils': 6.2.3([email protected])solid-js: 1.9.4+ '@levischuck/[email protected]': {}+'@libsql/[email protected]':dependencies:'@libsql/core': 0.14.0@@ -7297,6 +7377,8 @@ snapshots:'@neon-rs/[email protected]': {}+ '@noble/[email protected]': {}+'@noble/[email protected]': {}'@nodelib/[email protected]':@@ -7372,6 +7454,39 @@ snapshots:- sugarss- terser+ '@peculiar/[email protected]':+ dependencies:+ '@peculiar/asn1-schema': 2.3.15+ asn1js: 3.0.5+ tslib: 2.8.1++ '@peculiar/[email protected]':+ dependencies:+ '@peculiar/asn1-schema': 2.3.15+ '@peculiar/asn1-x509': 2.3.15+ asn1js: 3.0.5+ tslib: 2.8.1++ '@peculiar/[email protected]':+ dependencies:+ '@peculiar/asn1-schema': 2.3.15+ '@peculiar/asn1-x509': 2.3.15+ asn1js: 3.0.5+ tslib: 2.8.1++ '@peculiar/[email protected]':+ dependencies:+ asn1js: 3.0.5+ pvtsutils: 1.3.6+ tslib: 2.8.1++ '@peculiar/[email protected]':+ dependencies:+ '@peculiar/asn1-schema': 2.3.15+ asn1js: 3.0.5+ pvtsutils: 1.3.6+ tslib: 2.8.1+'@pkgr/[email protected]': {}'@playwright/[email protected]':@@ -7480,6 +7595,18 @@ snapshots:'@shikijs/[email protected]': {}+ '@simplewebauthn/[email protected]': {}++ '@simplewebauthn/[email protected]':+ dependencies:+ '@hexagon/base64': 1.1.28+ '@levischuck/tiny-cbor': 0.2.2+ '@peculiar/asn1-android': 2.3.15+ '@peculiar/asn1-ecc': 2.3.15+ '@peculiar/asn1-rsa': 2.3.15+ '@peculiar/asn1-schema': 2.3.15+ '@peculiar/asn1-x509': 2.3.15+'@smithy/[email protected]':dependencies:'@smithy/types': 4.1.0@@ -8438,6 +8565,12 @@ snapshots:+ dependencies:+ pvtsutils: 1.3.6+ pvutils: 1.1.3+ tslib: 2.8.1+@@ -8628,6 +8761,28 @@ snapshots:is-alphanumerical: 2.0.1is-decimal: 2.0.1+ dependencies:+ '@better-auth/utils': 0.2.3+ '@better-fetch/fetch': 1.1.12+ '@noble/ciphers': 0.6.0+ '@noble/hashes': 1.6.1+ '@simplewebauthn/browser': 13.1.0+ '@simplewebauthn/server': 13.1.0+ better-call: 0.3.3+ defu: 6.1.4+ jose: 5.9.6+ kysely: 0.27.5+ uncrypto: 0.1.3+ zod: 3.24.1++ dependencies:+ '@better-fetch/fetch': 1.1.12+ rou3: 0.5.1+ uncrypto: 0.1.3+ zod: 3.24.1+@@ -8956,9 +9111,10 @@ snapshots:transitivePeerDependencies:- supports-coloroptionalDependencies:'@libsql/client': 0.14.0+ kysely: 0.27.5react: 18.3.1@@ -10023,6 +10179,8 @@ snapshots:+ [email protected]: {}+@@ -10128,6 +10286,8 @@ snapshots:+ [email protected]: {}+dependencies:prelude-ls: 1.2.1@@ -11017,6 +11177,12 @@ snapshots:+ dependencies:+ tslib: 2.8.1++ [email protected]: {}+@@ -11285,6 +11451,8 @@ snapshots:'@rollup/rollup-win32-x64-msvc': 4.29.1fsevents: 2.3.3+ [email protected]: {}+