@adonisjs/auth 10.0.0-next.1 → 10.0.0-next.2

package/build/src/mixins/lucid.d.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@adonisjs/core/hash';
+import type { Hash, HashManager } from '@adonisjs/core/hash';
 import { type BaseModel } from '@adonisjs/lucid/orm';
 import type { NormalizeConstructor } from '@adonisjs/core/types/helpers';
 type UserWithUserFinderRow = {
@@ -34,8 +34,8 @@ type UserWithUserFinderClass<Model extends NormalizeConstructor<typeof BaseModel
  *   // User model implementation
  * }
  */
-export declare function withAuthFinder(hash: () => Hash, options: {
-    uids: string[];
-    passwordColumnName: string;
+export declare function withAuthFinder(hash: (() => Hash) | HashManager<any>, options?: {
+    uids?: string[];
+    passwordColumnName?: string;
 }): <Model extends NormalizeConstructor<typeof BaseModel>>(superclass: Model) => UserWithUserFinderClass<Model>;
 export {};

package/build/src/mixins/lucid.js

@@ -9,13 +9,15 @@ import {
 import { RuntimeException } from "@adonisjs/core/exceptions";
 import { beforeSave } from "@adonisjs/lucid/orm";
 function withAuthFinder(hash, options) {
+  let normalizedOptions = { uids: ["email"], passwordColumnName: "password", ...options };
+  let hashFactory = typeof hash === "function" ? hash : () => hash.use();
   return function(superclass) {
     class UserWithUserFinder extends superclass {
       static async hashPassword(user) {
-        if (user.$dirty[options.passwordColumnName]) {
+        if (user.$dirty[normalizedOptions.passwordColumnName]) {
           ;
-          user[options.passwordColumnName] = await hash().make(
-            user[options.passwordColumnName]
+          user[normalizedOptions.passwordColumnName] = await hashFactory().make(
+            user[normalizedOptions.passwordColumnName]
           );
         }
       }
@@ -52,9 +54,9 @@ function withAuthFinder(hash, options) {
         if (!uid || !password) {
           throw new E_INVALID_CREDENTIALS("Invalid user credentials");
         }
-        const user = await this.findForAuth(options.uids, uid);
+        const user = await this.findForAuth(normalizedOptions.uids, uid);
         if (!user) {
-          await hash().make(password);
+          await hashFactory().make(password);
           throw new E_INVALID_CREDENTIALS("Invalid user credentials");
         }
         if (await user.verifyPassword(password)) {
@@ -77,13 +79,13 @@ function withAuthFinder(hash, options) {
        * }
        */
       verifyPassword(plainPassword) {
-        const passwordHash = this[options.passwordColumnName];
+        const passwordHash = this[normalizedOptions.passwordColumnName];
         if (!passwordHash) {
           throw new RuntimeException(
-            `Cannot verify password. The value for "${options.passwordColumnName}" column is undefined or null`
+            `Cannot verify password. The value for "${normalizedOptions.passwordColumnName}" column is undefined or null`
           );
         }
-        return hash().verify(passwordHash, plainPassword);
+        return hashFactory().verify(passwordHash, plainPassword);
       }
     }
     __decorateClass([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/auth",
   "description": "Official authentication provider for Adonis framework",
-  "version": "10.0.0-next.1",
+  "version": "10.0.0-next.2",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -51,8 +51,8 @@
     "quick:test": "cross-env NODE_DEBUG=\"adonisjs:auth:*\" node --enable-source-maps --import=@poppinss/ts-exec ./bin/test.js"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.9",
-    "@adonisjs/core": "^7.0.0-next.7",
+    "@adonisjs/assembler": "^8.0.0-next.14",
+    "@adonisjs/core": "^7.0.0-next.8",
     "@adonisjs/eslint-config": "^3.0.0-next.1",
     "@adonisjs/i18n": "^3.0.0-next.1",
     "@adonisjs/lucid": "^22.0.0-next.1",
@@ -71,7 +71,7 @@
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/basic-auth": "^1.1.8",
     "@types/luxon": "^3.7.1",
-    "@types/node": "^24.8.1",
+    "@types/node": "^24.9.1",
     "@types/set-cookie-parser": "^2.4.10",
     "@types/sinon": "^17.0.4",
     "c8": "^10.1.3",
@@ -82,7 +82,7 @@
     "dotenv": "^17.2.3",
     "eslint": "^9.38.0",
     "luxon": "^3.7.2",
-    "mysql2": "^3.15.2",
+    "mysql2": "^3.15.3",
     "nock": "^14.0.10",
     "pg": "^8.16.3",
     "playwright": "^1.56.1",