@things-factory/auth-base 7.0.1-rc.8 → 7.0.1-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "7.0.1-rc.8",
+  "version": "7.0.1-rc.9",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "cf1d0f8f261c73eadecb517fc6c82e92e50d6caf"
+  "gitHead": "70c4b8737f2ccb632699f31a92173401624ee9f7"
 }

package/server/middlewares/webauthn-middleware.ts

@@ -7,10 +7,7 @@ import { User } from '../service/user/user'
 import { AuthError } from '../errors/auth-error'
 
 import { WebAuthCredential } from '../service/web-auth-credential/web-auth-credential'
-import {
-  verifyRegistrationResponse,
-  verifyAuthenticationResponse
-} from '@simplewebauthn/server'
+import { verifyRegistrationResponse, verifyAuthenticationResponse } from '@simplewebauthn/server'
 
 import { AuthenticatorAssertionResponse } from '@simplewebauthn/types'
 
@@ -32,7 +29,7 @@ passport.use(
 
     if (verification.verified) {
       const { registrationInfo } = verification
-      const publicKey = Buffer.from(registrationInfo.credentialPublicKey).toString('base64');
+      const publicKey = Buffer.from(registrationInfo.credentialPublicKey).toString('base64')
 
       if (user) {
         const webAuthRepository = getRepository(WebAuthCredential)
@@ -64,11 +61,12 @@ passport.use(
       id: string
       response: AuthenticatorAssertionResponse
     }
-    
+
     const credential = await getRepository(WebAuthCredential).findOne({
       where: {
         credentialId: assertionResponse.id
-      }
+      },
+      relations: ['user']
     })
 
     if (!credential) {
@@ -93,7 +91,7 @@ passport.use(
       credential.counter = authenticationInfo.newCounter
       await getRepository(WebAuthCredential).save(credential)
 
-      const user = await getRepository(User).findOne({ where: { email: body.email } })
+      const user = credential.user
       return done(null, user)
     } else {
       return done(verification, false)
@@ -111,15 +109,15 @@ export function createWebAuthnMiddleware(strategy: 'webauthn-register' | 'webaut
           throw new AuthError({
             errorCode: AuthError.ERROR_CODES.AUTHN_VERIFICATION_FAILED,
             detail: err
-          });
+          })
         } else {
-          context.state.user = user;
+          context.state.user = user
 
-          context.body = { user, verified: true };
+          context.body = { user, verified: true }
         }
 
-        await next();
+        await next()
       }
-    )(context, next);
-  };
+    )(context, next)
+  }
 }