@sqrzro/auth 4.0.0-alpha.7 → 4.0.0-alpha.8

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
 
-> @sqrzro/auth@4.0.0-alpha.5 build /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
+> @sqrzro/auth@4.0.0-alpha.8 build /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
 > tsc
 

package/.turbo/turbo-dev.log

@@ -1,12 +1,12 @@
 
-> @sqrzro/auth@4.0.0-alpha.5 dev /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
+> @sqrzro/auth@4.0.0-alpha.8 dev /Users/richard/Sites/@sqrzro/sqrzro/packages/auth
 > tsc --watch
 
-[2:01:09 PM] Starting compilation in watch mode...
+[2:49:05 PM] Starting compilation in watch mode...
 
-[2:01:11 PM] Found 0 errors. Watching for file changes.
+[2:49:08 PM] Found 0 errors. Watching for file changes.
 
-[2:01:13 PM] File change detected. Starting incremental compilation...
+[2:49:11 PM] File change detected. Starting incremental compilation...
 
 src/components/LogoutButton/server.ts:3:31 - error TS7016: Could not find a declaration file for module '@sqrzro/server/auth'. '/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index.js' implicitly has an 'any' type.
   Try `npm i --save-dev @types/sqrzro__server` if it exists or add a new declaration (.d.ts) file containing `declare module '@sqrzro/server/auth';`
@@ -62,32 +62,62 @@
 4 import { FormResponse, submitForm } from '@sqrzro/server/forms';
                                            ~~~~~~~~~~~~~~~~~~~~~~
 
-src/handle-proxy.ts:1:33 - error TS7016: Could not find a declaration file for module '@sqrzro/server/auth'. '/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index.js' implicitly has an 'any' type.
+src/get-auth-proxy.ts:1:34 - error TS7016: Could not find a declaration file for module '@sqrzro/server/auth'. '/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/auth/index.js' implicitly has an 'any' type.
   Try `npm i --save-dev @types/sqrzro__server` if it exists or add a new declaration (.d.ts) file containing `declare module '@sqrzro/server/auth';`
 
-1 import { validateSession } from '@sqrzro/server/auth';
-                                  ~~~~~~~~~~~~~~~~~~~~~
+1 import type { AuthSession } from '@sqrzro/server/auth';
+                                   ~~~~~~~~~~~~~~~~~~~~~
 
-[2:01:13 PM] Found 10 errors. Watching for file changes.
+src/get-auth-proxy.ts:2:36 - error TS7016: Could not find a declaration file for module '@sqrzro/server/proxy'. '/Users/richard/Sites/@sqrzro/sqrzro/packages/server/dist/proxy/index.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/sqrzro__server` if it exists or add a new declaration (.d.ts) file containing `declare module '@sqrzro/server/proxy';`
 
-[2:01:16 PM] File change detected. Starting incremental compilation...
+2 import type { ProxyRedirect } from '@sqrzro/server/proxy';
+                                     ~~~~~~~~~~~~~~~~~~~~~~
 
-[2:01:16 PM] Found 0 errors. Watching for file changes.
+[2:49:11 PM] Found 11 errors. Watching for file changes.
 
-[2:13:49 PM] File change detected. Starting incremental compilation...
+[2:49:15 PM] File change detected. Starting incremental compilation...
 
-[2:13:50 PM] Found 0 errors. Watching for file changes.
+[2:49:15 PM] Found 0 errors. Watching for file changes.
 
-[2:13:50 PM] File change detected. Starting incremental compilation...
+[2:49:47 PM] File change detected. Starting incremental compilation...
 
-[2:13:50 PM] Found 0 errors. Watching for file changes.
+[2:49:47 PM] Found 0 errors. Watching for file changes.
 
-[2:21:47 PM] File change detected. Starting incremental compilation...
+[2:49:52 PM] File change detected. Starting incremental compilation...
 
-[2:21:47 PM] Found 0 errors. Watching for file changes.
+[2:49:52 PM] Found 0 errors. Watching for file changes.
 
-[2:21:49 PM] File change detected. Starting incremental compilation...
+[2:50:44 PM] File change detected. Starting incremental compilation...
 
