refactor: types and add drivers to hash drivers collection

adonisjs · Jan 17, 2023 · 19d6ac6 · 19d6ac6
1 parent f6a612b
commit 19d6ac6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/modules/hash/drivers_collection.ts b/modules/hash/drivers_collection.ts
@@ -16,6 +16,7 @@
  * regular usage and specific to AdonisJS container flow.
  */
 
+import { Argon, Bcrypt, Scrypt } from './main.js'
 import { RuntimeException } from '@poppinss/utils'
 import type { HashDriversList } from '../../src/types.js'
 
@@ -26,7 +27,11 @@ class HashDriversCollection {
   /**
    * List of registered drivers
    */
-  list: Partial<HashDriversList> = {}
+  list: Partial<HashDriversList> = {
+    bcrypt: (config) => new Bcrypt(config),
+    argon2: (config) => new Argon(config),
+    scrypt: (config) => new Scrypt(config),
+  }
 
   /**
    * Extend drivers collection and add a custom

diff --git a/providers/app_provider.ts b/providers/app_provider.ts
@@ -44,7 +44,7 @@ export default class AppServiceProvider {
   protected registerLoggerManager() {
     const LoggerServiceManager = LoggerManager as unknown as AbstractConstructor<LoggerService>
     this.app.container.singleton(LoggerServiceManager, () => {
-      const config = this.app.config.get<any>('app.logger')
+      const config = this.app.config.get<any>('logger')
       return new LoggerManager(config) as LoggerService
     })
     this.app.container.alias('logger', LoggerServiceManager)

diff --git a/src/types.ts b/src/types.ts
@@ -45,7 +45,7 @@ export type InferLoggers<T extends LoggerManagerConfig<any>> = T['loggers']
  */
 export interface HashDriversList {
   bcrypt: (config: BcryptConfig) => Bcrypt
-  argon: (config: ArgonConfig) => Argon
+  argon2: (config: ArgonConfig) => Argon
   scrypt: (config: ScryptConfig) => Scrypt
 }