@stacksjs/auth 0.62.0 → 0.63.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/auth",
   "type": "module",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "A more simplistic way to authenticate.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -52,6 +52,6 @@
   "dependencies": {
     "@stacksjs/router": "latest",
     "otplib": "^12.0.1",
-    "qrcode": "^1.5.3"
+    "qrcode": "^1.5.4"
   }
 }

package/src/authentication.ts

@@ -1,4 +1,5 @@
 import { request } from '@stacksjs/router'
+import { verifyHash } from '@stacksjs/security'
 import AccessToken from '../../../orm/src/models/AccessToken'
 import Team from '../../../orm/src/models/Team'
 import User from '../../../orm/src/models/User'
@@ -13,14 +14,16 @@ const authConfig = { username: 'email', password: 'password' }
 let authUser: any = undefined
 
 export async function attempt(credentials: Credentials, remember?: boolean) {
-  const user = await User.where(authConfig.username, credentials[authConfig.username])
-    .where(authConfig.password, credentials[authConfig.password])
-    .first()
+  const user = await User.where(authConfig.username, credentials[authConfig.username]).first()
 
-  if (user) {
-    authUser = user
+  const hashCheck = await verifyHash(credentials[authConfig.password], user?.password, 'bcrypt')
 
-    return true
+  if (hashCheck) {
+    if (user) {
+      authUser = user
+
+      return true
+    }
   }
 
   return false
@@ -68,7 +71,8 @@ export async function authToken() {
 
     const team = teams[0]
 
-    const accessToken = await AccessToken.where('team_id', team.id).first()
+    const accessTokens = await team.teamAccessTokens()
+    const accessToken = accessTokens[0]
 
     const tokenId = accessToken?.id