-[2:21:49 PM] Found 0 errors. Watching for file changes.
+[2:50:44 PM] Found 0 errors. Watching for file changes.
+
+[2:50:48 PM] File change detected. Starting incremental compilation...
+
+[2:50:48 PM] Found 0 errors. Watching for file changes.
+
+[2:59:21 PM] File change detected. Starting incremental compilation...
+
+[2:59:21 PM] Found 0 errors. Watching for file changes.
+
+[2:59:25 PM] File change detected. Starting incremental compilation...
+
+[2:59:25 PM] Found 0 errors. Watching for file changes.
+
+[2:59:51 PM] File change detected. Starting incremental compilation...
+
+[2:59:51 PM] Found 0 errors. Watching for file changes.
+
+[3:00:13 PM] File change detected. Starting incremental compilation...
+
+[3:00:13 PM] Found 0 errors. Watching for file changes.
+
+[3:00:21 PM] File change detected. Starting incremental compilation...
+
+[3:00:21 PM] Found 0 errors. Watching for file changes.
+
+[3:04:21 PM] File change detected. Starting incremental compilation...
+
+[3:04:21 PM] Found 0 errors. Watching for file changes.
 
  ELIFECYCLE  Command failed.

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

@@ -1,7 +1,7 @@
 import type { NextPageProps } from '@sqrzro/ui/utility';
 import type { AuthClassNameProps } from '../../interfaces';
