From eb81028123c1598f6fbdf7b72a5d5dea5b8f7048 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Wed, 22 Oct 2014 19:42:56 +0200
Subject: [PATCH] Use regex to parse key server urls from manifest

---
 package.json         |  1 -
 src/js/app-config.js | 21 +++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 19cb5d1..05d520c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
 {
     "name": "whiteout-mail",
-    "version": "0.0.1",
     "description": "Mail App with integrated OpenPGP encryption.",
     "author": "Whiteout Networks",
     "homepage": "https://whiteout.io",
diff --git a/src/js/app-config.js b/src/js/app-config.js
index 41271ad..d10da0a 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -164,21 +164,18 @@ if (typeof chrome !== 'undefined' && chrome.runtime && chrome.runtime.getManifes
 }
 
 function setConfigParams(manifest) {
-    var cfg = exports.config,
-        cloudUrl, keychainUrl;
+    var cfg = exports.config;
+
+    function getUrl(beginsWith) {
+        return _.find(manifest.permissions, function(permission) {
+            return typeof permission === 'string' && permission.indexOf(beginsWith) === 0;
+        }).replace(/\/$/, ''); // remove last '/' from url due to required syntax in manifest
+    }
 
     // get key server base url
-    cloudUrl = _.find(manifest.permissions, function(permission) {
-        return typeof permission === 'string' && permission.indexOf('https://keys') === 0;
-    });
-    // remove last '/' from url due to required syntax in manifest
-    cfg.cloudUrl = cloudUrl.substring(0, cloudUrl.length - 1);
+    cfg.cloudUrl = getUrl('https://keys');
     // get keychain server base url
-    keychainUrl = _.find(manifest.permissions, function(permission) {
-        return typeof permission === 'string' && permission.indexOf('https://keychain') === 0;
-    });
-    // remove last '/' from url due to required syntax in manifest
-    cfg.privkeyServerUrl = keychainUrl.substring(0, keychainUrl.length - 1);
+    cfg.privkeyServerUrl = getUrl('https://keychain');
     // get client ID for OAuth requests
     cfg.gmail.clientId = manifest.oauth2.client_id;
     // get the app version