Fix getting right URL from settings and catch wrong API url status wh…

…en logging in.
vialer · Jul 3, 2017 · ce9eaf3 · ce9eaf3
1 parent a5ae042
commit ce9eaf3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/src/js/lib/api.js b/src/js/lib/api.js
@@ -13,31 +13,16 @@ class Api {
     constructor(app) {
         this.app = app
         this.OK_STATUS = [200, 201, 202, 204]
-        this.NOTOK_STATUS = [401, 403]
+        this.NOTOK_STATUS = [401, 403, 'Network Error']
         this.UNAUTHORIZED_STATUS = [401]
         this.setupClient(this.app.store.get('username'), this.app.store.get('password'))
     }
 
-
-    getPlatformUrl() {
-        let platformUrl = this.app.store.get('platformUrl')
-        if (platformUrl && platformUrl.length && platformUrl.lastIndexOf('/') !== platformUrl.length - 1) {
-            // Force trailing slash.
-            platformUrl = platformUrl + '/'
-        } else {
-            // Set a default platform url when it's not set.
-            platformUrl = 'https://partner.voipgrid.nl/'
-            this.app.store.set('platformUrl', platformUrl)
-        }
-        return platformUrl
-    }
-
-
     /**
      * Set a http client with or without basic authentication.
      */
     setupClient(username, password) {
-        let clientOptions = {baseURL: this.getPlatformUrl()}
+        let clientOptions = {baseURL: this.app.store.get('platformUrl')}
         if (username && password) {
             this.app.logger.info(`${this}Set api client with basic auth for user ${username}`)
             clientOptions.auth = {
@@ -51,6 +36,10 @@ class Api {
         this.client.interceptors.response.use(function(response) {
             return response
         }, (err) => {
+            // Catch Network Errors.
+            if(err.message == 'Network Error') {
+                return Promise.resolve({'status': 'Network Error'})
+            }
             // Reject all status codes from 500.
             if (err.response.status >= 500) {
                 return Promise.reject(err)

diff --git a/src/js/lib/app.js b/src/js/lib/app.js
@@ -63,8 +63,8 @@ class App extends Skeleton {
     _init() {
         this.settings = {
             analyticsId: 'UA-60726618-9',
-            platformUrl: 'https://partner.voipgrid.nl/',
             realm: 'websocket.voipgrid.nl',
+            platformUrl: this.getPlatformUrl(),
             c2d: 'true',
         }
         if (this.env.extension) {
@@ -82,6 +82,27 @@ class App extends Skeleton {
     }
 
 
+    /**
+     * Get platform URL from storage or set default.
+     */
+    getPlatformUrl() {
+        let platformUrl = this.store.get('platformUrl')
+
+        if(!platformUrl) {
+            // Set a default platform url when it's not set.
+            platformUrl = 'https://partner.voipgrid.nl/'
+            this.store.set('platformUrl', platformUrl)
+        }
+
+        // Force trailing slash.
+        if (platformUrl && platformUrl.length && platformUrl.lastIndexOf('/') !== platformUrl.length - 1) {
+            platformUrl = platformUrl + '/'
+        }
+
+        return platformUrl
+    }
+
+
     /**
      * Reload all modules that have this method implemented.
      */