authhero 0.96.0 → 0.98.0

package/dist/authhero.d.ts

@@ -2302,7 +2302,7 @@ export declare const loginSessionInsertSchema: z.ZodObject<{
 	deleted_at: z.ZodOptional<z.ZodString>;
 	ip: z.ZodOptional<z.ZodString>;
 	useragent: z.ZodOptional<z.ZodString>;
-	session: z.ZodOptional<z.ZodString>;
+	session_id: z.ZodOptional<z.ZodString>;
 	authorization_url: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
 	expires_at: string;
@@ -2329,7 +2329,7 @@ export declare const loginSessionInsertSchema: z.ZodObject<{
 	deleted_at?: string | undefined;
 	ip?: string | undefined;
 	useragent?: string | undefined;
-	session?: string | undefined;
+	session_id?: string | undefined;
 	authorization_url?: string | undefined;
 }, {
 	expires_at: string;
@@ -2356,7 +2356,7 @@ export declare const loginSessionInsertSchema: z.ZodObject<{
 	deleted_at?: string | undefined;
 	ip?: string | undefined;
 	useragent?: string | undefined;
-	session?: string | undefined;
+	session_id?: string | undefined;
 	authorization_url?: string | undefined;
 }>;
 export type LoginSessionInsert = z.infer<typeof loginSessionInsertSchema>;
@@ -2422,7 +2422,7 @@ export declare const loginSessionSchema: z.ZodObject<{
 	deleted_at: z.ZodOptional<z.ZodString>;
 	ip: z.ZodOptional<z.ZodString>;
 	useragent: z.ZodOptional<z.ZodString>;
-	session: z.ZodOptional<z.ZodString>;
+	session_id: z.ZodOptional<z.ZodString>;
 	authorization_url: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
 	created_at: string;
@@ -2452,7 +2452,7 @@ export declare const loginSessionSchema: z.ZodObject<{
 	deleted_at?: string | undefined;
 	ip?: string | undefined;
 	useragent?: string | undefined;
-	session?: string | undefined;
+	session_id?: string | undefined;
 	authorization_url?: string | undefined;
 }, {
 	created_at: string;
@@ -2482,7 +2482,7 @@ export declare const loginSessionSchema: z.ZodObject<{
 	deleted_at?: string | undefined;
 	ip?: string | undefined;
 	useragent?: string | undefined;
-	session?: string | undefined;
+	session_id?: string | undefined;
 	authorization_url?: string | undefined;
 }>;
 export type LoginSession = z.infer<typeof loginSessionSchema>;
@@ -4382,6 +4382,7 @@ export declare const refreshTokenInsertSchema: z.ZodObject<{
 	user_id: string;
 	id: string;
 	client_id: string;
+	session_id: string;
 	device: {
 		last_ip: string;
 		initial_user_agent: string;
@@ -4390,7 +4391,6 @@ export declare const refreshTokenInsertSchema: z.ZodObject<{
 		last_user_agent: string;
 		last_asn: string;
 	};
-	session_id: string;
 	resource_servers: {
 		audience: string;
 		scopes: string;
@@ -4403,6 +4403,7 @@ export declare const refreshTokenInsertSchema: z.ZodObject<{
 	user_id: string;
 	id: string;
 	client_id: string;
+	session_id: string;
 	device: {
 		last_ip: string;
 		initial_user_agent: string;
@@ -4411,7 +4412,6 @@ export declare const refreshTokenInsertSchema: z.ZodObject<{
 		last_user_agent: string;
 		last_asn: string;
 	};
-	session_id: string;
 	resource_servers: {
 		audience: string;
 		scopes: string;
@@ -4469,6 +4469,7 @@ export declare const refreshTokenSchema: z.ZodObject<{
 	user_id: string;
 	id: string;
 	client_id: string;
+	session_id: string;
 	device: {
 		last_ip: string;
 		initial_user_agent: string;
@@ -4477,7 +4478,6 @@ export declare const refreshTokenSchema: z.ZodObject<{
 		last_user_agent: string;
 		last_asn: string;
 	};
-	session_id: string;
 	resource_servers: {
 		audience: string;
 		scopes: string;
@@ -4491,6 +4491,7 @@ export declare const refreshTokenSchema: z.ZodObject<{
 	user_id: string;
 	id: string;
 	client_id: string;
+	session_id: string;
 	device: {
 		last_ip: string;
 		initial_user_agent: string;
@@ -4499,7 +4500,6 @@ export declare const refreshTokenSchema: z.ZodObject<{
 		last_user_agent: string;
 		last_asn: string;
 	};
-	session_id: string;
 	resource_servers: {
 		audience: string;
 		scopes: string;
@@ -4847,6 +4847,7 @@ export declare function init(config: AuthHeroConfig): {
 					user_id: string;
 					id: string;
 					client_id: string;
+					session_id: string;
 					device: {
 						last_ip: string;
 						initial_user_agent: string;
@@ -4855,7 +4856,6 @@ export declare function init(config: AuthHeroConfig): {
 						last_user_agent: string;
 						last_asn: string;
 					};
-					session_id: string;
 					resource_servers: {
 						audience: string;
 						scopes: string;

package/dist/authhero.mjs

@@ -1719,7 +1719,7 @@ const Pm = a.enum([
   deleted_at: a.string().optional(),
   ip: a.string().optional(),
   useragent: a.string().optional(),
-  session: a.string().optional(),
+  session_id: a.string().optional(),
   authorization_url: a.string().optional()
 }).openapi({
   description: "This represents a login sesion"
@@ -5642,10 +5642,10 @@ async function Y0(t, e) {
     }
   );
 }
-async function Ef(t, e) {
-  const { user: n, client: r, scope: i, audience: s } = e, o = await t.env.data.sessions.create(r.tenant.id, {
+async function Ef(t, { user: e, client: n, loginSession: r }) {
+  const i = await t.env.data.sessions.create(n.tenant.id, {
     id: Ae(),
-    user_id: n.user_id,
+    user_id: e.user_id,
     idle_expires_at: new Date(
       Date.now() + Fs * 1e3
     ).toISOString(),
@@ -5658,14 +5658,19 @@ async function Ef(t, e) {
       initial_asn: "",
       last_asn: ""
     },
-    clients: [r.id]
-  }), c = i != null && i.split(" ").includes("offline_access") ? await Y0(t, {
-    ...e,
-    session_id: o.id,
-    scope: i,
-    audience: s
+    clients: [n.id]
+  });
+  await t.env.data.loginSessions.update(n.tenant.id, r.id, {
+    session_id: i.id
+  });
+  const { scope: s, audience: o } = r.authParams, c = s != null && s.split(" ").includes("offline_access") ? await Y0(t, {
+    session_id: i.id,
+    user: e,
+    client: n,
+    scope: s,
+    audience: o
   }) : void 0;
-  return { ...o, refresh_token: c };
+  return { ...i, refresh_token: c };
 }
 async function sn(t, e) {
   var v;
@@ -5702,6 +5707,10 @@ async function sn(t, e) {
   }
   let c = e.refreshToken, l = e.sessionId, u = r;
   if (!l) {
+    if (!e.loginSession)
+      throw new N(500, {
+        message: "Login session not found"
+      });
     u = await ty(t, t.env.data)(
       i.tenant.id,
       r
@@ -5709,8 +5718,7 @@ async function sn(t, e) {
     const f = await Ef(t, {
       user: r,
       client: i,
-      scope: n.scope,
-      audience: n.audience
+      loginSession: e.loginSession
     });
     l = f.id, c = (v = f.refresh_token) == null ? void 0 : v.id;
   }
@@ -19865,7 +19873,10 @@ async function Cb(t, e, n, r, i) {
   const o = await s.data.codes.get(e, n, "ticket");
   if (!o || o.used_at)
     throw new N(403, { message: "Ticket not found" });
-  const c = await s.data.loginSessions.get(e, o.login_id);
+  const c = await s.data.loginSessions.get(
+    e,
+    o.login_id
+  );
   if (!c || !c.authParams.username)
     throw new N(403, { message: "Session not found" });
   const l = await s.data.clients.get(c.authParams.client_id);
@@ -19885,8 +19896,7 @@ async function Cb(t, e, n, r, i) {
   const h = await Ef(t, {
     user: p,
     client: l,
-    scope: r.scope,
-    audience: r.audience
+    loginSession: c
   });
   return sn(t, {
     authParams: {
@@ -20626,40 +20636,43 @@ async function cu(t, e, n) {
     return console.error(i), qp;
   }
 }
-async function Ce(t, e) {
-  var l;
-  const { env: n } = t, r = await n.data.loginSessions.get(
+async function Ce(t, e, n = !1) {
+  var u;
+  const { env: r } = t, i = await r.data.loginSessions.get(
     t.var.tenant_id || "",
     e
   );
-  if (!r)
-    throw new N(400, { message: "Login session not found" });
-  t.set("loginSession", r);
-  const i = await Mo(
-    n,
-    r.authParams.client_id
+  if (i)
+    i.session_id;
+  else throw new N(400, { message: "Login session not found" });
+  t.set("loginSession", i);
+  const s = await Mo(
+    r,
+    i.authParams.client_id
   );
-  t.set("client_id", i.id), t.set("tenant_id", i.tenant.id);
-  const s = await n.data.tenants.get(i.tenant.id);
-  if (!s)
-    throw new N(400, { message: "Tenant not found" });
-  const o = await cu(
-    n,
-    i.id,
-    r.authParams.vendor_id
-  ), c = (l = r.authParams.ui_locales) == null ? void 0 : l.split(" ").map((u) => u.split("-")[0]).find((u) => {
+  t.set("client_id", s.id), t.set("tenant_id", s.tenant.id);
+  const o = await r.data.tenants.get(s.tenant.id);
+  if (o) {
+    if (i.session_id && !n)
+      throw new N(400, { message: "Login session closed" });
+  } else throw new N(400, { message: "Tenant not found" });
+  const c = await cu(
+    r,
+    s.id,
+    i.authParams.vendor_id
+  ), l = (u = i.authParams.ui_locales) == null ? void 0 : u.split(" ").map((p) => p.split("-")[0]).find((p) => {
     if (Array.isArray(R.options.supportedLngs))
-      return R.options.supportedLngs.includes(u);
+      return R.options.supportedLngs.includes(p);
   });
-  return await R.changeLanguage(c || s.language || "sv"), {
+  return await R.changeLanguage(l || o.language || "sv"), {
     vendorSettings: {
-      ...o,
+      ...c,
       // HACK: Change the terms and conditions for fokus app
-      termsAndConditionsUrl: i.id === "fokus-app" ? "https://www.fokus.se/kopvillkor-app/" : o.termsAndConditionsUrl
+      termsAndConditionsUrl: s.id === "fokus-app" ? "https://www.fokus.se/kopvillkor-app/" : c.termsAndConditionsUrl
     },
-    client: i,
-    tenant: s,
-    loginSession: r
+    client: s,
+    tenant: o,
+    loginSession: i
   };
 }
 async function Xb(t, e, n, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.96.0",
+  "version": "0.98.0",
   "files": [
     "dist"
   ],
@@ -25,7 +25,7 @@
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
     "vitest": "^2.1.5",
-    "@authhero/kysely-adapter": "^9.9.0"
+    "@authhero/kysely-adapter": "^10.0.0"
   },
   "dependencies": {
     "@peculiar/x509": "^1.12.3",
@@ -37,7 +37,7 @@
     "i18next": "^24.2.0",
     "nanoid": "^5.0.8",
     "oslo": "^1.2.1",
-    "@authhero/adapter-interfaces": "^0.51.0"
+    "@authhero/adapter-interfaces": "^0.52.0"
   },
   "peerDependencies": {
     "@hono/zod-openapi": "^0.18.0",