From 1f8e30b5cd2e979ca9643b2e8ff566abf2fbc539 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sun, 3 Sep 2017 12:58:42 -0400
Subject: [PATCH] catch security error when setting env urls

---
 src/services/apiService.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/services/apiService.js b/src/services/apiService.js
index b910d222c4..2d2bfbdd04 100644
--- a/src/services/apiService.js
+++ b/src/services/apiService.js
@@ -11,20 +11,26 @@ function ApiService(tokenService, appIdService, utilsService, constantsService,
 
 function initApiService() {
     ApiService.prototype.setUrls = function () {
-        var storedBaseUrl = window.localStorage.getItem(this.constantsService.baseUrlKey);
+        try {
+            var storedBaseUrl = window.localStorage.getItem(this.constantsService.baseUrlKey);
 
-        if (storedBaseUrl) {
-            this.baseUrl = storedBaseUrl + '/api';
-            this.identityBaseUrl = storedBaseUrl + '/identity';
-            return;
+            if (storedBaseUrl) {
+                this.baseUrl = storedBaseUrl + '/api';
+                this.identityBaseUrl = storedBaseUrl + '/identity';
+                return;
+            }
+
+            var storedApiUrl = window.localStorage.getItem(this.constantsService.apiUrlKey);
+            var storedIdentityUrl = window.localStorage.getItem(this.constantsService.identityUrlKey);
+            if (storedApiUrl && storedIdentityUrl) {
+                this.baseUrl = storedApiUrl;
+                this.identityBaseUrl = storedIdentityUrl;
+                return;
+            }
         }
-
-        var storedApiUrl = window.localStorage.getItem(this.constantsService.apiUrlKey);
-        var storedIdentityUrl = window.localStorage.getItem(this.constantsService.identityUrlKey);
-        if (storedApiUrl && storedIdentityUrl) {
-            this.baseUrl = storedApiUrl;
-            this.identityBaseUrl = storedIdentityUrl;
-            return;
+        catch (e) {
+            console.log('Unable to set custom environment URLs:');
+            console.log(e);
         }
 
         // Desktop