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

adding verification option to passphrase on join wallet

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-22 17:30:24 -03:00
commit 399edf0291
2 changed files with 103 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

107
src/js/controllers/join.js
View file

@ -3,57 +3,74 @@
angular.module('copayApp.controllers').controller('joinController', angular.module('copayApp.controllers').controller('joinController',
function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) { function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettextCatalog, lodash, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService, appConfigService) {
var self = this; $scope.init = function() {
var defaults = configService.getDefaults(); var defaults = configService.getDefaults();
$scope.bwsurl = defaults.bws.url; $scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default; $scope.derivationPath = derivationPathHelper.default;
$scope.account = 1; $scope.account = 1;
$scope.formData = {};
resetPasswordFields();
updateSeedSourceSelect();
$scope.setSeedSource();
};
$scope.showAdvChange = function() { $scope.showAdvChange = function() {
$scope.showAdv = !$scope.showAdv; $scope.showAdv = !$scope.showAdv;
$scope.encrypt = null;
$scope.resizeView(); $scope.resizeView();
}; };
$scope.checkPassword = function(pw1, pw2) {
if (pw1 && pw1.length > 0) {
if (pw2 && pw2.length > 0) {
if (pw1 == pw2) $scope.result = 'correct';
else {
$scope.formData.passwordSaved = null;
$scope.result = 'incorrect';
}
} else
$scope.result = null;
} else
$scope.result = null;
};
$scope.resizeView = function() { $scope.resizeView = function() {
$timeout(function() { $timeout(function() {
$ionicScrollDelegate.resize(); $ionicScrollDelegate.resize();
}, 10); }, 10);
checkPasswordFields(); resetPasswordFields();
}; };
function checkPasswordFields() { function resetPasswordFields() {
if (!$scope.encrypt) { $scope.formData.passphrase = $scope.formData.createPassphrase = $scope.formData.passwordSaved = $scope.formData.repeatpassword = $scope.result = null;
$scope.passphrase = $scope.createPassphrase = $scope.passwordSaved = null; $timeout(function() {
$timeout(function() { $scope.$apply();
$scope.$apply(); });
});
}
}; };
this.onQrCodeScannedJoin = function(data) { $scope.onQrCodeScannedJoin = function(data) {
$scope.secret = data; $scope.secret = data;
if ($scope.joinForm) { if ($scope.formData) {
$scope.joinForm.secret.$setViewValue(data); $scope.formData.secret.$setViewValue(data);
$scope.joinForm.secret.$render(); $scope.formData.secret.$render();
} }
}; };
if ($stateParams.url) { if ($stateParams.url) {
var data = $stateParams.url; var data = $stateParams.url;
data = data.replace('copay:', ''); data = data.replace('copay:', '');
this.onQrCodeScannedJoin(data); $scope.onQrCodeScannedJoin(data);
} }
var updateSeedSourceSelect = function() { function updateSeedSourceSelect() {
self.seedOptions = [{ $scope.seedOptions = [{
id: 'new', id: 'new',
label: gettextCatalog.getString('Random'), label: gettextCatalog.getString('Random'),
}, { }, {
id: 'set', id: 'set',
label: gettextCatalog.getString('Specify Recovery Phrase...'), label: gettextCatalog.getString('Specify Recovery Phrase...'),
}]; }];
$scope.seedSource = self.seedOptions[0]; $scope.seedSource = $scope.seedOptions[0];
/* /*
Disable Hardware Wallets Disable Hardware Wallets
@ -62,21 +79,21 @@ angular.module('copayApp.controllers').controller('joinController',
if (appConfigService.name == 'copay') { if (appConfigService.name == 'copay') {
if (walletService.externalSource.ledger.supported) { if (walletService.externalSource.ledger.supported) {
self.seedOptions.push({ $scope.seedOptions.push({
id: walletService.externalSource.ledger.id, id: walletService.externalSource.ledger.id,
label: walletService.externalSource.ledger.longName label: walletService.externalSource.ledger.longName
}); });
} }
if (walletService.externalSource.trezor.supported) { if (walletService.externalSource.trezor.supported) {
self.seedOptions.push({ $scope.seedOptions.push({
id: walletService.externalSource.trezor.id, id: walletService.externalSource.trezor.id,
label: walletService.externalSource.trezor.longName label: walletService.externalSource.trezor.longName
}); });
} }
if (walletService.externalSource.intelTEE.supported) { if (walletService.externalSource.intelTEE.supported) {
seedOptions.push({ $scope.seedOptions.push({
id: walletService.externalSource.intelTEE.id, id: walletService.externalSource.intelTEE.id,
label: walletService.externalSource.intelTEE.longName label: walletService.externalSource.intelTEE.longName
}); });
@ -84,35 +101,36 @@ angular.module('copayApp.controllers').controller('joinController',
} }
}; };
this.setSeedSource = function() { $scope.setSeedSource = function() {
self.seedSourceId = $scope.seedSource.id; $scope.seedSourceId = $scope.seedSource.id;
$timeout(function() { $timeout(function() {
$rootScope.$apply(); $rootScope.$apply();
}); });
}; };
this.join = function(form) { $scope.join = function() {
if (form && form.$invalid) {
if ($scope.formData && $scope.formData.$invalid) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Please enter the required fields'));
return; return;
} }
var opts = { var opts = {
secret: form.secret.$modelValue, secret: $scope.formData.secret.$modelValue,
myName: form.myName.$modelValue, myName: $scope.formData.myName.$modelValue,
bwsurl: $scope.bwsurl bwsurl: $scope.bwsurl
} }
var setSeed = self.seedSourceId == 'set'; var setSeed = $scope.seedSourceId == 'set';
if (setSeed) { if (setSeed) {
var words = form.privateKey.$modelValue; var words = $scope.formData.privateKey.$modelValue;
if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) { if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
opts.extendedPrivateKey = words; opts.extendedPrivateKey = words;
} else { } else {
opts.mnemonic = words; opts.mnemonic = words;
} }
opts.passphrase = form.passphrase.$modelValue; opts.passphrase = $scope.formData.passphrase ? $scope.formData.passphrase.$modelValue : null;
var pathData = derivationPathHelper.parse($scope.derivationPath); var pathData = derivationPathHelper.parse($scope.derivationPath);
if (!pathData) { if (!pathData) {
@ -123,7 +141,7 @@ angular.module('copayApp.controllers').controller('joinController',
opts.networkName = pathData.networkName; opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy; opts.derivationStrategy = pathData.derivationStrategy;
} else { } else {
opts.passphrase = form.createPassphrase.$modelValue; opts.passphrase = $scope.formData.createPassphrase ? $scope.formData.createPassphrase.$modelValue : null;
} }
opts.walletPrivKey = $scope._walletPrivKey; // Only for testing opts.walletPrivKey = $scope._walletPrivKey; // Only for testing
@ -134,22 +152,22 @@ angular.module('copayApp.controllers').controller('joinController',
return; return;
} }
if (self.seedSourceId == walletService.externalSource.ledger.id || self.seedSourceId == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id) { if ($scope.seedSourceId == walletService.externalSource.ledger.id || $scope.seedSourceId == walletService.externalSource.trezor.id || $scope.seedSourceId == walletService.externalSource.intelTEE.id) {
var account = $scope.account; var account = $scope.account;
if (!account || account < 1) { if (!account || account < 1) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number'));
return; return;
} }
if (self.seedSourceId == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id) if ($scope.seedSourceId == walletService.externalSource.trezor.id || $scope.seedSourceId == walletService.externalSource.intelTEE.id)
account = account - 1; account = account - 1;
opts.account = account; opts.account = account;
opts.isMultisig = true; opts.isMultisig = true;
ongoingProcess.set('connecting' + self.seedSourceId, true); ongoingProcess.set('connecting' + $scope.seedSourceId, true);
var src; var src;
switch (self.seedSourceId) { switch ($scope.seedSourceId) {
case walletService.externalSource.ledger.id: case walletService.externalSource.ledger.id:
src = ledger; src = ledger;
break; break;
@ -166,21 +184,21 @@ angular.module('copayApp.controllers').controller('joinController',
// TODO: cannot currently join an intelTEE testnet wallet (need to detect from the secret) // TODO: cannot currently join an intelTEE testnet wallet (need to detect from the secret)
src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) { src.getInfoForNewWallet(true, account, 'livenet', function(err, lopts) {
ongoingProcess.set('connecting' + self.seedSourceId, false); ongoingProcess.set('connecting' + $scope.seedSourceId, false);
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err); popupService.showAlert(gettextCatalog.getString('Error'), err);
return; return;
} }
opts = lodash.assign(lopts, opts); opts = lodash.assign(lopts, opts);
self._join(opts); _join(opts);
}); });
} else { } else {
self._join(opts); _join(opts);
} }
}; };
this._join = function(opts) { function _join(opts) {
ongoingProcess.set('joiningWallet', true); ongoingProcess.set('joiningWallet', true);
$timeout(function() { $timeout(function() {
profileService.joinWallet(opts, function(err, client) { profileService.joinWallet(opts, function(err, client) {
@ -207,7 +225,4 @@ angular.module('copayApp.controllers').controller('joinController',
}); });
}); });
}; };
updateSeedSourceSelect();
self.setSeedSource();
}); });

62
www/views/join.html
View file

@ -6,9 +6,9 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content ng-controller="joinController as join"> <ion-content ng-controller="joinController" ng-init="init()">
<form name="joinForm" ng-submit="join.join(joinForm)" novalidate> <form name="formData" ng-submit="join()" novalidate>
<div class="list settings-list settings-input-group"> <div class="list settings-list settings-input-group">
@ -25,8 +25,8 @@
<label class="item item-input item-stacked-label no-border"> <label class="item item-input item-stacked-label no-border">
<span class="input-label" translate>Wallet Invitation</span> <span class="input-label" translate>Wallet Invitation</span>
<div class="input-notification"> <div class="input-notification">
<i ng-show="!joinForm.secret.$invalid" class="icon ion-checkmark-circled valid"></i> <i ng-show="!formData.secret.$invalid" class="icon ion-checkmark-circled valid"></i>
<i ng-show="joinForm.secret.$invalid && secret" class="icon ion-close-circled invalid"></i> <i ng-show="formData.secret.$invalid && secret" class="icon ion-close-circled invalid"></i>
</div> </div>
<input id="secret" <input id="secret"
type="text" type="text"
@ -36,7 +36,7 @@
wallet-secret required> wallet-secret required>
</label> </label>
<div class="qr-scan-icon"> <div class="qr-scan-icon">
<qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScannedJoin(data)"></qr-scanner> <qr-scanner class="qr-icon size-24" on-scan="onQrCodeScannedJoin(data)"></qr-scanner>
</div> </div>
</div> </div>
<div class="item item-divider"></div> <div class="item item-divider"></div>
@ -59,18 +59,18 @@
</div> </div>
<select class="m10t" <select class="m10t"
ng-model="seedSource" ng-model="seedSource"
ng-options="seed as seed.label for seed in join.seedOptions" ng-options="seed as seed.label for seed in seedOptions"
ng-change="join.setSeedSource()"> ng-change="setSeedSource(); resizeView()">
</select> </select>
</label> </label>
<label class="item item-input item-stacked-label" <label class="item item-input item-stacked-label"
ng-show="join.seedSourceId == 'trezor' || join.seedSourceId == 'ledger'"> ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
<span class="input-label" translate>Account Number</span> <span class="input-label" translate>Account Number</span>
<input type="number" id="account" ng-model="account" ignore-mouse-wheel> <input type="number" id="account" ng-model="account" ignore-mouse-wheel>
</label> </label>
<label class="item item-input item-stacked-label" ng-show="join.seedSourceId=='set'"> <label class="item item-input item-stacked-label" ng-show="seedSourceId=='set'">
<span class="input-label" translate>Wallet Recovery Phrase</span> <span class="input-label" translate>Wallet Recovery Phrase</span>
<input id="ext-master" <input id="ext-master"
placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}" placeholder="{{'Enter the recovery phrase (BIP39)'|translate}}"
@ -80,39 +80,61 @@
ng-model="privateKey"> ng-model="privateKey">
</label> </label>
<ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="join.seedSourceId == 'new' || join.seedSourceId == 'set'"> <ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSourceId == 'new' || seedSourceId == 'set'">
<span class="toggle-label" translate>Add a password</span> <span class="toggle-label" translate>Add a password</span>
</ion-toggle> </ion-toggle>
<div class="comment"> <div class="comment">
<span ng-show="join.seedSourceId == 'new'" translate>Add an optional password to secure the recovery phrase</span> <span ng-show="seedSourceId == 'new'" translate>Add an optional password to secure the recovery phrase</span>
<span ng-show="join.seedSourceId == 'set'" translate>The recovery phrase could require a password to be imported</span> <span ng-show="seedSourceId == 'set'" translate>The recovery phrase could require a password to be imported</span>
</div> </div>
<div class="item item-input" ng-show="encrypt"> <div class="item item-input" ng-show="encrypt">
<input ng-show="join.seedSourceId == 'new'" <input ng-show="seedSourceId == 'new'"
placeholder="{{'Password'|translate}}" placeholder="{{'Password'|translate}}"
type="password" type="password"
autocapitalize="off" autocapitalize="off"
name="createPassphrase" name="createPassphrase"
ng-model="createPassphrase"> ng-model="formData.createPassphrase"
ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
<input ng-show="join.seedSourceId == 'set'" <input ng-show="seedSourceId == 'set'"
placeholder="{{'Password'|translate}}" placeholder="{{'Password'|translate}}"
type="password" type="password"
autocapitalize="off" autocapitalize="off"
name="passphrase" name="passphrase"
ng-model="passphrase"> ng-model="formData.passphrase"
ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
</div> </div>
<div class="text-center box-notification error" ng-show="(join.seedSourceId =='new' || join.seedSourceId =='set') && encrypt"> <div class="item item-input" ng-show="encrypt">
<input ng-show="seedSource.id == 'new'"
placeholder="{{'Repeat password'|translate}}"
type="password"
autocapitalize="off"
ng-model="formData.repeatpassword"
ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
<input ng-show="seedSource.id == 'set'"
placeholder="{{'Repeat password'|translate}}"
type="password"
autocapitalize="off"
ng-model="formData.repeatpassword"
ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
</div>
<div class="text-center box-notification error" ng-show="(seedSourceId =='new' || seedSourceId =='set') && encrypt">
<strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong> <strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
</div> </div>
<ion-checkbox ng-model="passwordSaved" class="checkbox-positive" ng-show="encrypt"> <ion-checkbox ng-model="passwordSaved" class="checkbox-positive" ng-show="encrypt && result == 'correct'">
<span class="toggle-label" translate>I have written it down</span> <span class="toggle-label" translate>I have written it down</span>
</ion-checkbox> </ion-checkbox>
<label class="item item-input item-stacked-label" ng-show="join.seedSourceId == 'set'"> <label class="item item-input item-stacked-label" ng-show="seedSourceId == 'set'">
<span class="input-label" translate>Derivation Path</span> <span class="input-label" translate>Derivation Path</span>
<input type="text" <input type="text"
placeholder="{{'BIP32 path for address derivation'|translate}}" placeholder="{{'BIP32 path for address derivation'|translate}}"
@ -124,7 +146,7 @@
</div> <!-- list --> </div> <!-- list -->
<button type="submit" class="button button-standard button-primary" <button type="submit" class="button button-standard button-primary"
ng-disabled="joinForm.$invalid || ((encrypt && !passwordSaved) || encrypt && ((join.seedSourceId == 'new' && !createPassphrase) || (join.seedSourceId == 'set' && !passphrase)))" ng-disabled="formData.$invalid || ((encrypt && !passwordSaved) || encrypt && ((seedSourceId == 'new' && !formData.createPassphrase) || (seedSourceId == 'set' && !formData.passphrase)))"
translate>Join translate>Join
</button> </button>
</form> </form>