From 4ff24c087ded529d5e0e2ea0a1a18b6707118c2f Mon Sep 17 00:00:00 2001
From: Hans-Peter Herzog <hherzog@sipwise.com>
Date: Tue, 9 Jan 2018 11:59:07 +0100
Subject: [PATCH] TT#29910 Call: Show the toast regarding call initialisation
 only if RTC:engine is enabled

Change-Id: I8a7faf80a76de536f548d5d4aa143f1de2a5746f
---
 src/components/Login.vue | 18 ++++++++++--------
 src/locales/en.json      |  4 ++--
 src/store/call.js        | 29 ++++++++++++++++++++++-------
 src/store/user.js        | 10 ++++++++--
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/components/Login.vue b/src/components/Login.vue
index cf2b28ee..7eeb22e8 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -9,14 +9,16 @@
                         <span slot="subtitle"></span>
                     </q-card-title>
                     <q-card-main>
-                        <q-field icon="fa-user-circle" :helper="$t('pages.login.username_helper')" :count="128">
-                            <q-input type="text" max-length="128" :float-label="$t('pages.login.username')"
-                                     autofocus clearable v-model="username" @keyup.enter="login()"/>
-                        </q-field>
-                        <q-field icon="fa-lock" :helper="$t('pages.login.password_helper')" :count="32">
-                            <q-input type="password" max-length="32" :float-label="$t('pages.login.password')"
-                                     clearable v-model="password" @keyup.enter="login()"/>
-                        </q-field>
+                        <form id="csc-login-form">
+                            <q-field icon="fa-user-circle" :helper="$t('pages.login.username_helper')" :count="128">
+                                <q-input type="text" max-length="128" :float-label="$t('pages.login.username')"
+                                         autofocus clearable v-model="username" @keyup.enter="login()"/>
+                            </q-field>
+                            <q-field icon="fa-lock" :helper="$t('pages.login.password_helper')" :count="32">
+                                <q-input type="password" max-length="32" :float-label="$t('pages.login.password')"
+                                         clearable v-model="password" @keyup.enter="login()" />
+                            </q-field>
+                        </form>
                     </q-card-main>
                     <q-card-actions class="pull-right">
                         <q-btn flat icon-right="fa-arrow-right"
diff --git a/src/locales/en.json b/src/locales/en.json
index 568ad6a4..abece965 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -51,9 +51,9 @@
             "button": "Sign In",
             "error": "Wrong username or password",
             "username": "Username",
-            "username_helper": "Web-Username, SIP-URI",
+            "username_helper": "Input username or username@domain",
             "password": "Password",
-            "password_helper": "Web-Password"
+            "password_helper": ""
         },
         "callBlockingIncoming": {
             "title": "Block/Allow incoming calls",
diff --git a/src/store/call.js b/src/store/call.js
index c96f6fed..abdd2555 100644
--- a/src/store/call.js
+++ b/src/store/call.js
@@ -22,6 +22,7 @@ export default {
     state: {
         initialized: false,
         initError: null,
+        disabled: false,
         endedReason: null,
         callState: CallState.input,
         number: null,
@@ -50,7 +51,7 @@ export default {
             return getters.isNetworkConnected;
         },
         hasCallInitFailure(state, getters) {
-            return state.initError !== null;
+            return state.initError !== null && state.disabled === false;
         },
         isPreparing(state, getters) {
             return state.callState === CallState.input;
@@ -78,6 +79,12 @@ export default {
         },
         isEnded(state, getters) {
             return state.callState === CallState.ended;
+        },
+        hasRtcEngineCapability(state, getters, rootState, rootGetters) {
+            return rootGetters['user/hasRtcEngineCapability'];
+        },
+        hasRtcEngineCapabilityEnabled(state, getters, rootState, rootGetters) {
+            return rootGetters['user/hasRtcEngineCapabilityEnabled'];
         }
     },
     mutations: {
@@ -89,6 +96,9 @@ export default {
             state.initialized = false;
             state.initError = err;
         },
+        disable(state) {
+            state.disabled = true;
+        },
         inputNumber(state) {
             state.callState = CallState.input;
         },
@@ -152,13 +162,18 @@ export default {
                     Vue.call.end();
                     context.commit('endCall', Vue.call.getEndedReason());
                 });
-                Vue.call.initialize().then(()=>{
-                    context.commit('initSucceeded');
+                if(context.getters.hasRtcEngineCapabilityEnabled) {
+                    Vue.call.initialize().then(()=>{
+                        context.commit('initSucceeded');
+                        resolve();
+                    }).catch((err)=>{
+                        context.commit('initFailed', err);
+                        reject(err);
+                    });
+                } else {
+                    context.commit('disable');
                     resolve();
-                }).catch((err)=>{
-                    context.commit('initFailed', err);
-                    reject(err);
-                });
+                }
             });
         },
         /**
diff --git a/src/store/user.js b/src/store/user.js
index 1211b099..b0240c9e 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -34,11 +34,17 @@ export default {
             return getters.isAdmin && state.capabilities !== null && state.capabilities.cloudpbx;
         },
         hasSmsCapability(state, getters) {
-            return state.capabilities !== null && state.capabilities.sms;
+            return state.capabilities !== null && state.capabilities.sms  === true;
         },
         hasFaxCapability(state, getters) {
-            return state.capabilities !== null && state.capabilities.faxserver;
+            return state.capabilities !== null && state.capabilities.faxserver  === true;
         },
+        hasRtcEngineCapability(state, getters) {
+            return state.capabilities !== null && _.has(state.capabilities, 'rtcengine');
+        },
+        hasRtcEngineCapabilityEnabled(state, getters) {
+            return getters.hasRtcEngineCapability && state.capabilities.rtcengine === true;
+        }
     },
     mutations: {
         login(state, options) {