fix(mixins): receive a function instead of the hash module directly

adonisjs · Jan 24, 2024 · 3c5018c · 3c5018c
1 parent 3526488
commit 3c5018c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/mixins/with_auth_finder.ts b/src/mixins/with_auth_finder.ts
@@ -25,7 +25,7 @@ import { E_INVALID_CREDENTIALS } from '../errors.js'
  *   timing attacks.
  */
 export function withAuthFinder(
-  hash: Hash,
+  hash: () => Hash,
   options: {
     uids: string[]
     passwordColumnName: string
@@ -43,7 +43,7 @@ export function withAuthFinder(
         user: InstanceType<T>
       ) {
         if (user.$dirty[options.passwordColumnName]) {
-          ;(user as any)[options.passwordColumnName] = await hash.make(
+          ;(user as any)[options.passwordColumnName] = await hash().make(
             (user as any)[options.passwordColumnName]
           )
         }
@@ -82,7 +82,7 @@ export function withAuthFinder(
 
         const user = await this.findForAuth(options.uids, uid)
         if (!user) {
-          await hash.make(password)
+          await hash().make(password)
           throw new E_INVALID_CREDENTIALS('Invalid user credentials')
         }
 
@@ -93,7 +93,7 @@ export function withAuthFinder(
           )
         }
 
-        if (await hash.verify(passwordHash, password)) {
+        if (await hash().verify(passwordHash, password)) {
           return user
         }
 

diff --git a/tests/auth/mixins/with_auth_finder.spec.ts b/tests/auth/mixins/with_auth_finder.spec.ts
@@ -24,7 +24,7 @@ test.group('withAuthFinder | findForAuth', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -66,7 +66,7 @@ test.group('withAuthFinder | findForAuth', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -104,7 +104,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -141,7 +141,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -173,7 +173,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -211,7 +211,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -249,7 +249,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })
@@ -300,7 +300,7 @@ test.group('withAuthFinder | verify', () => {
 
     class User extends compose(
       BaseModel,
-      withAuthFinder(hash, {
+      withAuthFinder(() => hash, {
         uids: ['email', 'username'],
         passwordColumnName: 'password',
       })