Catch exception parsing domains.json

infinityoneframework · Jun 22, 2018 · 1183906 · 1183906
1 parent cdd77b0
commit 1183906
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 22 deletions.
diff --git a/app/main/menu.js b/app/main/menu.js
@@ -3,7 +3,7 @@
 const path = require('path');
 
 // const { app, shell, BrowserWindow, Menu } = require('electron');
-const { app, BrowserWindow, Menu } = require('electron');
+const { app, shell, BrowserWindow, Menu } = require('electron');
 
 const fs = require('fs-extra');
 
@@ -120,7 +120,13 @@ class AppMenu {
 			{
 				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
 				enabled: false
-			}];
+			}, {
+			 	label: 'Show App Data',
+			 	click() {
+			 		shell.openItem(app.getPath('userData'));
+			 	}
+			}
+		];
 	}
 
 	// getHelpSubmenu() {

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "infinityone",
   "productName": "InfinityOne",
-  "version": "0.9.2",
+  "version": "1.0.0-rc",
   "description": "Infinity One Desktop App",
   "license": "Apache-2.0",
   "copyright": "E-MetroTel Global Inc.",

diff --git a/app/renderer/js/utils/domain-util.js b/app/renderer/js/utils/domain-util.js
@@ -34,6 +34,7 @@ class DomainUtil {
 		}
 
 		this.reloadDB();
+
 		// Migrate from old schema
 		if (this.db.getData('/').domain) {
 			this.addDomain({
@@ -192,24 +193,29 @@ class DomainUtil {
 		return new Promise((resolve, reject) => {
 			request(serverSettingsUrl, (error, response) => {
 				if (!error && response.statusCode === 200) {
-					const data = JSON.parse(response.body);
-					if (data.hasOwnProperty('realm_uri')) {
-						let realmIcon;
-
-						if (data.realm_icon) {
-							realmIcon = data.realm_icon;
-						} else {
-							realmIcon = defaultIconUrl;
-						}
+					try {
+						const data = JSON.parse(response.body);
+						if (data.hasOwnProperty('realm_uri')) {
+							let realmIcon;
 
-						resolve({
-							// Some InfinityOne Servers use absolute URL for server icon whereas others use relative URL
-							// Following check handles both the cases
-							icon: realmIcon.startsWith('/') ? data.realm_uri + realmIcon : realmIcon,
-							iconUrl: realmIcon,
-							url: data.realm_uri,
-							alias: data.realm_name
-						});
+							if (data.realm_icon) {
+								realmIcon = data.realm_icon;
+							} else {
+								realmIcon = defaultIconUrl;
+							}
+
+							resolve({
+								// Some InfinityOne Servers use absolute URL for server icon whereas others use relative URL
+								// Following check handles both the cases
+								icon: realmIcon.startsWith('/') ? data.realm_uri + realmIcon : realmIcon,
+								iconUrl: realmIcon,
+								url: data.realm_uri,
+								alias: data.realm_name
+							});
+						}
+					}
+					catch(err) {
+						reject('Infinity One server invalid response');
 					}
 				} else {
 					reject('Infinity One server invalid version.');

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "infinityone",
   "productName": "InfinityOne",
-  "version": "0.9.2",
+  "version": "1.0.0-rc",
   "main": "./app/main",
   "description": "Infinity One Desktop App",
   "license": "Apache-2.0",
@@ -115,7 +115,12 @@
     "electron-app",
     "electron",
     "Desktop app",
-    "InstantMessaging"
+    "InstantMessaging",
+    "WebRTC",
+    "E-MetroTel",
+    "Unified Communications",
+    "Collaboration",
+    "Telecommunications"
   ],
   "devDependencies": {
     "assert": "1.4.1",