Merge branch 'main' into bugfix/improve-alignment-of-menu-item-icons

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed an issue in the biometric authentication
 - Fixed the alignment of the icons in various menus
 
 ## 2.16.0 - 2023-10-29

apps/client/src/app/services/web-authn.service.ts

@@ -46,12 +46,10 @@ export class WebAuthnService {
         switchMap((attOps) => {
           return startRegistration(attOps);
         }),
-        switchMap((attResp) => {
+        switchMap((credential) => {
           return this.http.post<AuthDeviceDto>(
             `/api/v1/auth/webauthn/verify-attestation`,
-            {
+            { credential }
-              credential: attResp
-            }
           );
         }),
         tap((authDevice) =>
@@ -65,6 +63,7 @@ export class WebAuthnService {
 
   public deregister() {
     const deviceId = this.getDeviceId();
+
     return this.http
       .delete<AuthDeviceDto>(`/api/v1/auth-device/${deviceId}`)
       .pipe(
@@ -82,20 +81,21 @@ export class WebAuthnService {
 
   public login() {
     const deviceId = this.getDeviceId();
+
     return this.http
       .post<PublicKeyCredentialRequestOptionsJSON>(
         `/api/v1/auth/webauthn/generate-assertion-options`,
         { deviceId }
       )
       .pipe(
-        switchMap((requestOptionsJSON) =>
+        switchMap((requestOptionsJSON) => {
-          startAuthentication(requestOptionsJSON, true)
+          return startAuthentication(requestOptionsJSON);
-        ),
+        }),
-        switchMap((assertionResponse) => {
+        switchMap((credential) => {
           return this.http.post<{ authToken: string }>(
             `/api/v1/auth/webauthn/verify-assertion`,
             {
-              credential: assertionResponse,
+              credential,
               deviceId
             }
           );