anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Refactored to have the mobile and desktop secure storage contained with a more generic secure storage service.

Browse source
This commit is contained in:
Brendon Duncan 2018-06-01 10:19:26 +12:00
commit aaad6a1b4a
4 changed files with 118 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app-template/config-template.xml
View file

@ -72,7 +72,8 @@
<plugin name="cordova-plugin-queries-schemes" spec="~0.1.5" />
<plugin name="cordova-plugin-firebase" spec="https://github.com/arnesson/cordova-plugin-firebase.git" />
<plugin name="cordova-plugin-wkwebview-inputfocusfix" spec="https://github.com/onderceylan/cordova-plugin-wkwebview-inputfocusfix.git" />
<plugin name="cordova-plugin-secure-storage" spec="~2.6.8" />
<!-- Changes in error descriptions may break the use of cordova-plugin-secure-storage -->
<plugin name="cordova-plugin-secure-storage" spec="2.6.8" />
<!-- Supported Platforms -->
<engine name="ios" spec="~4.5.3" />
<engine name="android" spec="~6.3.0" />

93
src/js/services/mobileSecureStorageService.js Normal file
View file

@ -0,0 +1,93 @@
'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;
this.get = function(key, cb) {
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) {
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);
}
this.set = function(key, value, cb) {
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);
}
if (platformInfo.isCordova) {
storage = new cordova.plugins.SecureStorage(
function () {
$log.debug('mobileSecureStorageService initialised.');
isReady = true;
for (var i = 0; i < pending.length; i++) {
pending[i]();
}
pending = [];
},
function (error) {
c$log.debug('mobileSecureStorageService initialisation failed. ' + error);
initialisationFailed = true;
},
appConfigService.packageNameId);
}
root.get = function(key, cb) {
if (platformInfo.isMobile) {
storage.get(key, cb);
} else {
cb(new Error('mobileSecureStorageService is only available on mobile.'));
}
};
root.set = function(key, value, cb) {
if (platformInfo.isMobile) {
storage.set(key, v, cb);
} else {
cb(new Error('mobileSecureStorageService is only available on mobile.'));
}
};
return root;
});

108
src/js/services/secureStorageService.js
View file

@ -1,92 +1,32 @@
'use strict';
angular.module('copayApp.services').factory('secureStorageService', function($log, appConfigService, platformInfo) {
angular.module('copayApp.services').factory('secureStorageService', function(desktopSecureStorageService, localStorageService, $log, mobileSecureStorageService, platformInfo) {
var root = {};
function CordovaSs() {
var isReady = false;
var initialisationFailed = false;
var pending = [];
var storage = null;
this.get = function(key, cb) {
if (!isReady) {
if (initialisationFailed) {
cb(new Error("Secure storage initialisation failed."));
} else {
pending.push(function(){ root.get(key, cb); });
}
return
}
storage.get(
function (value) {
cb(null, value);
},
function (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);
} else {
cb(new Error(error));
}
},
key);
}
this.set = function(key, value, cb) {
if (!isReady) {
if (initialisationFailed) {
cb(new Error("Secure storage 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);
}
if (platformInfo.isCordova) {
storage = new cordova.plugins.SecureStorage(
function () {
console.log('ss Success');
isReady = true;
for (var i = 0; i < pending.length; i++) {
pending[i]();
}
spending = [];
},
function (error) {
console.log('ss Error ' + error);
initialisationFailed = true;
},
appConfigService.packageNameId);
}
// To make wrong code look wrong
function alteredKeyIndicatingDesireForSecureStorage(key) {
return key + ":desiredSecure";
}
var cordovaSs = new CordovaSs();
root.get = function(key, cb) {
cordovaSs.get(key, cb);
};
root.set = function(key, value, cb) {
cordovaSs.set(key, value, cb);
};
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;
});
});

2
src/js/services/storageService.js
View file

@ -126,7 +126,7 @@ angular.module('copayApp.services')
};
root.getProfile = function(cb) {
$log.debug("getProfile() 31 7");
$log.debug("getProfile() 1 8");
//storage.get('profile', function(err, str) {
secureStorageService.get('profile', function(err, str) {