@mesob/auth-hono 0.4.0 → 0.4.1

package/dist/index.js

@@ -1056,17 +1056,17 @@ var checkAccountHandler = async (c) => {
     email: usersInIam.email,
     phone: usersInIam.phone,
     verified: isEmail ? usersInIam.emailVerified : usersInIam.phoneVerified,
-    hasPassword: sql4`exists(
-        select 1
-        from ${accountsInIam}
-        where ${accountsInIam.tenantId} = ${resolvedTenantId}
-          and ${accountsInIam.userId} = ${usersInIam.id}
-          and ${accountsInIam.provider} = 'credentials'
-          and ${accountsInIam.password} is not null
-      )`
-  }).from(usersInIam).where(whereClause).limit(1);
+    password: accountsInIam.password
+  }).from(usersInIam).leftJoin(
+    accountsInIam,
+    and5(
+      eq5(accountsInIam.tenantId, resolvedTenantId),
+      eq5(accountsInIam.userId, usersInIam.id),
+      eq5(accountsInIam.provider, "credentials")
+    )
+  ).where(whereClause).limit(1);
   const verified = result?.verified ?? false;
-  const hasPassword = result?.hasPassword ?? false;
+  const hasPassword = Boolean(result?.password);
   return c.json(
     {
       exists: !!result,
@@ -1416,15 +1416,15 @@ var fetchUserForLogin = async ({
     lastSignInAt: usersInIam.lastSignInAt,
     bannedUntil: usersInIam.bannedUntil,
     loginAttempt: usersInIam.loginAttempt,
-    hasPassword: sql6`exists(
-        select 1
-        from ${accountsInIam}
-        where ${accountsInIam.tenantId} = ${tenantId}
-          and ${accountsInIam.userId} = ${usersInIam.id}
-          and ${accountsInIam.provider} = 'credentials'
-          and ${accountsInIam.password} is not null
-      )`
-  }).from(usersInIam).where(whereClause).limit(1);
+    hasPassword: sql6`coalesce(${accountsInIam.password} is not null, false)`
+  }).from(usersInIam).leftJoin(
+    accountsInIam,
+    and7(
+      eq7(accountsInIam.tenantId, tenantId),
+      eq7(accountsInIam.userId, usersInIam.id),
+      eq7(accountsInIam.provider, "credentials")
+    )
+  ).where(whereClause).limit(1);
   return row || null;
 };
 var fetchUserByIdWithRoles = async ({
@@ -1706,7 +1706,7 @@ var signInHandler = (
         eq9(accountsInIam.provider, "credentials")
       )
     ).limit(1);
-    if (!(user.hasPassword && account?.password)) {
+    if (!account?.password) {
       logger2.log("[sign-in] 401: no credentials account", { userId: user.id });
       return c.json({ error: AUTH_ERRORS.HAS_NO_PASSWORD }, 401);
     }