Merge branch 'pu/cw/loginMFA' into 'main'

fix(Tinebase): mfa probs with new login box See merge request tine20/tine20!6480
tine-groupware · Jan 23, 2025 · b14655e · b14655e
2 parents 8d4fa4c + b72aa2d
commit b14655e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tine20/Tinebase/js/LoginPanel.js b/tine20/Tinebase/js/LoginPanel.js
@@ -792,7 +792,11 @@ Tine.Tinebase.LoginPanel = Ext.extend(Ext.BoxComponent, {
             console.log(e.reason, e.message)
             if (e.name === 'AbortError') {
                 console.debug(e.reason)
-            } else{
+            } else if (e.name === 'NotAllowedError') {
+                console.debug(e)
+                // @TODO: disable passkey login
+                //  @TODO2 disable passkey login if passwordless login is not configured as well
+            } else {
                 console.assert(e.message)
                 if (await Ext.MessageBox.show({
                     icon: Ext.MessageBox.WARNING,

diff --git a/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/PasswordDialog.vue b/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/PasswordDialog.vue
@@ -64,7 +64,7 @@ const passwordFieldRef = ref()
 
 const getValue = () => passwordFieldRef.value?.getValue() || ''
 
-const disableok = computed(() => props.allowBlank ? false : passwordFieldRef.value?.getValue().length === 0)
+const disableok = computed(() => props.allowBlank ? false : passwordFieldRef.value?.getValue()?.length === 0)
 
 const initialFocus = computed(() => passwordFieldRef.value.$inputEl)