@effectify/react-router-better-auth 0.5.11 → 1.0.0-alpha.0

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

@@ -2,38 +2,82 @@ import { AuthService } from "@effectify/node-better-auth";
 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 mapHeaders = (args) => {
+    const headers = new Headers(args.request.headers);
+    if (!headers.has("origin")) {
+        headers.set("origin", "http://localhost:3000");
+    }
+    return headers;
+};
+// Default auth server URL - can be overridden with BETTER_AUTH_URL env var
+const getAuthServerOrigin = () => process.env.BETTER_AUTH_URL?.replace(/\/api\/auth\/?$/, "") ||
+    "http://localhost:3001";
 const verifySessionWithContext = (context) => Effect.gen(function* () {
     const args = yield* context;
-    const { auth } = yield* AuthService.AuthServiceContext;
     const forwardedHeaders = mapHeaders(args);
-    const session = yield* Effect.tryPromise({
-        try: () => auth.api.getSession({ headers: forwardedHeaders }),
-        catch: (cause) => {
-            const errorMessage = cause instanceof Error ? cause.message : String(cause);
-            return new AuthService.Unauthorized({ details: errorMessage });
-        },
+    const cookieValue = forwardedHeaders.get("cookie") || "";
+    const authOrigin = getAuthServerOrigin();
+    // Make direct fetch call to auth server
+    const response = yield* Effect.tryPromise({
+        try: () => fetch(`${authOrigin}/api/auth/get-session`, {
+            headers: {
+                cookie: cookieValue,
+                "Content-Type": "application/json",
+                origin: "http://localhost:3000",
+            },
+        }),
+        catch: (cause) => new AuthService.Unauthorized({
+            details: `Auth server unreachable: ${String(cause)}`,
+        }),
+    });
+    const fetchResult = yield* Effect.tryPromise({
+        try: () => response.json(),
+        catch: (cause) => new AuthService.Unauthorized({
+            details: `Failed to parse session: ${String(cause)}`,
+        }),
     });
-    if (!session) {
-        return yield* Effect.fail(new AuthService.Unauthorized({ details: "Missing or invalid authentication" }));
+    if (fetchResult?.session) {
+        return {
+            user: fetchResult.user,
+            session: fetchResult.session,
+        };
     }
-    return yield* Effect.succeed({ user: session.user, session: session.session });
+    throw new AuthService.Unauthorized({
+        details: "Missing or invalid authentication",
+    });
 });
 const verifySessionWithActionContext = (context) => Effect.gen(function* () {
     const args = yield* context;
-    const { auth } = yield* AuthService.AuthServiceContext;
     const forwardedHeaders = mapHeaders(args);
-    const session = yield* Effect.tryPromise({
-        try: () => auth.api.getSession({ headers: forwardedHeaders }),
-        catch: (cause) => {
-            const errorMessage = cause instanceof Error ? cause.message : String(cause);
-            return new AuthService.Unauthorized({ details: errorMessage });
-        },
+    const cookieValue = forwardedHeaders.get("cookie") || "";
+    const authOrigin = getAuthServerOrigin();
+    const response = yield* Effect.tryPromise({
+        try: () => fetch(`${authOrigin}/api/auth/get-session`, {
+            headers: {
+                cookie: cookieValue,
+                "Content-Type": "application/json",
+                origin: "http://localhost:3000",
+            },
+        }),
+        catch: (cause) => new AuthService.Unauthorized({
+            details: `Auth server unreachable: ${String(cause)}`,
+        }),
     });
-    if (!session) {
-        return yield* Effect.fail(new AuthService.Unauthorized({ details: "Missing or invalid authentication" }));
+    const fetchResult = yield* Effect.tryPromise({
+        try: () => response.json(),
+        catch: (cause) => new AuthService.Unauthorized({
+            details: `Failed to parse session: ${String(cause)}`,
+        }),
+    });
+    if (fetchResult?.session) {
+        return {
+            user: fetchResult.user,
+            session: fetchResult.session,
+        };
     }
-    return yield* Effect.succeed({ user: session.user, session: session.session });
+    throw new AuthService.Unauthorized({
+        details: "Missing or invalid authentication",
+    });
 });
 const verifySession = () => verifySessionWithContext(LoaderArgsContext);
 const verifySessionFromAction = () => verifySessionWithActionContext(ActionArgsContext);
@@ -41,15 +85,11 @@ export const withBetterAuthGuard = Object.assign((eff) => Effect.gen(function* (
     const authResult = yield* verifySession();
     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))));
-    }),
+    with: (opts) => (eff) => verifySession().pipe(Effect.flatMap((authResult) => Effect.provideService(eff, AuthService.AuthContext, authResult)), Effect.catchTag("Unauthorized", () => Effect.sync(() => redirect(opts.redirectOnFail, opts.redirectInit)))),
 });
 export const withBetterAuthGuardAction = Object.assign((eff) => Effect.gen(function* () {
     const authResult = yield* verifySessionFromAction();
     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))));
