@effectify/react-router-better-auth 0.3.2 → 0.4.1

package/dist/src/lib/auth-guard.d.ts

@@ -1,5 +1,18 @@
 import { AuthService } from '@effectify/node-better-auth';
-import { ActionArgsContext, HttpResponseFailure, LoaderArgsContext } from '@effectify/react-router';
+import { ActionArgsContext, HttpResponse, LoaderArgsContext } from '@effectify/react-router';
 import * as Effect from 'effect/Effect';
-export declare const withAuthGuardMiddleware: <A, E, L>(effect: Effect.Effect<A, E, LoaderArgsContext | AuthService.AuthContext | L>) => Effect.Effect<A | HttpResponseFailure<AuthService.Unauthorized>, E | AuthService.Unauthorized, LoaderArgsContext | AuthService.AuthServiceContext | L>;
-export declare const withAuthGuardMiddlewareFromAction: <A, E>(effect: Effect.Effect<A, E, ActionArgsContext | AuthService.AuthContext>) => Effect.Effect<A | HttpResponseFailure<AuthService.Unauthorized>, E | AuthService.Unauthorized, ActionArgsContext | AuthService.AuthServiceContext>;
+export interface AuthGuardOptions {
+    redirectOnFail?: string;
+    redirectInit?: ResponseInit;
+}
+type WithBetterAuthGuard = {
+    <A, E, L>(eff: Effect.Effect<A, E, LoaderArgsContext | AuthService.AuthContext | L>): Effect.Effect<A, E | AuthService.Unauthorized, LoaderArgsContext | AuthService.AuthServiceContext | L>;
+    with: (options: AuthGuardOptions) => <A, E, L>(eff: Effect.Effect<HttpResponse<A> | Response, E, LoaderArgsContext | AuthService.AuthContext | L>) => Effect.Effect<HttpResponse<A> | Response, E, LoaderArgsContext | AuthService.AuthServiceContext | L>;
+};
+export declare const withBetterAuthGuard: WithBetterAuthGuard;
+type WithBetterAuthGuardAction = {
+    <A, E>(eff: Effect.Effect<A, E, ActionArgsContext | AuthService.AuthContext>): Effect.Effect<A, E | AuthService.Unauthorized, ActionArgsContext | AuthService.AuthServiceContext>;
+    with: (options: AuthGuardOptions) => <A, E>(eff: Effect.Effect<HttpResponse<A> | Response, E, ActionArgsContext | AuthService.AuthContext>) => Effect.Effect<HttpResponse<A> | Response, E, ActionArgsContext | AuthService.AuthServiceContext>;
+};
+export declare const withBetterAuthGuardAction: WithBetterAuthGuardAction;
+export {};

package/dist/src/lib/auth-guard.js

@@ -1,6 +1,7 @@
 import { AuthService } from '@effectify/node-better-auth';
-import { ActionArgsContext, HttpResponseFailure, httpFailure, LoaderArgsContext } from '@effectify/react-router';
+import { ActionArgsContext, LoaderArgsContext } from '@effectify/react-router';
 import * as Effect from 'effect/Effect';
+import { redirect } from 'react-router';
 const mapHeaders = (args) => args.request.headers;
 const verifySessionWithContext = (context) => Effect.gen(function* () {
     const args = yield* context;
@@ -14,7 +15,7 @@ const verifySessionWithContext = (context) => Effect.gen(function* () {
         },
     });
     if (!session) {
-        return yield* httpFailure(new AuthService.Unauthorized({ details: 'Missing or invalid authentication' }));
+        return yield* Effect.fail(new AuthService.Unauthorized({ details: 'Missing or invalid authentication' }));
     }
     return yield* Effect.succeed({ user: session.user, session: session.session });
 });
@@ -30,23 +31,25 @@ const verifySessionWithActionContext = (context) => Effect.gen(function* () {
         },
     });
     if (!session) {
-        return yield* httpFailure(new AuthService.Unauthorized({ details: 'Missing or invalid authentication' }));
+        return yield* Effect.fail(new AuthService.Unauthorized({ details: 'Missing or invalid authentication' }));
     }
     return yield* Effect.succeed({ user: session.user, session: session.session });
 });
 const verifySession = () => verifySessionWithContext(LoaderArgsContext);
 const verifySessionFromAction = () => verifySessionWithActionContext(ActionArgsContext);
-export const withAuthGuardMiddleware = (effect) => Effect.gen(function* () {
+export const withBetterAuthGuard = Object.assign(((eff) => Effect.gen(function* () {
     const authResult = yield* verifySession();
-    if (authResult instanceof HttpResponseFailure) {
-        return authResult;
-    }
-    return yield* Effect.provideService(effect, AuthService.AuthContext, authResult);
+    return yield* Effect.provideService(eff, AuthService.AuthContext, authResult);
+})), {
+    with: (opts) => (eff) => Effect.gen(function* () {
+        return yield* verifySession().pipe(Effect.flatMap((authResult) => Effect.provideService(eff, AuthService.AuthContext, authResult)), Effect.catchTag('Unauthorized', () => Effect.sync(() => redirect(opts.redirectOnFail, opts.redirectInit))));
+    }),
 });
-export const withAuthGuardMiddlewareFromAction = (effect) => Effect.gen(function* () {
+export const withBetterAuthGuardAction = Object.assign(((eff) => Effect.gen(function* () {
     const authResult = yield* verifySessionFromAction();
-    if (authResult instanceof HttpResponseFailure) {
-        return authResult;
-    }
-    return yield* Effect.provideService(effect, AuthService.AuthContext, authResult);
+    return yield* Effect.provideService(eff, AuthService.AuthContext, authResult);
+})), {
+    with: (opts) => (eff) => Effect.gen(function* () {
+        return yield* verifySessionFromAction().pipe(Effect.flatMap((authResult) => Effect.provideService(eff, AuthService.AuthContext, authResult)), Effect.catchTag('Unauthorized', () => Effect.sync(() => redirect(opts.redirectOnFail, opts.redirectInit))));
+    }),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectify/react-router-better-auth",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "Integration of React Router + better-auth with Effect for React applications",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -23,8 +23,8 @@
   ],
   "peerDependencies": {
     "effect": "3.19.13",
-    "@effectify/react-router": "0.4.2",
-    "@effectify/node-better-auth": "0.4.1"
+    "@effectify/node-better-auth": "0.4.9",
+    "@effectify/react-router": "0.4.9"
   },
   "devDependencies": {},
   "dependencies": {},