@adonisjs/auth 9.3.1 → 9.3.2

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

@@ -1,6 +1,15 @@
 import type { Hash } from '@adonisjs/core/hash';
 import { type BaseModel } from '@adonisjs/lucid/orm';
 import type { NormalizeConstructor } from '@adonisjs/core/types/helpers';
+type UserWithUserFinderRow = {
+    verifyPassword(plainPassword: string): Promise<boolean>;
+};
+type UserWithUserFinderClass<Model extends NormalizeConstructor<typeof BaseModel> = NormalizeConstructor<typeof BaseModel>> = Model & {
+    hashPassword<T extends UserWithUserFinderClass>(this: T, user: InstanceType<T>): Promise<void>;
+    findForAuth<T extends UserWithUserFinderClass>(this: T, uids: string[], value: string): Promise<InstanceType<T> | null>;
+    verifyCredentials<T extends UserWithUserFinderClass>(this: T, uid: string, password: string): Promise<InstanceType<T>>;
+    new (...args: any[]): UserWithUserFinderRow;
+};
 /**
  * Mixing to add user lookup and password verification methods
  * on a model.
@@ -15,158 +24,5 @@ import type { NormalizeConstructor } from '@adonisjs/core/types/helpers';
 export declare function withAuthFinder(hash: () => Hash, options: {
     uids: string[];
     passwordColumnName: string;
-}): <Model extends NormalizeConstructor<typeof BaseModel>>(superclass: Model) => {
-    new (...args: any[]): {
-        /**
-         * Verifies the plain password against the user's password
-         * hash
-         */
-        verifyPassword(plainPassword: string): Promise<boolean>;
-        $attributes: import("@adonisjs/lucid/types/model").ModelObject;
-        $extras: import("@adonisjs/lucid/types/model").ModelObject;
-        $original: import("@adonisjs/lucid/types/model").ModelObject;
-        $preloaded: {
-            [relation: string]: import("@adonisjs/lucid/types/model").LucidRow | import("@adonisjs/lucid/types/model").LucidRow[];
-        };
-        $columns: undefined;
-        $sideloaded: import("@adonisjs/lucid/types/model").ModelObject;
-        $primaryKeyValue?: number | string;
-        $isPersisted: boolean;
-        $isNew: boolean;
-        $isLocal: boolean;
-        $dirty: import("@adonisjs/lucid/types/model").ModelObject;
-        $isDirty: boolean;
-        $isDeleted: boolean;
-        $options?: import("@adonisjs/lucid/types/model").ModelOptions;
-        $trx?: import("@adonisjs/lucid/types/database").TransactionClientContract;
-        $setOptionsAndTrx(options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): void;
-        useTransaction(trx: import("@adonisjs/lucid/types/database").TransactionClientContract): /*elided*/ any;
-        useConnection(connection: string): /*elided*/ any;
-        $getQueryFor(action: "insert", client: import("@adonisjs/lucid/types/database").QueryClientContract): ReturnType<import("@adonisjs/lucid/types/database").QueryClientContract["insertQuery"]>;
-        $getQueryFor(action: "update" | "delete" | "refresh", client: import("@adonisjs/lucid/types/database").QueryClientContract): import("@adonisjs/lucid/types/model").ModelQueryBuilderContract<import("@adonisjs/lucid/types/model").LucidModel>;
-        $setAttribute(key: string, value: any): void;
-        $getAttribute(key: string): any;
-        $getAttributeFromCache(key: string, callback: import("@adonisjs/lucid/types/model").CacheNode["getter"]): any;
-        $hasRelated(key: string): boolean;
-        $setRelated(key: string, result: import("@adonisjs/lucid/types/querybuilder").OneOrMany<import("@adonisjs/lucid/types/model").LucidRow> | null): void;
-        $pushRelated(key: string, result: import("@adonisjs/lucid/types/querybuilder").OneOrMany<import("@adonisjs/lucid/types/model").LucidRow> | null): void;
-        $getRelated(key: string, defaultValue?: any): import("@adonisjs/lucid/types/querybuilder").OneOrMany<import("@adonisjs/lucid/types/model").LucidRow> | undefined | null;
-        $consumeAdapterResult(adapterResult: import("@adonisjs/lucid/types/model").ModelObject, sideloadAttributes?: import("@adonisjs/lucid/types/model").ModelObject): void;
-        $hydrateOriginals(): void;
-        fill(value: Partial<{}>, allowExtraProperties?: boolean): /*elided*/ any;
-        merge(value: Partial<{}>, allowExtraProperties?: boolean): /*elided*/ any;
-        isDirty(fields?: undefined[] | undefined): boolean;
-        enableForceUpdate(): /*elided*/ any;
-        save(): Promise</*elided*/ any>;
-        lockForUpdate<T>(callback: (user: /*elided*/ any) => T | Promise<T>): Promise<T>;
-        delete(): Promise<void>;
-        refresh(): Promise</*elided*/ any>;
-        load: import("@adonisjs/lucid/types/model").LucidRowPreload</*elided*/ any>;
-        loadOnce: import("@adonisjs/lucid/types/model").LucidRowPreloadOnce</*elided*/ any>;
-        preload: import("@adonisjs/lucid/types/model").LucidRowPreload</*elided*/ any>;
-        loadAggregate: <Self extends /*elided*/ any, Name extends import("@adonisjs/lucid/types/relations").ExtractModelRelations<Self>, RelatedBuilder = Self[Name] extends import("@adonisjs/lucid/types/relations").ModelRelations<import("@adonisjs/lucid/types/model").LucidModel, import("@adonisjs/lucid/types/model").LucidModel> ? Self[Name]["subQuery"] : never>(name: Name, callback: (builder: RelatedBuilder) => void) => import("@adonisjs/lucid/types/model").LazyLoadAggregatesContract<Self>;
-        loadCount: <Self extends /*elided*/ any, Name_1 extends import("@adonisjs/lucid/types/relations").ExtractModelRelations<Self>, RelatedBuilder_1 = Self[Name_1] extends import("@adonisjs/lucid/types/relations").ModelRelations<import("@adonisjs/lucid/types/model").LucidModel, import("@adonisjs/lucid/types/model").LucidModel> ? Self[Name_1]["subQuery"] : never>(name: Name_1, callback?: ((builder: RelatedBuilder_1) => void) | undefined) => import("@adonisjs/lucid/types/model").LazyLoadAggregatesContract<Self>;
-        serializeAttributes(fields?: import("@adonisjs/lucid/types/model").CherryPickFields, raw?: boolean): import("@adonisjs/lucid/types/model").ModelObject;
-        serializeComputed(fields?: import("@adonisjs/lucid/types/model").CherryPickFields): import("@adonisjs/lucid/types/model").ModelObject;
-        serializeRelations(fields: undefined, raw: true): {
-            [key: string]: import("@adonisjs/lucid/types/model").LucidRow | import("@adonisjs/lucid/types/model").LucidRow[];
-        };
-        serializeRelations(cherryPick: import("@adonisjs/lucid/types/model").CherryPick["relations"] | undefined, raw: false | undefined): import("@adonisjs/lucid/types/model").ModelObject;
-        serializeRelations(cherryPick?: import("@adonisjs/lucid/types/model").CherryPick["relations"], raw?: boolean): import("@adonisjs/lucid/types/model").ModelObject;
-        serialize(cherryPick?: import("@adonisjs/lucid/types/model").CherryPick): import("@adonisjs/lucid/types/model").ModelObject;
-        toObject(): import("@adonisjs/lucid/types/model").ModelObject;
-        toJSON(): import("@adonisjs/lucid/types/model").ModelObject;
-        related<Name_2 extends undefined>(relation: Name_2): /*elided*/ any[Name_2] extends import("@adonisjs/lucid/types/relations").ModelRelations<import("@adonisjs/lucid/types/model").LucidModel, import("@adonisjs/lucid/types/model").LucidModel> ? /*elided*/ any[Name_2]["client"] : never;
-    };
-    /**
-     * Hook to verify user password when creating or updating
-     * the user model.
-     */
-    hashPassword<T extends /*elided*/ any & Model>(this: T, user: InstanceType<T>): Promise<void>;
-    /**
-     * Finds the user for authentication via "verifyCredentials".
-     * Feel free to override this method customize the user
-     * lookup behavior.
-     */
-    findForAuth<T extends /*elided*/ any & Model>(this: T, uids: string[], value: string): Promise<InstanceType<T> | null>;
-    /**
-     * Find a user by uid and verify their password. This method is
-     * safe from timing attacks.
-     */
-    verifyCredentials<T extends /*elided*/ any & Model>(this: T, uid: string, password: string): Promise<InstanceType<T>>;
-    readonly booted: boolean;
-    find: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, value: any, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<null | InstanceType<T>>;
-    $columnsDefinitions: Map<string, import("@adonisjs/lucid/types/model").ModelColumnOptions>;
-    $relationsDefinitions: Map<string, import("@adonisjs/lucid/types/relations").RelationshipsContract>;
-    $computedDefinitions: Map<string, import("@adonisjs/lucid/types/model").ComputedOptions>;
-    primaryKey: string;
-    connection?: string | undefined;
-    namingStrategy: import("@adonisjs/lucid/types/model").NamingStrategyContract;
-    table: string;
-    selfAssignPrimaryKey: boolean;
-    $adapter: import("@adonisjs/lucid/types/model").AdapterContract;
-    useAdapter: (adapter: import("@adonisjs/lucid/types/model").AdapterContract) => void;
-    $hooks: import("@poppinss/hooks").default<any>;
-    $keys: {
-        attributesToColumns: import("@adonisjs/lucid/types/model").ModelKeysContract;
-        attributesToSerialized: import("@adonisjs/lucid/types/model").ModelKeysContract;
-        columnsToAttributes: import("@adonisjs/lucid/types/model").ModelKeysContract;
-        columnsToSerialized: import("@adonisjs/lucid/types/model").ModelKeysContract;
-        serializedToColumns: import("@adonisjs/lucid/types/model").ModelKeysContract;
-        serializedToAttributes: import("@adonisjs/lucid/types/model").ModelKeysContract;
-    };
-    $createFromAdapterResult: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, result?: import("@adonisjs/lucid/types/model").ModelObject, sideloadAttributes?: import("@adonisjs/lucid/types/model").ModelObject, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => null | InstanceType<T>;
-    $createMultipleFromAdapterResult: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, results: import("@adonisjs/lucid/types/model").ModelObject[], sideloadAttributes?: import("@adonisjs/lucid/types/model").ModelObject, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => InstanceType<T>[];
-    $addColumn: (name: string, options: Partial<import("@adonisjs/lucid/types/model").ColumnOptions>) => import("@adonisjs/lucid/types/model").ColumnOptions;
-    $hasColumn: (name: string) => boolean;
-    $getColumn: (name: string) => import("@adonisjs/lucid/types/model").ModelColumnOptions | undefined;
-    $addComputed: (name: string, options: Partial<import("@adonisjs/lucid/types/model").ComputedOptions>) => import("@adonisjs/lucid/types/model").ComputedOptions;
-    $hasComputed: (name: string) => boolean;
-    $getComputed: (name: string) => import("@adonisjs/lucid/types/model").ComputedOptions | undefined;
-    $addRelation: (name: string, type: import("@adonisjs/lucid/types/relations").ModelRelationTypes["__opaque_type"], relatedModel: () => import("@adonisjs/lucid/types/model").LucidModel, options: import("@adonisjs/lucid/types/model").ModelRelationOptions) => void;
-    $hasRelation: (name: string) => boolean;
-    $getRelation: {
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Name_2 extends import("@adonisjs/lucid/types/relations").ExtractModelRelations<InstanceType<Model_1>>>(this: Model_1, name: Name_2): InstanceType<Model_1>[Name_2] extends import("@adonisjs/lucid/types/relations").ModelRelations<import("@adonisjs/lucid/types/model").LucidModel, import("@adonisjs/lucid/types/model").LucidModel> ? InstanceType<Model_1>[Name_2]["client"]["relation"] : import("@adonisjs/lucid/types/relations").RelationshipsContract;
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel>(this: Model_1, name: string): import("@adonisjs/lucid/types/relations").RelationshipsContract;
-    };
-    $defineProperty: <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Prop extends keyof Model_1>(this: Model_1, propertyName: Prop, defaultValue: Model_1[Prop], strategy: "inherit" | "define" | ((value: Model_1[Prop]) => Model_1[Prop])) => void;
-    boot: () => void;
-    before: {
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Event extends "find" | "fetch">(this: Model_1, event: Event, handler: import("@adonisjs/lucid/types/model").HooksHandler<import("@adonisjs/lucid/types/model").ModelQueryBuilderContract<Model_1>, Event>): void;
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel>(this: Model_1, event: "paginate", handler: import("@adonisjs/lucid/types/model").HooksHandler<[import("@adonisjs/lucid/types/model").ModelQueryBuilderContract<Model_1>, import("@adonisjs/lucid/types/model").ModelQueryBuilderContract<Model_1>], "paginate">): void;
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Event_1 extends import("@adonisjs/lucid/types/model").EventsList>(this: Model_1, event: Event_1, handler: import("@adonisjs/lucid/types/model").HooksHandler<InstanceType<Model_1>, Event_1>): void;
-    };
-    after: {
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel>(this: Model_1, event: "fetch", handler: import("@adonisjs/lucid/types/model").HooksHandler<InstanceType<Model_1>[], "fetch">): void;
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel>(this: Model_1, event: "paginate", handler: import("@adonisjs/lucid/types/model").HooksHandler<import("@adonisjs/lucid/types/model").ModelPaginatorContract<InstanceType<Model_1>>, "paginate">): void;
-        <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Event_2 extends import("@adonisjs/lucid/types/model").EventsList>(this: Model_1, event: Event_2, handler: import("@adonisjs/lucid/types/model").HooksHandler<InstanceType<Model_1>, Event_2>): void;
-    };
-    create: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, values: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>>;
-    createMany: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, values: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>[], options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>[]>;
-    findOrFail: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, value: any, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<InstanceType<T>>;
-    findBy: {
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, clause: Record<string, unknown>, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<null | InstanceType<T>>;
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, key: string, value: any, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<null | InstanceType<T>>;
-    };
-    findByOrFail: {
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, clause: Record<string, unknown>, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<InstanceType<T>>;
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, key: string, value: any, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<InstanceType<T>>;
-    };
-    findManyBy: {
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, clause: Record<string, unknown>, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<InstanceType<T>[]>;
-        <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, key: string, value: any, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions): Promise<InstanceType<T>[]>;
-    };
-    first: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<null | InstanceType<T>>;
-    firstOrFail: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<InstanceType<T>>;
-    findMany: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, value: any[], options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<InstanceType<T>[]>;
-    firstOrNew: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, searchPayload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, savePayload?: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>>;
-    firstOrCreate: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, searchPayload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, savePayload?: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>>;
-    updateOrCreate: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, searchPayload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, updatePayload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>, options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>>;
-    fetchOrNewUpMany: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, predicate: keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>> | (keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>)[], payload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>[], options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>[]>;
-    fetchOrCreateMany: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, predicate: keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>> | (keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>)[], payload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>[], options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>[]>;
-    updateOrCreateMany: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, predicate: keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>> | (keyof import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>)[], payload: Partial<import("@adonisjs/lucid/types/model").ModelAttributes<InstanceType<T>>>[], options?: import("@adonisjs/lucid/types/model").ModelAssignOptions) => Promise<InstanceType<T>[]>;
-    all: <T extends import("@adonisjs/lucid/types/model").LucidModel>(this: T, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => Promise<InstanceType<T>[]>;
-    query: <Model_1 extends import("@adonisjs/lucid/types/model").LucidModel, Result = InstanceType<Model_1>>(this: Model_1, options?: import("@adonisjs/lucid/types/model").ModelAdapterOptions) => import("@adonisjs/lucid/types/model").ModelQueryBuilderContract<Model_1, Result>;
-    transaction: import("@adonisjs/lucid/types/database").TransactionFn;
-    truncate: (cascade?: boolean) => Promise<void>;
-} & Model;
+}): <Model extends NormalizeConstructor<typeof BaseModel>>(superclass: Model) => UserWithUserFinderClass<Model>;
+export {};