-    }),
+    with: (opts) => (eff) => verifySessionFromAction().pipe(Effect.flatMap((authResult) => Effect.provideService(eff, AuthService.AuthContext, authResult)), Effect.catchTag("Unauthorized", () => Effect.sync(() => redirect(opts.redirectOnFail, opts.redirectInit)))),
 });

package/dist/src/lib/handlers.d.ts

@@ -2,4 +2,4 @@ import { AuthService } from "@effectify/node-better-auth";
 import { ActionArgsContext, LoaderArgsContext } from "@effectify/react-router";
 import * as Effect from "effect/Effect";
 export declare const betterAuthLoader: Effect.Effect<Response, never, AuthService.AuthServiceContext | LoaderArgsContext>;
-export declare const betterAuthAction: Effect.Effect<Response, never, AuthService.AuthServiceContext | ActionArgsContext>;
+export declare const betterAuthAction: Effect.Effect<Response, never, ActionArgsContext | AuthService.AuthServiceContext>;

package/dist/src/lib/handlers.js

@@ -1,10 +1,18 @@
 import { AuthService } from "@effectify/node-better-auth";
 import { ActionArgsContext, LoaderArgsContext } from "@effectify/react-router";
 import * as Effect from "effect/Effect";
-const getRequest = (context) => Effect.map(context, (args) => args.request);
-const getRequestFromAction = (context) => Effect.map(context, (args) => args.request);
-const withAuthHandler = (requestEffect) => Effect.all([requestEffect, AuthService.AuthServiceContext]).pipe(Effect.andThen(([request, auth]) => Effect.gen(function* () {
+import { pipe } from "effect/Function";
+const withAuthHandler = (request) => Effect.gen(function* () {
+    const auth = yield* AuthService.AuthServiceContext;
     return yield* Effect.promise(() => auth.auth.handler(request));
-})));
-export const betterAuthLoader = LoaderArgsContext.pipe(getRequest, withAuthHandler);
-export const betterAuthAction = ActionArgsContext.pipe(getRequestFromAction, withAuthHandler);
+});
+const getLoaderRequest = Effect.gen(function* () {
+    const ctx = yield* LoaderArgsContext;
+    return ctx.request;
+});
+const getActionRequest = Effect.gen(function* () {
+    const ctx = yield* ActionArgsContext;
+    return ctx.request;
+});
+export const betterAuthLoader = pipe(getLoaderRequest, Effect.flatMap(withAuthHandler));
+export const betterAuthAction = pipe(getActionRequest, Effect.flatMap(withAuthHandler));

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@effectify/react-router-better-auth",
-  "version": "0.5.11",
+  "version": "1.0.0-alpha.0",
   "description": "Integration of React Router + better-auth with Effect for React applications",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/devx-op/effectify",
+    "directory": "packages/react/router-better-auth"
+  },
   "type": "module",
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
@@ -22,9 +27,9 @@
     "!**/*.tsbuildinfo"
   ],
   "peerDependencies": {
-    "effect": "3.19.16",
-    "@effectify/react-router": "0.5.10",
-    "@effectify/node-better-auth": "0.5.11"
+    "effect": "4.0.0-beta.33",
+    "@effectify/react-router": "1.0.0-alpha.0",
+    "@effectify/node-better-auth": "1.0.0-alpha.0"
   },
   "devDependencies": {},
   "dependencies": {},