From 9d06ca52e5d5c193d4462eac203f60d83249a0bf Mon Sep 17 00:00:00 2001
From: raxelsen <raxelsen@sipwise.com>
Date: Thu, 25 Oct 2018 15:22:14 +0200
Subject: [PATCH] TT#46169 Phone number input validation

Change-Id: If04aa117b9aea1eb024f065d047638e3f113a48f
---
 src/components/CscCall.vue                  |  6 ++-
 src/components/call/CscPhoneNumberInput.vue | 57 +++++++++++----------
 src/helpers/validation.js                   |  5 ++
 t/unit/validation.js                        | 30 +++++++++++
 4 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 src/helpers/validation.js
 create mode 100644 t/unit/validation.js

diff --git a/src/components/CscCall.vue b/src/components/CscCall.vue
index 26ccca82..68e8f590 100644
--- a/src/components/CscCall.vue
+++ b/src/components/CscCall.vue
@@ -294,6 +294,7 @@
     import { getChromeExtensionUrl } from '../helpers/cdk-lib'
     import CscCallDialpad from './CscCallDialpad'
     import CscPhoneNumberInput from './call/CscPhoneNumberInput'
+    import { showGlobalError } from '../helpers/ui'
     import {
         QLayout,
         QCard,
@@ -384,10 +385,13 @@
             call(localMedia) {
                 if(this.$refs.phoneNumberInput.hasPhoneNumber()) {
                     this.$store.dispatch('call/start', {
-                        number: this.$refs.phoneNumberInput.getRawPhoneNumber(),
+                        number: this.$refs.phoneNumberInput.getPhoneNumber(),
                         localMedia: localMedia
                     });
                 }
+                else {
+                    showGlobalError(this.$t('validationErrors.inputValidNumber'));
+                }
             },
             accept(localMedia) {
                 this.$store.dispatch('call/accept', localMedia);
diff --git a/src/components/call/CscPhoneNumberInput.vue b/src/components/call/CscPhoneNumberInput.vue
index d1c474ac..c6801f0a 100644
--- a/src/components/call/CscPhoneNumberInput.vue
+++ b/src/components/call/CscPhoneNumberInput.vue
@@ -4,7 +4,6 @@
         dark
         :count="maxLength"
         :helper="helperMessage"
-        :error="$v.phoneNumber.$error"
         :error-label="errorMessage"
     >
         <q-input
@@ -13,22 +12,21 @@
             clearable
             type="text"
             :float-label="$t('call.number')"
-            :value="phoneNumber"
-            :error="$v.phoneNumber.$error"
-            :max-length="maxLength"
             :readonly="!enabled"
-            @input="inputPhoneNumber"
+            v-model="phoneNumber"
             @keypress.space.prevent
             @keydown.space.prevent
             @keyup.space.prevent
             :after="inputButtons"
             @keyup.enter="keyReturn()"
+            @input="$v.phoneNumber.$touch"
+            @blur="$v.phoneNumber.$touch"
+            :error="$v.phoneNumber.$error"
         />
     </q-field>
     <q-field
         v-else
         dark
-        :error="$v.phoneNumber.$error"
         :error-label="errorMessage"
     >
         <q-input
@@ -37,30 +35,27 @@
             clearable
             type="text"
             :placeholder="$t('call.number')"
-            :value="phoneNumber"
-            :error="$v.phoneNumber.$error"
-            :max-length="maxLength"
             :readonly="!enabled"
-            @input="inputPhoneNumber"
+            v-model="phoneNumber"
             @keypress.space.prevent
             @keydown.space.prevent
             @keyup.space.prevent
             :after="inputButtons"
+            @input="$v.phoneNumber.$touch"
+            @blur="$v.phoneNumber.$touch"
+            :error="$v.phoneNumber.$error"
         />
     </q-field>
 </template>
 
 <script>
-
     import Vue from 'vue'
     import _ from 'lodash'
+    import { userInfo } from '../../helpers/validation'
     import {
-        maxLength
+        maxLength,
+        required
     } from 'vuelidate/lib/validators'
-    import {
-        normalizeNumber,
-        rawNumber
-    } from '../../filters/number-format'
     import {
         QField,
         QInput
@@ -80,7 +75,9 @@
         },
         validations: {
             phoneNumber: {
-                maxLength: maxLength(64)
+                userInfo,
+                maxLength: maxLength(64),
+                required
             }
         },
         props: {
@@ -102,7 +99,20 @@
         ],
         computed: {
             errorMessage() {
-                return this.$t('validationErrors.inputValidNumber');
+                if (!this.$v.phoneNumber.required) {
+                    return this.$t('validationErrors.fieldRequired', {
+                        field: this.$t('call.number')
+                    });
+                }
+                else if (!this.$v.phoneNumber.maxLength) {
+                    return this.$t('validationErrors.maxLength', {
+                        field: this.$t('call.number'),
+                        maxLength: this.$v.phoneNumber.$params.maxLength.max
+                    });
+                }
+                else if (!this.$v.phoneNumber.userInfo) {
+                    return this.$t('validationErrors.inputValidNumber');
+                }
             },
             helperMessage() {
                 return this.$t('validationErrors.inputNumber');
@@ -130,21 +140,14 @@
             keyReturn() {
                 this.$emit('key-return');
             },
-            inputPhoneNumber(value) {
-                this.phoneNumber = normalizeNumber(value, this.isMobile);
-                this.$v.phoneNumber.$touch();
-            },
             getPhoneNumber() {
                 return this.phoneNumber;
             },
-            getRawPhoneNumber() {
-                return rawNumber(this.getPhoneNumber());
-            },
             hasPhoneNumber() {
-                return !_.isEmpty(this.phoneNumber);
+                return !this.$v.phoneNumber.$error && !_.isEmpty(this.phoneNumber);
             },
             concat(str) {
-                this.inputPhoneNumber(this.phoneNumber + "" + str);
+                this.phoneNumber = this.phoneNumber + "" + str;
             },
             focusInput() {
                 Vue.nextTick(() => {
diff --git a/src/helpers/validation.js b/src/helpers/validation.js
new file mode 100644
index 00000000..5e2fe1a6
--- /dev/null
+++ b/src/helpers/validation.js
@@ -0,0 +1,5 @@
+
+export function userInfo (value) {
+    var regex = new RegExp(/^[-_.!~*'&=+$,;?/%a-zA-Z0-9]+$/);
+    return regex.test(value);
+}
diff --git a/t/unit/validation.js b/t/unit/validation.js
new file mode 100644
index 00000000..09ecca60
--- /dev/null
+++ b/t/unit/validation.js
@@ -0,0 +1,30 @@
+
+'use strict';
+
+import { assert } from 'chai';
+import { userInfo } from '../../src/helpers/validation'
+
+describe('Userinfo validation helper', function() {
+
+    it('should validate userinfo consisting of phone number and country code', function() {
+        let input = "+439988776655";
+        assert.isTrue(userInfo(input));
+    });
+
+    it('should validate userinfo with parameter', function() {
+        let input = "+358-555-1234567;postd=pp22";
+        assert.isTrue(userInfo(input));
+    });
+
+    it('should validate userinfo consisting of subscriber username', function() {
+        let input = "alice";
+        assert.isTrue(userInfo(input));
+    });
+
+    it('should not validate invalid userinfo characters', function() {
+        let input = "al)<e";
+        assert.isFalse(userInfo(input));
+    });
+
+});
+