@kanjijs/auth 0.2.0-beta.56 → 0.2.0-beta.57

package/dist/index.js

@@ -8223,7 +8223,7 @@ async function Auth(request, config) {
   }
 }
 
-// ../../node_modules/.bun/hono@4.11.5/node_modules/hono/dist/helper/adapter/index.js
+// ../../node_modules/.bun/hono@4.11.9/node_modules/hono/dist/helper/adapter/index.js
 var env = (c3, runtime) => {
   const global2 = globalThis;
   const globalEnv = global2?.process?.env;
@@ -8273,7 +8273,7 @@ var checkUserAgentEquals = (platform) => {
   return userAgent.startsWith(platform);
 };
 
-// ../../node_modules/.bun/hono@4.11.5/node_modules/hono/dist/http-exception.js
+// ../../node_modules/.bun/hono@4.11.9/node_modules/hono/dist/http-exception.js
 var HTTPException = class extends Error {
   res;
   status;
@@ -8296,38 +8296,39 @@ var HTTPException = class extends Error {
   }
 };
 
-// ../../node_modules/.bun/@hono+auth-js@1.1.0+5a12553608188762/node_modules/@hono/auth-js/dist/index.js
-function setEnvDefaults2(env2, config) {
-  config.secret ??= env2.AUTH_SECRET;
-  setEnvDefaults(env2, config);
+// ../../node_modules/.bun/@hono+auth-js@1.1.1+34a86d3b96f06bef/node_modules/@hono/auth-js/dist/index.js
+function setEnvDefaults2(env$1, config) {
+  config.secret ??= env$1.AUTH_SECRET;
+  setEnvDefaults(env$1, config);
 }
 function reqWithEnvUrl(req, authUrl) {
   if (authUrl) {
     const reqUrlObj = new URL(req.url);
     const authUrlObj = new URL(authUrl);
-    const props = ["hostname", "protocol", "port", "password", "username"];
-    for (const prop of props) {
-      if (authUrlObj[prop]) {
+    for (const prop of [
+      "hostname",
+      "protocol",
+      "port",
+      "password",
+      "username"
+    ])
+      if (authUrlObj[prop])
         reqUrlObj[prop] = authUrlObj[prop];
-      }
-    }
     return new Request(reqUrlObj.href, req);
   }
   const url = new URL(req.url);
   const newReq = new Request(url.href, req);
   const proto = newReq.headers.get("x-forwarded-proto");
   const host = newReq.headers.get("x-forwarded-host") ?? newReq.headers.get("host");
-  if (proto != null) {
+  if (proto != null)
     url.protocol = proto.endsWith(":") ? proto : `${proto}:`;
-  }
   if (host != null) {
     url.host = host;
     const portMatch = host.match(/:(\d+)$/);
-    if (portMatch) {
+    if (portMatch)
       url.port = portMatch[1];
-    } else {
+    else
       url.port = "";
-    }
     newReq.headers.delete("x-forwarded-host");
     newReq.headers.delete("Host");
     newReq.headers.set("Host", host);
@@ -8340,35 +8341,28 @@ async function getAuthUser(c3) {
   setEnvDefaults2(ctxEnv, config);
   const authReq = reqWithEnvUrl(c3.req.raw, ctxEnv.AUTH_URL);
   const origin = new URL(authReq.url).origin;
-  const request = new Request(`${origin}${config.basePath}/session`, {
-    headers: { cookie: c3.req.header("cookie") ?? "" }
-  });
+  const request = new Request(`${origin}${config.basePath}/session`, { headers: { cookie: c3.req.header("cookie") ?? "" } });
   let authUser = {};
-  const response = await Auth(request, {
+  return (await (await Auth(request, {
     ...config,
     callbacks: {
       ...config.callbacks,
       async session(...args) {
         authUser = args[0];
-        const session22 = await config.callbacks?.session?.(...args) ?? args[0].session;
-        const user = args[0].user ?? args[0].token;
-        return { user, ...session22 };
+        const session2 = await config.callbacks?.session?.(...args) ?? args[0].session;
+        return {
+          user: args[0].user ?? args[0].token,
+          ...session2
+        };
       }
     }
-  });
-  const session2 = await response.json();
-  return session2?.user ? authUser : null;
+  })).json())?.user ? authUser : null;
 }
 function verifyAuth() {
   return async (c3, next) => {
     const authUser = await getAuthUser(c3);
-    const isAuth = !!authUser?.token || !!authUser?.user;
-    if (!isAuth) {
-      const res = new Response("Unauthorized", {
-        status: 401
-      });
-      throw new HTTPException(401, { res });
-    }
+    if (!(!!authUser?.token || !!authUser?.user))
+      throw new HTTPException(401, { res: new Response("Unauthorized", { status: 401 }) });
     c3.set("authUser", authUser);
     await next();
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/auth",
-  "version": "0.2.0-beta.56",
+  "version": "0.2.0-beta.57",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -18,7 +18,7 @@
     "hono": "^4.0.0"
   },
   "peerDependencies": {
-    "@kanjijs/core": "^0.2.0-beta.56"
+    "@kanjijs/core": "^0.2.0-beta.57"
   },
   "devDependencies": {
     "typescript": "^5.0.0",