authhero 0.131.0 → 0.133.0

package/dist/authhero.d.ts

@@ -23,7 +23,7 @@ export interface Totals {
 	length: number;
 }
 export declare const baseUserSchema: z.ZodObject<{
-	email: z.ZodOptional<z.ZodString>;
+	email: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
 	username: z.ZodOptional<z.ZodString>;
 	phone_number: z.ZodOptional<z.ZodString>;
 	given_name: z.ZodOptional<z.ZodString>;
@@ -70,7 +70,7 @@ export declare const baseUserSchema: z.ZodObject<{
 }>;
 export type BaseUser = z.infer<typeof baseUserSchema>;
 export declare const userInsertSchema: z.ZodObject<{
-	email: z.ZodOptional<z.ZodString>;
+	email: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
 	username: z.ZodOptional<z.ZodString>;
 	phone_number: z.ZodOptional<z.ZodString>;
 	given_name: z.ZodOptional<z.ZodString>;
@@ -142,7 +142,7 @@ export declare const userSchema: z.ZodObject<{
 	user_id: z.ZodString;
 	is_social: z.ZodBoolean;
 	email: z.ZodOptional<z.ZodString>;
-	login_count: z.ZodNumber;
+	login_count: z.ZodDefault<z.ZodNumber>;
 	identities: z.ZodOptional<z.ZodArray<z.ZodObject<{
 		connection: z.ZodString;
 		user_id: z.ZodString;
@@ -285,7 +285,6 @@ export declare const userSchema: z.ZodObject<{
 	updated_at: string;
 	user_id: string;
 	is_social: boolean;
-	login_count: number;
 	email?: string | undefined;
 	email_verified?: boolean | undefined;
 	name?: string | undefined;
@@ -305,6 +304,7 @@ export declare const userSchema: z.ZodObject<{
 	verify_email?: boolean | undefined;
 	last_ip?: string | undefined;
 	last_login?: string | undefined;
+	login_count?: number | undefined;
 	identities?: {
 		connection: string;
 		user_id: string;
@@ -330,7 +330,7 @@ export declare const auth0UserResponseSchema: z.ZodObject<{
 	user_id: z.ZodString;
 	is_social: z.ZodBoolean;
 	email: z.ZodOptional<z.ZodString>;
-	login_count: z.ZodNumber;
+	login_count: z.ZodDefault<z.ZodNumber>;
 	identities: z.ZodOptional<z.ZodArray<z.ZodObject<{
 		connection: z.ZodString;
 		user_id: z.ZodString;
@@ -473,7 +473,6 @@ export declare const auth0UserResponseSchema: z.ZodObject<{
 	updated_at: string;
 	user_id: string;
 	is_social: boolean;
-	login_count: number;
 	email?: string | undefined;
 	email_verified?: boolean | undefined;
 	name?: string | undefined;
@@ -493,6 +492,7 @@ export declare const auth0UserResponseSchema: z.ZodObject<{
 	verify_email?: boolean | undefined;
 	last_ip?: string | undefined;
 	last_login?: string | undefined;
+	login_count?: number | undefined;
 	identities?: {
 		connection: string;
 		user_id: string;
@@ -521,6 +521,7 @@ export interface PostUsersBody extends BaseUser {
 	email_verified?: boolean;
 }
 export declare const userResponseSchema: z.ZodObject<{
+	email: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
 	username: z.ZodOptional<z.ZodString>;
 	phone_number: z.ZodOptional<z.ZodString>;
 	given_name: z.ZodOptional<z.ZodString>;
@@ -534,13 +535,13 @@ export declare const userResponseSchema: z.ZodObject<{
 	app_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 	user_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 } & {
-	email: z.ZodString;
 	login_count: z.ZodNumber;
 	multifactor: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 	last_ip: z.ZodOptional<z.ZodString>;
 	last_login: z.ZodOptional<z.ZodString>;
 	user_id: z.ZodString;
 }, "strip", z.ZodAny, z.objectOutputType<{
+	email: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
 	username: z.ZodOptional<z.ZodString>;
 	phone_number: z.ZodOptional<z.ZodString>;
 	given_name: z.ZodOptional<z.ZodString>;
@@ -554,13 +555,13 @@ export declare const userResponseSchema: z.ZodObject<{
 	app_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 	user_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 } & {
-	email: z.ZodString;
 	login_count: z.ZodNumber;
 	multifactor: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 	last_ip: z.ZodOptional<z.ZodString>;
 	last_login: z.ZodOptional<z.ZodString>;
 	user_id: z.ZodString;
 }, z.ZodAny, "strip">, z.objectInputType<{
+	email: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
 	username: z.ZodOptional<z.ZodString>;
 	phone_number: z.ZodOptional<z.ZodString>;
 	given_name: z.ZodOptional<z.ZodString>;
@@ -574,7 +575,6 @@ export declare const userResponseSchema: z.ZodObject<{
 	app_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 	user_metadata: z.ZodOptional<z.ZodDefault<z.ZodAny>>;
 } & {
-	email: z.ZodString;
 	login_count: z.ZodNumber;
 	multifactor: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 	last_ip: z.ZodOptional<z.ZodString>;

package/dist/authhero.mjs

@@ -1447,7 +1447,7 @@ const Fn = c.object({
   refresh_token: c.string().optional(),
   profileData: Km.optional()
 }), bd = c.object({
-  email: c.string().optional(),
+  email: c.string().optional().transform((t) => t && t.toLowerCase()),
   username: c.string().optional(),
   phone_number: c.string().optional(),
   given_name: c.string().optional(),
@@ -1475,12 +1475,10 @@ const Fn = c.object({
   ...o0.shape,
   user_id: c.string(),
   is_social: c.boolean(),
-  // TODO: this not might be correct if you use the username
   email: c.string().optional(),
-  login_count: c.number(),
+  login_count: c.number().default(0),
   identities: c.array(Gm).optional()
 }), Rt = a0, mT = bd.extend({
-  email: c.string(),
   login_count: c.number(),
   multifactor: c.array(c.string()).optional(),
   last_ip: c.string().optional(),
@@ -5642,18 +5640,24 @@ async function oo(t, e) {
   };
 }
 async function N0(t, e) {
-  return e.loginSession || (e.loginSession = await t.env.data.loginSessions.create(
-    e.client.tenant.id,
-    {
-      expires_at: new Date(
-        Date.now() + nr * 1e3
-      ).toISOString(),
-      authParams: e.authParams,
-      authorization_url: t.req.url,
-      csrf_token: Se(),
-      ...jt(t.req)
-    }
-  )), {
+  if (!e.loginSession) {
+    const { ip: r, useragent: i, auth0Client: s } = jt(t.req);
+    e.loginSession = await t.env.data.loginSessions.create(
+      e.client.tenant.id,
+      {
+        expires_at: new Date(
+          Date.now() + nr * 1e3
+        ).toISOString(),
+        authParams: e.authParams,
+        authorization_url: t.req.url,
+        csrf_token: Se(),
+        ip: r,
+        useragent: i,
+        auth0Client: s
+      }
+    );
+  }
+  return {
     code: (await t.env.data.codes.create(e.client.tenant.id, {
       code_id: Se(),
       user_id: e.user.user_id,
@@ -6299,48 +6303,53 @@ const ku = Fn.extend({
   async (t) => {
     const { "tenant-id": e } = t.req.valid("header"), n = t.req.valid("json");
     t.set("body", n);
-    const { email: r } = n;
-    if (!r)
-      throw new C(400, { message: "Email is required" });
-    const i = r.toLowerCase(), s = `${n.provider}|${n.user_id || ro()}`;
+    const {
+      email: r,
+      phone_number: i,
+      name: s,
+      linked_to: o,
+      email_verified: a,
+      provider: d,
+      connection: l
+    } = n, u = `${n.provider}|${n.user_id || ro()}`;
     try {
-      const o = await t.env.data.users.create(e, {
-        email: i,
-        user_id: s,
-        name: n.name || i,
-        provider: n.provider,
-        connection: n.connection,
-        // we need to be careful with this as the profile service was setting this true in places where I don't think it's correct
-        // AND when does the account linking happen then? here? first login?
-        email_verified: n.email_verified || !1,
+      const f = await t.env.data.users.create(e, {
+        email: r,
+        user_id: u,
+        name: s || r || i,
+        phone_number: i,
+        provider: d,
+        connection: l,
+        linked_to: o ?? void 0,
+        email_verified: a || !1,
         last_ip: "",
         is_social: !1,
         last_login: (/* @__PURE__ */ new Date()).toISOString()
       });
-      t.set("user_id", o.user_id);
-      const a = be(t, {
+      t.set("user_id", f.user_id);
+      const m = be(t, {
         type: ye.SUCCESS_API_OPERATION,
         description: "User created"
       });
-      Nt(t, t.env.data.logs.create(e, a));
-      const d = {
-        ...o,
+      Nt(t, t.env.data.logs.create(e, m));
+      const w = {
+        ...f,
         identities: [
           {
-            connection: o.connection,
-            provider: o.provider,
-            user_id: gu(o.user_id),
-            isSocial: o.is_social
+            connection: f.connection,
+            provider: f.provider,
+            user_id: gu(f.user_id),
+            isSocial: f.is_social
           }
         ]
       };
-      return t.json(Rt.parse(d), {
+      return t.json(Rt.parse(w), {
         status: 201
       });
-    } catch (o) {
-      throw o.message === "User already exists" ? new C(409, {
+    } catch (f) {
+      throw f.message === "User already exists" ? new C(409, {
         message: "User already exists"
-      }) : o;
+      }) : f;
     }
   }
 ).openapi(
@@ -18507,14 +18516,19 @@ async function Sv(t, e, n, r) {
     e.tenant.id,
     r.state
   );
-  s || (s = await t.env.data.loginSessions.create(e.tenant.id, {
-    expires_at: new Date(
-      Date.now() + nr * 1e3
-    ).toISOString(),
-    authParams: r,
-    csrf_token: Se(),
-    ...jt(t.req)
-  }));
+  if (!s) {
+    const { ip: d, useragent: l, auth0Client: u } = jt(t.req);
+    s = await t.env.data.loginSessions.create(e.tenant.id, {
+      expires_at: new Date(
+        Date.now() + nr * 1e3
+      ).toISOString(),
+      authParams: r,
+      csrf_token: Se(),
+      ip: d,
+      useragent: l,
+      auth0Client: u
+    });
+  }
   const a = await Og(t, i.strategy).getRedirect(t, i);
   return await t.env.data.codes.create(e.tenant.id, {
     login_id: s.id,
@@ -21494,30 +21508,32 @@ const Gb = new ae().openapi(
         message: "Client not found"
       });
     t.set("client_id", a.id), t.set("tenant_id", a.tenant.id);
-    const d = o === "email" ? e.email : e.phone_number, l = await n.data.loginSessions.create(
+    const d = o === "email" ? e.email : e.phone_number, { ip: l, useragent: u, auth0Client: f } = jt(t.req), m = await n.data.loginSessions.create(
       a.tenant.id,
       {
         authParams: { ...s, client_id: r, username: d },
         expires_at: new Date(Date.now() + Da).toISOString(),
         csrf_token: Se(),
-        ...jt(t.req)
+        ip: l,
+        useragent: u,
+        auth0Client: f
       }
-    ), u = await n.data.codes.create(a.tenant.id, {
+    ), w = await n.data.codes.create(a.tenant.id, {
       code_id: Mn(),
       code_type: "otp",
-      login_id: l.id,
+      login_id: m.id,
       expires_at: new Date(Date.now() + Da).toISOString()
     });
     return i === "link" ? await Tl(t, {
       to: d,
-      code: u.code_id,
+      code: w.code_id,
       authParams: {
         ...s,
         client_id: r
       }
     }) : await Kg(t, {
       to: d,
-      code: u.code_id
+      code: w.code_id
     }), t.html("OK");
   }
 ).openapi(
@@ -21687,7 +21703,7 @@ async function Wb(t, e, n, r) {
       i,
       "password_reset"
     );
-  const o = await t.env.data.loginSessions.create(
+  const { ip: o, useragent: a, auth0Client: d } = jt(t.req), l = await t.env.data.loginSessions.create(
     e.tenant.id,
     {
       expires_at: new Date(
@@ -21698,17 +21714,19 @@ async function Wb(t, e, n, r) {
         username: n
       },
       csrf_token: Se(),
-      ...jt(t.req)
+      ip: o,
+      useragent: a,
+      auth0Client: d
     }
-  ), a = await t.env.data.codes.create(e.tenant.id, {
+  ), u = await t.env.data.codes.create(e.tenant.id, {
     code_id: i,
     code_type: "password_reset",
-    login_id: o.id,
+    login_id: l.id,
     expires_at: new Date(
       Date.now() + V1
     ).toISOString()
   });
-  await Hg(t, n, a.code_id, r);
+  await Hg(t, n, u.code_id, r);
 }
 const Jb = new ae().openapi(
   M({
@@ -21760,7 +21778,7 @@ const Jb = new ae().openapi(
         message: "Client not found"
       });
     t.set("client_id", n), t.set("tenant_id", i.tenant.id);
-    const s = r.toLocaleLowerCase();
+    const s = r.toLocaleLowerCase(), o = jt(t.req);
     if ("otp" in e)
       return Il(
         t,
@@ -21771,7 +21789,7 @@ const Jb = new ae().openapi(
         !0
       );
     if ("password" in e) {
-      const o = await t.env.data.loginSessions.create(
+      const a = await t.env.data.loginSessions.create(
         i.tenant.id,
         {
           expires_at: new Date(
@@ -21782,7 +21800,9 @@ const Jb = new ae().openapi(
             username: s
           },
           csrf_token: Se(),
-          ...jt(t.req)
+          ip: o.ip,
+          useragent: o.useragent,
+          auth0Client: o.auth0Client
         }
       );
       return Rl(
@@ -21793,7 +21813,7 @@ const Jb = new ae().openapi(
           password: e.password,
           client_id: n
         },
-        o,
+        a,
         !0
       );
     } else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.131.0",
+  "version": "0.133.0",
   "files": [
     "dist"
   ],
@@ -36,7 +36,7 @@
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
     "vitest": "^2.1.5",
-    "@authhero/kysely-adapter": "^10.9.0"
+    "@authhero/kysely-adapter": "^10.10.0"
   },
   "dependencies": {
     "@peculiar/x509": "^1.12.3",
@@ -49,7 +49,7 @@
     "libphonenumber-js": "^1.12.8",
     "nanoid": "^5.0.8",
     "oslo": "^1.2.1",
-    "@authhero/adapter-interfaces": "^0.59.0"
+    "@authhero/adapter-interfaces": "^0.60.0"
   },
   "peerDependencies": {
     "@hono/zod-openapi": "^0.19.2",