fix(Tinebase) fido2 not working on mainscreen areaLockedException

tine-groupware · Oct 8, 2024 · b7d95d5 · b7d95d5
1 parent 3b2e911
commit b7d95d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/tine20/Tinebase/Model/MFA/WebAuthnUserConfig.php b/tine20/Tinebase/Model/MFA/WebAuthnUserConfig.php
@@ -78,6 +78,14 @@ public function updateUserOldRecordCallback(Tinebase_Model_FullUser $newUser, Ti
         }
     }
 
+    public function toFEArray(): array
+    {
+        $user = Tinebase_Core::getUser();
+        return [
+            'username'  => $user ? $user->accountLoginName : '',
+        ];
+    }
+
     /**
      * holds the configuration object (must be declared in the concrete class)
      *

diff --git a/tine20/Tinebase/js/AreaLocks.js b/tine20/Tinebase/js/AreaLocks.js
@@ -139,7 +139,7 @@ class AreaLocks extends Ext.util.Observable {
       this.providerInstances[key] = new providerClass(_.assign({
         areaName: areaName,
         mfaDevice: selectedDevice
-      }, opts))
+      }, opts, _.get(selectedDevice, 'config', {})))
     }
     if (this.providerInstances[key].mfaDevice !== selectedDevice) {
       this.providerInstances[key].mfaDevice=selectedDevice;