@furystack/rest-service 4.1.12 → 5.0.3

package/src/http-user-context.ts

@@ -4,6 +4,7 @@ import { Injectable } from '@furystack/inject'
 import { v1 } from 'uuid'
 import { HttpAuthenticationSettings } from './http-authentication-settings'
 import { DefaultSession } from 'models/default-session'
+import { PasswordAuthenticator, UnauthenticatedError } from '@furystack/security'
 
 /**
  * Injectable UserContext for FuryStack HTTP Api
@@ -14,6 +15,24 @@ export class HttpUserContext {
 
   public getSessionStore = () => this.authentication.getSessionStore(this.storeManager)
 
+  private getUserByName = async (userName: string) => {
+    const userStore = this.getUserStore()
+    const users = await userStore.find({ filter: { username: { $eq: userName } }, top: 2 })
+    if (users.length !== 1) {
+      throw new UnauthenticatedError()
+    }
+    return users[0]
+  }
+
+  private getSessionById = async (sessionId: string) => {
+    const sessionStore = this.getSessionStore()
+    const sessions = await sessionStore.find({ filter: { sessionId: { $eq: sessionId } }, top: 2 })
+    if (sessions.length !== 1) {
+      throw new UnauthenticatedError()
+    }
+    return sessions[0]
+  }
+
   private user?: User
 
   /**
@@ -54,21 +73,16 @@ export class HttpUserContext {
    * @returns the authenticated User
    */
   public async authenticateUser(userName: string, password: string) {
-    const match =
-      (password &&
-        password.length &&
-        (await this.getUserStore().find({
-          filter: {
-            username: { $eq: userName },
-            password: { $eq: this.authentication.hashMethod(password) },
-          },
-        }))) ||
-      []
-    if (match.length === 1) {
-      const { password: pw, ...user } = match[0]
-      return user
+    const result = await this.authenticator.checkPasswordForUser(userName, password)
+
+    if (!result.isValid) {
+      throw new UnauthenticatedError()
+    }
+    const user = await this.getUserByName(userName)
+    if (!user) {
+      throw new UnauthenticatedError()
     }
-    throw Error('Failed to authenticate.')
+    return user
   }
 
   public async getCurrentUser(request: IncomingMessage) {
@@ -108,23 +122,16 @@ export class HttpUserContext {
     // Cookie auth
     const sessionId = this.getSessionIdFromRequest(request)
     if (sessionId) {
-      const [session] = await this.getSessionStore().find({ filter: { sessionId: { $eq: sessionId } }, top: 2 })
+      const session = await this.getSessionById(sessionId)
       if (session) {
-        const userResult = await this.getUserStore().find({
-          filter: {
-            username: { $eq: session.username },
-          },
-          top: 2,
-        })
-        if (userResult.length === 1) {
-          const { password, ...user } = userResult[0]
+        const user = await this.getUserByName(session.username)
+        if (user) {
           return user
         }
-        throw Error('Inconsistent session result')
       }
     }
 
-    throw Error('Failed to authenticate request')
+    throw new UnauthenticatedError()
   }
 
   /**
@@ -156,5 +163,6 @@ export class HttpUserContext {
   constructor(
     public readonly authentication: HttpAuthenticationSettings<User, DefaultSession>,
     private readonly storeManager: StoreManager,
+    private readonly authenticator: PasswordAuthenticator,
   ) {}
 }