From b10b64b2032e975853335eb94f4d9bfc6a9f7930 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 13 Mar 2017 15:28:50 +0100
Subject: [PATCH] - Join wizard: close modal after creating anonymous account -
fix #386 - Security wizard: do not allowed to revoke a anonymous account
---
www/i18n/locale-en-GB.json | 2 +-
www/i18n/locale-en.json | 2 +-
www/i18n/locale-fr-FR.json | 4 ++--
www/js/controllers/join-controllers.js | 7 ++++---
www/js/controllers/wallet-controllers.js | 4 +++-
www/js/services/wallet-services.js | 5 +++++
www/templates/wallet/slides/slides_revocation_1.html | 4 ++--
7 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 69b1526a3..dde1e8ec9 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -359,7 +359,7 @@
"COMPUTING_PUBKEY": "Computing...",
"LAST_SLIDE_CONGRATULATION": "You completed all required fields.<br/><b>You can send the account creation request</b>.<br/><br/>For information, the public key below identifies your future account.<br/>It can be communicated to third parties to receive their payment.<br/>Once your account has been approved, you can find this key under <b>{{'ACCOUNT.TITLE'|translate}}</b>.",
"CONFIRMATION_MEMBER_ACCOUNT": "<b class=\"assertive\">Warning:</b> your secret identifier, password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to send this account creation request?",
- "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Warning:</b> your password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to send this account creation request?",
+ "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Warning:</b> your password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to continue?",
"MSG_UID_ALREADY_USED": "This pseudonym is already used by an existing member.<br/>Please choose another one.",
"MSG_PUBKEY_ALREADY_USED": "Public key already used by an existing member.<br/>Please choose other connection parameters."
},
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 81c8517ad..081955fc4 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -359,7 +359,7 @@
"COMPUTING_PUBKEY": "Computing...",
"LAST_SLIDE_CONGRATULATION": "You completed all required fields.<br/><b>You can send the account creation request</b>.<br/><br/>For information, the public key below identifies your future account.<br/>It can be communicated to third parties to receive their payment.<br/>Once your account has been approved, you can find this key under <b>{{'ACCOUNT.TITLE'|translate}}</b>.",
"CONFIRMATION_MEMBER_ACCOUNT": "<b class=\"assertive\">Warning:</b> your secret identifier, password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to send this account creation request?",
- "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Warning:</b> your password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to send this account creation request?",
+ "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Warning:</b> your password and pseudonym can not be changed.<br/><b>Make sure you always remember it!</b><br/><b>Are you sure</b> you want to continue?",
"MSG_UID_ALREADY_USED": "This pseudonym is already used by an existing member.<br/>Please choose another one.",
"MSG_PUBKEY_ALREADY_USED": "Public key already used by an existing member.<br/>Please choose other connection parameters."
},
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 07a2fb2ae..bc51b2c17 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -358,8 +358,8 @@
"SLIDE_6_TITLE": "Confirmation :",
"COMPUTING_PUBKEY": "Calcul en cours...",
"LAST_SLIDE_CONGRATULATION": "<b>Bravo !</b> Vous avez saisi toutes les informations nécessaires.<br/><b>Vous pouvez envoyer la demande</b> de création de compte.</b><br/><br/>Pour information, la clé publique ci-dessous identifiera votre futur compte.<br/>Elle pourra être communiquée à des tiers pour recevoir leur paiement.<br/>Cependant, <b>il n'est pas utile</b> de la noter ici.",
- "CONFIRMATION_MEMBER_ACCOUNT": "<b class=\"assertive\">Avertissement :</b> vos identifiant secret, mot de passe et pseudonyme ne pourront plus être modifiés.<br/><b>Assurez-vous de toujours vous en rappeller !</b><br/><br/><b>Etes-vous sûr</b> de vouloir envoyer cette demande d'inscription ?",
- "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Avertissement :</b> vos identifiant secret et mot de passe ne pourront plus être modifiés.<br/><b>Assurez-vous de toujours vous en rappeller !</b><br/><br/><b>Etes-vous sûr</b> de vouloir envoyer cette demande d'inscription ?",
+ "CONFIRMATION_MEMBER_ACCOUNT": "<b class=\"assertive\">Avertissement :</b> l'identifiant secret, le mot de passe et le pseudonyme ne pourront plus être modifiés.<br/><b>Assurez-vous de toujours vous en rappeller !</b><br/><br/><b>Etes-vous sûr</b> de vouloir envoyer cette demande d'inscription ?",
+ "CONFIRMATION_WALLET_ACCOUNT": "<b class=\"assertive\">Avertissement :</b> l'identifiant secret et le mot de passe ne pourront plus être modifiés.<br/><b>Assurez-vous de toujours vous en rappeller !</b><br/><br/><b>Etes-vous sûr</b> de vouloir continuer avec ces identifiants ?",
"MSG_UID_ALREADY_USED": "Pseudonyme déjà utilisé par quelqu'un d'autre.<br/>Veuillez en choisir un autre.",
"MSG_PUBKEY_ALREADY_USED": "Clé publique déjà utilisée par quelqu'un d'autre.<br/>Veuillez choisir d'autres identifiants de connexion."
},
diff --git a/www/js/controllers/join-controllers.js b/www/js/controllers/join-controllers.js
index 46f5fc06e..ec1c7ca49 100644
--- a/www/js/controllers/join-controllers.js
+++ b/www/js/controllers/join-controllers.js
@@ -36,7 +36,7 @@ function JoinController($timeout, Modals) {
}
-function JoinModalController($scope, $state, UIUtils, CryptoUtils, Modals, csWallet, csCurrency, BMA) {
+function JoinModalController($scope, $state, UIUtils, CryptoUtils, csSettings, Modals, csWallet, csCurrency, BMA) {
'ngInject';
$scope.formData = {
@@ -133,8 +133,6 @@ function JoinModalController($scope, $state, UIUtils, CryptoUtils, Modals, csWa
}
}
}
-
-
};
$scope.doNewAccount = function(confirm) {
@@ -163,6 +161,9 @@ function JoinModalController($scope, $state, UIUtils, CryptoUtils, Modals, csWa
csWallet.login($scope.formData.username, $scope.formData.password)
.then(function() {
if (!$scope.formData.isMember) {
+ $scope.closeModal();
+ csSettings.data.wallet = csSettings.data.wallet || {};
+ csSettings.data.wallet.alertIfUnusedWallet = false; // do not alert if empty
// Redirect to wallet
$state.go('app.view_wallet');
return;
diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js
index 0b1284159..c9ae2f44b 100644
--- a/www/js/controllers/wallet-controllers.js
+++ b/www/js/controllers/wallet-controllers.js
@@ -638,7 +638,7 @@ function WalletTxErrorController($scope, UIUtils, csWallet) {
}
-function WalletSecurityModalController($scope, $rootScope, UIUtils, csWallet, $translate, CryptoUtils, $timeout){
+function WalletSecurityModalController($scope, $rootScope, UIUtils, csWallet, $translate, CryptoUtils){
$scope.slides = {
slider: null,
@@ -656,6 +656,8 @@ function WalletSecurityModalController($scope, $rootScope, UIUtils, csWallet, $t
$scope.isValidFile = false;
$scope.isLogin = csWallet.isLogin();
+ $scope.hasSelf = csWallet.hasSelf();
+
$scope.formData = {
addQuestion: '',
level: '4',
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index b3a10d2e8..602aa1d31 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -203,6 +203,10 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
return !!data.pubkey;
},
+ hasSelf = function() {
+ return !!data.pubkey && data.requirements && !data.requirements.needSelf;
+ },
+
isNeverUsed = function() {
if (!data.loaded) return undefined; // undefined if not full loaded
return !data.pubkey ||
@@ -1739,6 +1743,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
login: login,
logout: logout,
isLogin: isLogin,
+ hasSelf: hasSelf,
isNeverUsed: isNeverUsed,
isUserPubkey: isUserPubkey,
getData: getData,
diff --git a/www/templates/wallet/slides/slides_revocation_1.html b/www/templates/wallet/slides/slides_revocation_1.html
index e6d72fe15..8d76ac730 100644
--- a/www/templates/wallet/slides/slides_revocation_1.html
+++ b/www/templates/wallet/slides/slides_revocation_1.html
@@ -3,7 +3,7 @@
<h3 translate>ACCOUNT.SECURITY.REVOCATION</h3>
<div class="list">
<div class="item card item-icon-right stable-bg padding ink dark"
- ng-click="downloadRevokeFile()" ng-if="isLogin">
+ ng-click="downloadRevokeFile()" ng-if="isLogin && hasSelf">
<i class="icon ion-android-archive"></i>
<span ng-bind-html="'ACCOUNT.SECURITY.DOWNLOAD_REVOKE' | translate"></span>
</div>
@@ -13,7 +13,7 @@
<span ng-bind-html="'ACCOUNT.SECURITY.REVOKE_WITH_FILE' | translate"></span>
</div>
<div class="item card item-icon-right stable-bg padding ink dark"
- ng-click="revokeIdentity()" ng-if="isLogin">
+ ng-click="revokeIdentity()" ng-if="isLogin && hasSelf">
<i class="icon ion-minus-circled assertive"></i>
<span ng-bind-html="'ACCOUNT.SECURITY.DEFINITELY_REVOKE' | translate"></span>
</div>
--
GitLab