Merge branch 'wallet/sprint/17' into wallet/dev

src/js/models/profile.js

@@ -9,12 +9,12 @@ function Profile() {
   this.version = '1.0.0';
 };
 
-Profile.create = function(opts) {
-  opts = opts || {};
+Profile.create = function(appVersion) {
 
   var x = new Profile();
+  x.appVersion = appVersion;
   x.createdOn = Date.now();
-  x.credentials = opts.credentials || [];
+  x.credentials = [];
   x.disclaimerAccepted = true;
   x.checked = {};
   return x;
@@ -23,6 +23,7 @@ Profile.create = function(opts) {
 Profile.fromObj = function(obj) {
   var x = new Profile();
 
+  x.appVersion = obj.appVersion;
   x.createdOn = obj.createdOn;
   x.credentials = obj.credentials;
   x.disclaimerAccepted = obj.disclaimerAccepted;
@@ -62,6 +63,39 @@ Profile.prototype.isDeviceChecked = function(ua) {
   return this.checkedUA == ua;
 };
 
+/**
+ * 
+ * @param {Profile} other 
+ */
+Profile.prototype.merge = function(other) {
+
+  var newCredentials = [];
+  var otherCredentialsLength = other.credentials.length;
+  var thisProfile = this;
+
+  other.credentials.forEach(function(otherCredential) {
+    var credentialExists = false;
+    thisProfile.credentials.forEach(function(thisCredential) {
+      if (otherCredential.walletId === thisCredential.walletId) {
+        credentialExists = true;
+      }
+    });
+    if (!credentialExists) {
+      newCredentials.push(otherCredential);
+    }
+  });
+
+  Array.prototype.push.apply(this.credentials, newCredentials);
+};
+
+/**
+ * It's a simple operation, but it means that all the profile logic stays
+ * in this file.
+ * @param {string} appVersion  - ie "4.11.0"
+ */
+Profile.prototype.setAppVersion = function(appVersion) {
+  this.appVersion = appVersion;
+}
 
 Profile.prototype.setChecked = function(ua, walletId) {
   if (this.checkedUA != ua) {

src/js/services/configService.js

@@ -115,8 +115,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
 
     bitcoinAlias: 'btc',
     bitcoinCashAlias: 'bch',
-    bitcoinWalletColor: '#fab915', // Observatory
-    bitcoinCashWalletColor: '#26B03C', // Dollar Green
+    bitcoinWalletColor: '#535353', // Dark Grey
+    bitcoinCashWalletColor: '#eeb640', // Observatory
 
     homeSectionIsHidden: {
       services: false

src/js/services/desktopSecureStorageService.js

@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('copayApp.services').factory('desktopSecureStorageService', function($log) {
+  // Placeholder
+  return {};
+});

src/js/services/localStorage.js

@@ -20,8 +20,7 @@ angular.module('copayApp.services')
       if (isChromeApp || isNW) {
         chrome.storage.local.get(k,
           function(data) {
-            //TODO check for errors
-            return cb(null, data[k]);
+            return cb(chrome.runtime.lastError, data[k]);
           });
       } else {
         return cb(null, ls.getItem(k));
@@ -56,16 +55,24 @@ angular.module('copayApp.services')
 
         obj[k] = v;
 
-        chrome.storage.local.set(obj, cb);
+        chrome.storage.local.set(obj, function(){
+          cb(chrome.runtime.lastError);
+        });
       } else {
-        ls.setItem(k, v);
+        try {
+          ls.setItem(k, v);
+        } catch (e) {
+          return cb(e);
+        }
         return cb();
       }
     };
 
     root.remove = function(k, cb) {
       if (isChromeApp || isNW) {
-        chrome.storage.local.remove(k, cb);
+        chrome.storage.local.remove(k, function(){
+          cb(chrome.runtime.lastError);
+        });
       } else {
         ls.removeItem(k);
         return cb();

src/js/services/mobileSecureStorageService.js

@@ -0,0 +1,88 @@
+'use strict';
+
+angular.module('copayApp.services').factory('mobileSecureStorageService', function($log, appConfigService, platformInfo) {
+  var root = {};
+
+  var isReady = false;
+  var initialisationFailed = false;
+  var pending = [];
+  
+  var storage = null;
+
+  if (platformInfo.isCordova) {
+    storage = new cordova.plugins.SecureStorage(
+    function () {
+        isReady = true;
+        for (var i = 0; i < pending.length; i++) {
+          pending[i]();
+        }
+        pending = [];
+      },
+    function (error) { 
+      initialisationFailed = true;
+    },
+    appConfigService.packageNameId);
+  }
+
+  root.get = function(key, cb) {
+
+    if (!platformInfo.isMobile) {
+      cb(new Error('mobileSecureStorageService is only available on mobile.'));
+      return;
+    }
+
+    if (!isReady) {
+      if (initialisationFailed) {
+        cb(new Error('mobileSecureStorageService initialisation failed.'));
+      } else {
+        pending.push(function(){ root.get(key, cb); });
+      }
+      return;
+    }
+
+    storage.get(
+      function (value) { 
+        cb(null, value);
+      },
+      function (error) { 
+        $log.debug('mss get failed. ' + error);
+        if (error.message === 'Failure in SecureStorage.get() - The specified item could not be found in the keychain' || // iOS
+          error.message === 'Key [_SS_profile] not found.') { // Android
+          // The callback expects no error, but also no value, if it cannot be found.
+          cb(null, null);
+        } else {
+          cb(new Error(error));
+        }
+      },
+      key);
+  };
+
+  root.set = function(key, value, cb) {
+    
+    if (!platformInfo.isMobile) {
+      cb(new Error('mobileSecureStorageService is only available on mobile.'));
+    } 
+
+    if (!isReady) {
+      if (initialisationFailed) {
+        cb(new Error('mobileSecureStorageService initialisation failed.'));
+      } else {
+        pending.push(function(){ root.set(key, value, cb); });
+      }
+      return;
+    }
+
+    storage.set(
+      function (value) { 
+        cb();
+      },
+      function (error) { 
+        cb(new Error(error));
+      },
+      key, value);
+
+  };
+
+  return root;
+});
+

src/js/services/profileService.js

@@ -706,7 +706,7 @@ angular.module('copayApp.services')
       configService.get(function(err) {
         if (err) $log.debug(err);
 
-        var p = Profile.create();
+        var p = Profile.create(appConfigService.version);
         storageService.storeNewProfile(p, function(err) {
           if (err) return cb(err);
           root.bindProfile(p, function(err) {

src/js/services/rateService.spec.js

@@ -0,0 +1,53 @@
+describe('rateService', function() {
+  var $httpBackend, rateService, requestHandler;
+
+  beforeEach(function() {
+    module('ngLodash');
+    module('copayApp.services');
+
+    inject(function($injector){
+      $httpBackend = $injector.get('$httpBackend');
+
+      requestHandler = $httpBackend.when('GET', 'https://www.bitcoin.com/special/rates.json')
+                        .respond([
+                            {
+                                "code": "BTC",
+                                "name": "Bitcoin",
+                                "rate": 1
+                            },
+                            {
+                                "code": "BCH_BTC",
+                                "name": "Bitcoin Cash",
+                                "rate": 6.739397
+                            },
+                            {
+                                "code": "USD",
+                                "name": "US Dollar",
+                                "rate": 7602.04
+                            }
+                        ]);
+                
+      rateService = $injector.get('rateService');
+      
+      $httpBackend.flush();
+    });
+  });
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+
+  it('get rates', function() {
+
+    $httpBackend.expectGET('https://www.bitcoin.com/special/rates.json');
+
+    rateService.updateRates();
+
+    $httpBackend.flush();
+
+    var usdRate = rateService.getRate('USD');
+
+    expect(usdRate).toEqual(7602.04);
+  });
+});

src/js/services/secureStorageService.js

@@ -0,0 +1,32 @@
+'use strict';
+
+angular.module('copayApp.services').factory('secureStorageService', function(desktopSecureStorageService, localStorageService, $log, mobileSecureStorageService, platformInfo) {
+  var root = {};
+
+  // To make wrong code look wrong
+  function alteredKeyIndicatingDesireForSecureStorage(key) {
+    return key + ":desiredSecure";
+  }
+
+  root.get = function(k, cb) {
+    if (platformInfo.isMobile) {
+      mobileSecureStorageService.get(k, cb);
+    } else if (platformInfo.isNW) {
+      desktopSecureStorageService.get(k, cb);
+    } else { // Browser
+      localStorageService.get(alteredKeyIndicatingDesireForSecureStorage(k), cb);
+    }
+  }
+
+  root.set = function(k, v, cb) {
+    if (platformInfo.isMobile) {
+      mobileSecureStorageService.set(k, v, cb);
+    } else if (platformInfo.isNW) {
+      desktopSecureStorageService.set(k, v, cb);
+    } else { // Browser
+      localStorageService.set(alteredKeyIndicatingDesireForSecureStorage(k), v, cb);
+    }
+  }
+  
+  return root;
+});

src/js/services/secureStorageService.spec.js

@@ -0,0 +1,308 @@
+describe('secureStorageService in browser', function(){
+  var localStorage,
+    sss;
+
+  beforeEach(function(){
+    module('ngLodash');
+    module('copayApp.services');
+
+    localStorage = {
+      get: jasmine.createSpy(),
+      set: jasmine.createSpy()
+    };
+
+    platformInfoStub = {
+    };
+        
+    module(function($provide) {
+      $provide.value('localStorageService', localStorage);
+      $provide.value('platformInfo', platformInfoStub);
+    });
+
+    inject(function($injector){
+      sss = $injector.get('secureStorageService');
+    });
+
+  });
+
+  it('get fails', function() {
+    var error, key, result;
+
+    localStorage.get.and.callFake(function(k, cb){
+      key = k;
+      cb(new Error('Get error.'), null);
+    });
+
+    sss.get('a1234', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error.message).toBe('Get error.');
+    expect(result).toBeFalsy();
+    expect(key).toBe('a1234:desiredSecure');
+  });
+
+  it('get succeeds', function() {
+    var error, key, result;
+
+    localStorage.get.and.callFake(function(k, cb){
+      key = k;
+      cb(null, 'The result 1.');
+    });
+
+    sss.get('a123', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error).toBeFalsy();
+    expect(result).toBe('The result 1.');
+    expect(key).toBe('a123:desiredSecure');
+  });
+
+  it('set fails', function() {
+    var error, key, value;
+
+    localStorage.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(new Error('Set error.'));
+    });
+
+    sss.set('a12345', 'The value 1.', function(e) {
+      error = e;
+    });
+
+    expect(error.message).toBe('Set error.');
+    expect(key).toBe('a12345:desiredSecure');
+    expect(value).toBe('The value 1.');
+  });
+
+  it('set succeeds', function() {
+    var error, key, value;
+
+    localStorage.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(null);
+    });
+
+    sss.set('ab123', 'The value 2.', function(e) {
+      error = e;
+    });
+
+    expect(error).toBeFalsy();
+    expect(key).toBe('ab123:desiredSecure');
+    expect(value).toBe('The value 2.')
+  });
+
+});
+  
+
+describe('secureStorageService on desktop', function(){
+  var desktopSss,
+    sss;
+
+  beforeEach(function(){
+    module('ngLodash');
+    module('copayApp.services');
+
+    desktopSss = {
+      get: jasmine.createSpy(),
+      set: jasmine.createSpy()
+    };
+
+    platformInfoStub = {
+      isNW: true
+    };
+        
+    module(function($provide) {
+      $provide.value('desktopSecureStorageService', desktopSss);
+      $provide.value('platformInfo', platformInfoStub);
+    });
+
+    inject(function($injector){
+      sss = $injector.get('secureStorageService');
+    });
+
+  });
+
+  it('get fails', function() {
+    var error, key, result;
+
+    desktopSss.get.and.callFake(function(k, cb){
+      key = k;
+      cb(new Error('Get error.'), null);
+    });
+
+    sss.get('a1234', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error.message).toBe('Get error.');
+    expect(result).toBeFalsy();
+    expect(key).toBe('a1234');
+  });
+
+  it('get succeeds', function() {
+    var error, key, result;
+
+    desktopSss.get.and.callFake(function(k, cb){
+      key = k;
+      cb(null, 'The result 1.');
+    });
+
+    sss.get('a123', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error).toBeFalsy();
+    expect(result).toBe('The result 1.');
+    expect(key).toBe('a123');
+  });
+
+  it('set fails', function() {
+    var error, key, value;
+
+    desktopSss.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(new Error('Set error.'));
+    });
+
+    sss.set('a12345', 'The value 1.', function(e) {
+      error = e;
+    });
+
+    expect(error.message).toBe('Set error.');
+    expect(key).toBe('a12345');
+    expect(value).toBe('The value 1.');
+  });
+
+  it('set succeeds', function() {
+    var error, key, value;
+
+    desktopSss.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(null);
+    });
+
+    sss.set('ab123', 'The value 2.', function(e) {
+      error = e;
+    });
+
+    expect(error).toBeFalsy();
+    expect(key).toBe('ab123');
+    expect(value).toBe('The value 2.')
+  });
+
+});
+
+describe('secureStorageService on mobile', function(){
+  var mobileSss,
+    sss;
+
+  beforeEach(function(){
+    module('ngLodash');
+    module('copayApp.services');
+
+    mobileSss = {
+      get: jasmine.createSpy(),
+      set: jasmine.createSpy()
+    };
+
+    platformInfoStub = {
+      isMobile: true
+    };
+        
+    module(function($provide) {
+      $provide.value('mobileSecureStorageService', mobileSss);
+      $provide.value('platformInfo', platformInfoStub);
+    });
+
+    inject(function($injector){
+      sss = $injector.get('secureStorageService');
+    });
+
+  });
+
+  it('get fails', function() {
+    var error, key, result;
+
+    mobileSss.get.and.callFake(function(k, cb){
+      key = k;
+      cb(new Error('Get error.'), null);
+    });
+
+    sss.get('a1234', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error.message).toBe('Get error.');
+    expect(result).toBeFalsy();
+    expect(key).toBe('a1234');
+  });
+
+  it('get succeeds', function() {
+    var error, key, result;
+
+    mobileSss.get.and.callFake(function(k, cb){
+      key = k;
+      cb(null, 'The result 1.');
+    });
+
+    sss.get('a123', function(e, res) {
+      error = e;
+      result = res;
+    });
+
+    expect(error).toBeFalsy();
+    expect(result).toBe('The result 1.');
+    expect(key).toBe('a123');
+  });
+
+  it('set fails', function() {
+    var error, key, value;
+
+    mobileSss.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(new Error('Set error.'));
+    });
+
+    sss.set('a12345', 'The value 1.', function(e) {
+      error = e;
+    });
+
+    expect(error.message).toBe('Set error.');
+    expect(key).toBe('a12345');
+    expect(value).toBe('The value 1.');
+  });
+
+  it('set succeeds', function() {
+    var error, key, value;
+
+    mobileSss.set.and.callFake(function(k, v, cb){
+      key = k;
+      value = v;
+      cb(null);
+    });
+
+    sss.set('ab123', 'The value 2.', function(e) {
+      error = e;
+    });
+
+    expect(error).toBeFalsy();
+    expect(key).toBe('ab123');
+    expect(value).toBe('The value 2.')
+  });
+
+});
+
+
+  

src/js/services/storageService.js

@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('storageService', function(logHeader, fileStorageService, localStorageService, sjcl, $log, lodash, platformInfo, $timeout) {
+  .factory('storageService', function(appConfigService, logHeader, fileStorageService, localStorageService, sjcl, $log, lodash, platformInfo, secureStorageService, $timeout) {
 
     var root = {};
     var storage;
@@ -116,34 +116,138 @@ angular.module('copayApp.services')
     };
 
     root.storeNewProfile = function(profile, cb) {
-      storage.create('profile', profile.toObj(), cb);
+      root.storeProfile(profile, cb);
     };
 
     root.storeProfile = function(profile, cb) {
-      storage.set('profile', profile.toObj(), cb);
+      var profileString = profile.toObj();
+      if (platformInfo.isNW) {
+        storage.set('profile', profileString, cb);
+      } else {
+        secureStorageService.set('profile', profileString, cb);
+      }
     };
 
-    root.getProfile = function(cb) {
-      storage.get('profile', function(err, str) {
-        if (err || !str)
-          return cb(err);
+    /**
+     * @callback getProfileCallback
+     * @param {Error} error - falsy if profile not found.
+     * @param {Profile} profile - falsy if error or profile not found.
+     */
 
-        decryptOnMobile(str, function(err, str) {
-          if (err) return cb(err);
-          var p, err;
-          try {
-            p = Profile.fromString(str);
-          } catch (e) {
-            $log.debug('Could not read profile:', e);
-            err = new Error('Could not read profile:' + p);
+
+     /**
+      * @param {Error} error
+      * @param {String} profileStr - containing the profile
+      * @param {getProfileCallback} cb
+      */
+    function _onOldProfileRetrieved(error, profileStr, cb) {
+      if (error) {
+        return cb(error, null);
+      }
+
+      if (!profileStr) {
+        // No profiles found. No errors either.
+        return cb(null, null);
+      }
+
+      decryptOnMobile(profileStr, function(decryptErr, decryptedStr) {
+        if (decryptErr) return cb(decryptErr, null);
+        var profile;
+        try {
+          profile = Profile.fromString(decryptedStr);
+        } catch (e) {
+          $log.debug('Could not read profile:', e);
+          return(new Error('Could not read profile.'), null);
+        }
+        cb(null, profile)
+      });
+    }
+
+    
+
+    /**
+     * 
+     * @param {Profile} oldProfile
+     * @param {Profile} secureProfile - may be falsy if no secure profile found.
+     * @param {getProfileCallback} cb 
+     */
+    function _migrateProfiles(oldProfile, secureProfile, cb) {
+      var newProfile;
+
+      if (secureProfile) {
+        secureProfile.merge(oldProfile);
+        newProfile = secureProfile;
+      } else {
+        newProfile = oldProfile;
+        newProfile.setAppVersion(appConfigService.version);
+      }
+
+      root.storeNewProfile(newProfile, function(storeErr) {
+        if (storeErr) {
+          cb(storeErr, null);
+          return;
+        }
+
+        storage.remove('profile', function(removeErr){
+          if (removeErr) {
+            cb(removeErr, null);
+            return;
           }
-          return cb(err, p);
+
+          cb(null, newProfile);
         });
+
       });
     };
 
-    root.deleteProfile = function(cb) {
-      storage.remove('profile', cb);
+    /**
+     * 
+     * @param {getProfileCallback} cb 
+     */
+    root.getProfile = function(cb) {
+      if (platformInfo.isNW) {
+        storage.get('profile', function(getErr, getStr) {
+          _onOldProfileRetrieved(getErr, getStr, cb);
+          });
+          return
+      }
+
+      secureStorageService.get('profile', function(secureErr, secureStr) {
+        var secureProfile;
+        var oldProfile;
+
+        if (secureErr) {
+          return cb(secureErr, null);
+        }
+
+        if (secureStr) {
+          try {
+            secureProfile = Profile.fromString(secureStr);
+            $log.debug('profile: ' + JSON.stringify(secureProfile));
+          } catch (e) {
+            $log.error(e);
+            return cb(e, null);
+          }
+        }
+
+        storage.get('profile', function(getErr, getStr) {
+          _onOldProfileRetrieved(getErr, getStr, function(oldErr, oldProfile){
+          if (oldErr) {
+            return cb(oldErr, null);
+          }
+
+          if (!oldProfile) {
+            if (secureProfile) {
+              return cb(null, secureProfile);
+            } else {
+              // No profiles found. No errors either.
+              return cb(null, null);
+            }
+          }
+            _migrateProfiles(oldProfile, secureProfile, cb);
+          });
+        });
+      });
     };
 
     root.setFeedbackInfo = function(feedbackValues, cb) {

src/sass/icons.scss

@@ -40,7 +40,7 @@
     border-radius: $v-icon-border-radius;
     width: 40px;
     height: 40px;
-    box-shadow: $v-hovering-box-shadow;
+    box-shadow: 0px 0px 9px 0px rgba(0, 0, 0, 0.3);
     background-repeat:no-repeat;
     background-clip: padding-box;
     background-size: 103%;

src/sass/variables.scss

@@ -33,8 +33,8 @@ $v-wallet-color-map: (
    3: (color: #d0b136, name: 'Metallic Gold'),
    4: (color: #9edd72, name: 'Feijoa'),
    5: (color: #29bb9c, name: 'Shamrock'),
-   6: (color: #26B03C, name: 'Dollar Green'),
-   7: (color: #fab915, name: 'Observatory'),
+   6: (color: #eeb640, name: 'Light Orange'),
+   7: (color: #535353, name: 'Dark Grey'),
    8: (color: #77dada, name: 'Turquoise Blue'),
    9: (color: #4a90e2, name: 'Cornflower Blue'),
   10: (color: #484ed3, name: 'Free Speech Blue'),

src/sass/views/amount.scss

@@ -474,4 +474,10 @@
       }
     }
   }
+  background: #494949;
+
+  ion-content {
+    margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
+    margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */
+  }
 }

src/sass/views/confirm.scss

@@ -1,5 +1,5 @@
 #view-confirm {
-  background-color: #ffffff;
+  background-color: #494949;
   @extend .deflash-blue;
   .item-note {
     float: none;
@@ -30,4 +30,11 @@
   .toggle {
     cursor: pointer;
   }
+  ion-content {
+    background-color: #ffffff;
+  }
+  slide-to-accept, slide-to-accept-success {
+    margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
+    margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */
+  }
 }

src/sass/views/walletDetails.scss

@@ -131,6 +131,7 @@
   .bp-content {
     position: relative;
     height: 100%;
+    height: calc(100% - env(safe-area-inset-bottom) * 2);
 
     &.status-bar {
       margin-top: 20px;
@@ -157,6 +158,8 @@
 
     padding-top: 0;
     top: 0;
+    margin-bottom: 16px;
+
     .scroll {
       background: rgb(248, 248, 249);
       min-height: 300px;