-interface AuthPageProps extends AuthClassNameProps, NextPageProps {
+export interface AuthProps extends AuthClassNameProps, NextPageProps {
     logo?: React.ReactElement;
 }
-declare function Auth({ classNames, logo, ...props }: AuthPageProps): React.ReactElement;
+declare function Auth({ classNames, logo, ...props }: AuthProps): React.ReactElement;
 export default Auth;

package/dist/forms/PasswordResetForm/server.js

@@ -10,7 +10,7 @@ const schema = z
 })
     .required({ password: true, token: true });
 async function fn(data) {
-    await updatePasswordWithToken(data.token, data.password);
+    await updatePasswordWithToken('PASSWORD', data.token, data.password);
     return redirect('/auth/login');
 }
 async function submit(formData) {

package/dist/get-auth-proxy.d.ts

@@ -0,0 +1,6 @@
+import type { AuthSession } from '@sqrzro/server/auth';
+import type { ProxyRedirect } from '@sqrzro/server/proxy';
+import type { NextRequest } from 'next/server';
+import type { AuthConfigObject } from './interfaces';
+declare function getAuthProxy(config?: AuthConfigObject): (session: AuthSession | null, request: NextRequest) => Promise<ProxyRedirect | null>;
+export default getAuthProxy;

package/dist/get-auth-proxy.js

@@ -0,0 +1,17 @@
+async function handleAuthProxy(session, request, config) {
+    const pathname = request.nextUrl.pathname;
+    if (session) {
+        if (pathname.startsWith('/auth')) {
+            return { redirect: '/' };
+        }
+        return null;
+    }
+    if (pathname.startsWith('/auth') || config?.allow?.includes(pathname)) {
+        return null;
+    }
+    return { redirect: '/auth/login' };
+}
+function getAuthProxy(config) {
+    return (session, request) => handleAuthProxy(session, request, config);
+}
+export default getAuthProxy;

package/dist/handle-auth-proxy.d.ts

@@ -0,0 +1,5 @@
+import type { AuthSession } from '@sqrzro/server/auth';
+import type { ProxyRedirect } from '@sqrzro/server/proxy';
+import type { NextRequest } from 'next/server';
+declare function handleAuthProxy(session: AuthSession | null, request: NextRequest): Promise<ProxyRedirect | null>;
+export default handleAuthProxy;

package/dist/handle-auth-proxy.js

@@ -0,0 +1,14 @@
+async function handleAuthProxy(session, request) {
+    const pathname = request.nextUrl.pathname;
+    if (session) {
+        if (pathname.startsWith('/auth')) {
+            return { redirect: '/' };
+        }
+        return null;
+    }
+    if (pathname.startsWith('/auth')) {
+        return null;
+    }
+    return { redirect: '/auth/login' };
+}
+export default handleAuthProxy;

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+export type { AuthClassNames, AuthConfigObject } from './interfaces';
+export type { AuthProps } from './components/Auth';
 export { default as Auth } from './components/Auth';
 export { default as LogoutButton } from './components/LogoutButton';
-export { default as handleProxy } from './handle-proxy';
+export { default as getAuthProxy } from './get-auth-proxy';

package/dist/index.js

@@ -1,3 +1,3 @@
 export { default as Auth } from './components/Auth';
 export { default as LogoutButton } from './components/LogoutButton';
-export { default as handleProxy } from './handle-proxy';
+export { default as getAuthProxy } from './get-auth-proxy';

package/dist/interfaces.d.ts

@@ -1,3 +1,6 @@
+export interface AuthConfigObject {
+    allow?: string[];
+}
 export interface AuthClassNames {
     actions: string;
     footer: string;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@sqrzro/auth",
   "type": "module",
-  "version": "4.0.0-alpha.7",
+  "version": "4.0.0-alpha.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
     "zod": "^4.3.6",
-    "@sqrzro/server": "^4.0.0-alpha.16",
+    "@sqrzro/server": "^4.0.0-alpha.18",
     "@sqrzro/ui": "^4.0.0-alpha.13"
   },
   "devDependencies": {

package/src/components/Auth/index.tsx

@@ -8,7 +8,7 @@ import type { AuthClassNameProps } from '../../interfaces';
 
 import Password from '../Password';
 
-interface AuthPageProps extends AuthClassNameProps, NextPageProps {
+export interface AuthProps extends AuthClassNameProps, NextPageProps {
     logo?: React.ReactElement;
 }
 
@@ -16,7 +16,7 @@ async function AuthComponent({
     classNames,
     params,
     searchParams,
-}: AuthPageProps): Promise<React.ReactElement> {
+}: AuthProps): Promise<React.ReactElement> {
     const awaitedParams = await params;
 
     if (!awaitedParams || !Array.isArray(awaitedParams.auth) || awaitedParams.auth.length !== 1) {
@@ -38,7 +38,7 @@ async function AuthComponent({
     return notFound();
 }
 
-function Auth({ classNames, logo, ...props }: AuthPageProps): React.ReactElement {
+function Auth({ classNames, logo, ...props }: AuthProps): React.ReactElement {
     return (
         <div className={classNames?.root}>
             <div className={classNames?.logo}>{logo}</div>

package/src/forms/PasswordResetForm/server.ts

@@ -15,7 +15,7 @@ const schema = z
     .required({ password: true, token: true });
 
 async function fn(data: PasswordResetFormFields): Promise<void> {
-    await updatePasswordWithToken(data.token, data.password);
+    await updatePasswordWithToken('PASSWORD', data.token, data.password);
     return redirect('/auth/login');
 }
 

package/src/get-auth-proxy.ts

@@ -0,0 +1,34 @@
+import type { AuthSession } from '@sqrzro/server/auth';
+import type { ProxyRedirect } from '@sqrzro/server/proxy';
+import type { NextRequest } from 'next/server';
+
+import type { AuthConfigObject } from './interfaces';
+
+async function handleAuthProxy(
+    session: AuthSession | null,
+    request: NextRequest,
+    config?: AuthConfigObject
+): Promise<ProxyRedirect | null> {
+    const pathname = request.nextUrl.pathname;
+
+    if (session) {
+        if (pathname.startsWith('/auth')) {
+            return { redirect: '/' };
+        }
+        return null;
+    }
+
+    if (pathname.startsWith('/auth') || config?.allow?.includes(pathname)) {
+        return null;
+    }
+
+    return { redirect: '/auth/login' };
+}
+
+function getAuthProxy(
+    config?: AuthConfigObject
+): (session: AuthSession | null, request: NextRequest) => Promise<ProxyRedirect | null> {
+    return (session, request) => handleAuthProxy(session, request, config);
+}
+
+export default getAuthProxy;

package/src/index.ts

@@ -1,4 +1,8 @@
+export type { AuthClassNames, AuthConfigObject } from './interfaces';
+
+export type { AuthProps } from './components/Auth';
 export { default as Auth } from './components/Auth';
+
 export { default as LogoutButton } from './components/LogoutButton';
 
-export { default as handleProxy } from './handle-proxy';
+export { default as getAuthProxy } from './get-auth-proxy';

package/src/interfaces.ts

@@ -1,3 +1,7 @@
+export interface AuthConfigObject {
+    allow?: string[];
+}
+
 export interface AuthClassNames {
     actions: string;
     footer: string;

package/src/handle-proxy.ts

@@ -1,23 +0,0 @@
-import { validateSession } from '@sqrzro/server/auth';
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
-
-async function handleProxy(request: NextRequest): Promise<NextResponse> {
-    const pathname = request.nextUrl.pathname;
-    const validated = await validateSession(request.cookies);
-
-    if (validated) {
-        if (pathname.startsWith('/auth')) {
-            return NextResponse.redirect(new URL('/', request.url));
-        }
-        return NextResponse.next();
-    }
-
-    if (pathname.startsWith('/auth')) {
-        return NextResponse.next();
-    }
-
-    return NextResponse.redirect(new URL('/auth/login', request.url));
-}
-
-export default handleProxy;