fix: password error message not displayed if policy doesnt exists

PlusAuth · Jun 9, 2020 · df20b31 · df20b31
1 parent 634a8c2
commit df20b31
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/ui/components/PasswordStrength.ts b/src/ui/components/PasswordStrength.ts
@@ -2,6 +2,8 @@ import { defineComponent, h, inject } from 'vue';
 
 import { Translator, translatorKey } from '../utils/translator';
 
+import PMessage from './PMessage';
+
 export default defineComponent({
   name: 'PasswordStrengthTooltip',
   props: {
@@ -12,7 +14,17 @@ export default defineComponent({
     const context = inject('context') as any
     return {
       generatePolicyElements(result: any) {
-        return Object.keys(context.passwordPolicy).map(( policy ) => {
+        if(!context.passwordPolicy || typeof result === 'string'){
+          return h(PMessage, {
+            class: 'pa__input-details',
+            value: result
+          })
+        }
+        return h('div', {
+          class: {
+            'pa-pw-strength': true
+          }
+        }, Object.keys(context.passwordPolicy).map(( policy ) => {
           const elemText = translator.t(
             `passwordPolicy.${ policy }`,
             [context.passwordPolicy[policy]]
@@ -30,14 +42,12 @@ export default defineComponent({
             elemText
           ])
         })
+        )
+
       }
     }
   },
   render(){
-    return h('div', {
-      class: {
-        'pa-pw-strength': true
-      }
-    }, this.generatePolicyElements(this.message))
+    return this.generatePolicyElements(this.message)
   }
 })
diff --git a/src/ui/views/Register.vue b/src/ui/views/Register.vue
@@ -171,7 +171,9 @@ export default defineComponent({
           autocomplete: 'new-password'
         },
         async validator(fields, value){
-          return api.auth.checkPasswordStrength(value, context.passwordPolicy)
+          return !value ? translator.t('register.errors.passwordRequired') :
+            api.auth.checkPasswordStrength(value,
+              context.passwordPolicy || {})
         }
       },
       rePassword: {

diff --git a/src/ui/views/ResetPassword.vue b/src/ui/views/ResetPassword.vue
@@ -142,7 +142,9 @@ export default defineComponent({
           autocomplete: 'new-password'
         },
         async validator(fields, value){
-          return api.auth.checkPasswordStrength(value, context.passwordPolicy)
+          return !value ? translator.t('resetPassword.errors.passwordRequired') :
+            api.auth.checkPasswordStrength(value,
+              context.passwordPolicy || {})
         }
       },
       rePassword: {