package/build/src/mixins/lucid.js

@@ -9,7 +9,7 @@ import {
 import { RuntimeException } from "@adonisjs/core/exceptions";
 import { beforeSave } from "@adonisjs/lucid/orm";
 function withAuthFinder(hash, options) {
-  return (superclass) => {
+  return function(superclass) {
     class UserWithUserFinder extends superclass {
       static async hashPassword(user) {
         if (user.$dirty[options.passwordColumnName]) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/auth",
   "description": "Official authentication provider for Adonis framework",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -52,8 +52,8 @@
   },
   "devDependencies": {
     "@adonisjs/assembler": "^7.8.2",
-    "@adonisjs/core": "^6.17.1",
-    "@adonisjs/eslint-config": "^2.0.0-beta.7",
+    "@adonisjs/core": "^6.17.2",
+    "@adonisjs/eslint-config": "^2.0.0",
     "@adonisjs/hash": "^9.0.5",
     "@adonisjs/i18n": "^2.2.0",
     "@adonisjs/lucid": "^21.6.0",
@@ -66,36 +66,36 @@
     "@japa/expect-type": "^2.0.3",
     "@japa/file-system": "^2.3.2",
     "@japa/plugin-adonisjs": "^4.0.0",
-    "@japa/runner": "^4.1.0",
+    "@japa/runner": "^4.2.0",
     "@japa/snapshot": "^2.0.8",
     "@release-it/conventional-changelog": "^10.0.0",
-    "@swc/core": "^1.10.7",
+    "@swc/core": "1.10.7",
     "@types/basic-auth": "^1.1.8",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.10.7",
+    "@types/node": "^22.13.5",
     "@types/set-cookie-parser": "^2.4.10",
-    "@types/sinon": "^17.0.3",
+    "@types/sinon": "^17.0.4",
     "c8": "^10.1.3",
     "convert-hrtime": "^5.0.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "del-cli": "^6.0.0",
     "dotenv": "^16.4.7",
-    "eslint": "^9.18.0",
+    "eslint": "^9.21.0",
     "luxon": "^3.5.0",
     "mysql2": "^3.12.0",
-    "nock": "^13.5.6",
-    "pg": "^8.13.1",
-    "playwright": "^1.49.1",
-    "prettier": "^3.4.2",
-    "release-it": "^18.1.1",
+    "nock": "^14.0.1",
+    "pg": "^8.13.3",
+    "playwright": "^1.50.1",
+    "prettier": "^3.5.2",
+    "release-it": "^18.1.2",
     "set-cookie-parser": "^2.7.1",
     "sinon": "^19.0.2",
     "sqlite3": "^5.1.7",
     "tedious": "^18.6.1",
     "timekeeper": "^2.3.1",
-    "ts-node-maintained": "^10.9.4",
-    "tsup": "^8.3.5",
+    "ts-node-maintained": "^10.9.5",
+    "tsup": "^8.3.6",
     "typescript": "^5.7.3"
   },
   "dependencies": {