Skip to content
Snippets Groups Projects
Commit 7f208c19 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[enh] Login: allow plugin to stop the process (add extension point 'loginCheck')

[fix] Wot identity: add toast when message sent
parent dd1e8dfe
No related branches found
No related tags found
No related merge requests found
......@@ -136,11 +136,22 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
};
}
if (needLogin) {
// extend API to check login validity
return api.data.raisePromise.loginCheck(data)
.catch(function (err) {
resetData(); // Reset data if not valid, then exit process
throw err;
})
// Call extend api
.then(function() {
if (needLogin) {
return api.data.raisePromise.login(data);
}
});
}
})
.then(function() {
// store wallet if need
if (csSettings.data.useLocalStorage) {
......@@ -1609,7 +1620,8 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
// Register extension points
api.registerEvent('data', 'init');
api.registerEvent('data', 'login');
api.registerEvent('data', 'loginCheck'); // allow to stop the login process
api.registerEvent('data', 'login'); // executed after login check (cannot stop the login process)
api.registerEvent('data', 'auth');
api.registerEvent('data', 'unauth');
api.registerEvent('data', 'load');
......
......@@ -118,11 +118,19 @@
};
deferred.checkFinish = function() {
if (deferred.count < listenerCount) return;
deferred.count = 0;
if (deferred.errors.length) {
if (deferred.errors.length == 1) {
deferred.raw.reject(deferred.errors[0]);
}
else {
deferred.raw.reject(deferred.errors);
}
deferred.errors = [];
}
else {
deferred.raw.resolve(deferred.results);
deferred.results = [];
}
};
deferred.resolve = function(result) {
......
......@@ -76,6 +76,9 @@ function ESWotIdentityViewController($scope, $ionicPopover, $q, UIUtils, Modals,
return esModals.showMessageCompose({
destPub: $scope.formData.pubkey,
destUid: $scope.formData.name||$scope.formData.uid
})
.then(function(send) {
if (send) UIUtils.toast.show('MESSAGE.INFO.MESSAGE_SENT');
});
});
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment