Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

error handling for no payment method

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-28 16:44:36 -04:00
parent 96b8467859
commit f944910975
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/directives/apiFormDirective.js
View File

@ -31,7 +31,12 @@ angular
}, function failure(reason) { }, function failure(reason) {
$timeout(function () { $timeout(function () {
form.$loading = false; form.$loading = false;
validationService.addErrors(form, reason); if (typeof reason === 'string') {
validationService.addError(form, null, reason, true);
}
else {
validationService.addErrors(form, reason);
}
scope.$broadcast('show-errors-check-validity'); scope.$broadcast('show-errors-check-validity');
$('html, body').animate({ scrollTop: 0 }, 200); $('html, body').animate({ scrollTop: 0 }, 200);
}); });

8
src/app/settings/settingsPremiumController.js
View File

@ -56,12 +56,18 @@
$scope.submit = function (model) { $scope.submit = function (model) {
$scope.submitPromise = getPaymentToken(model).then(function (token) { $scope.submitPromise = getPaymentToken(model).then(function (token) {
if (!token) {
throw 'No payment token.';
}
var request = { var request = {
paymentToken: token, paymentToken: token,
additionalStorageGb: model.additionalStorageGb additionalStorageGb: model.additionalStorageGb
}; };
return apiService.accounts.postPremium(request).$promise; return apiService.accounts.postPremium(request).$promise;
}, function (err) {
throw err;
}).then(function (result) { }).then(function (result) {
return authService.updateProfilePremium(true); return authService.updateProfilePremium(true);
}).then(function () { }).then(function () {
@ -78,6 +84,8 @@
if ($scope.paymentMethod === 'paypal') { if ($scope.paymentMethod === 'paypal') {
return btInstance.requestPaymentMethod().then(function (payload) { return btInstance.requestPaymentMethod().then(function (payload) {
return payload.nonce; return payload.nonce;
}).catch(function (err) {
throw err.message;
}); });
} }
else { else {