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

fixes

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-26 09:35:30 -04:00
parent d879518233
commit d4759d4056
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/organization/organizationBillingController.js
View File

@ -138,7 +138,8 @@
cancelledDate: org.Subscription.CancelledDate,
status: org.Subscription.Status,
cancelled: org.Subscription.Status === 'cancelled',
markedForCancel: org.Subscription.Status === 'active' && org.Subscription.CancelledDate
markedForCancel: (org.Subscription.Status === 'active' || org.Subscription.Status === 'trialing') &&
org.Subscription.CancelledDate
};
}

4
src/app/settings/settingsChangeEmailController.js
View File

@ -24,7 +24,9 @@
// User is not using an enc key, let's make them one
$scope.tokenPromise = cipherService.updateKey(_masterPasswordHash, function () {
return requestToken();
}, processError);
}, function (err) {
toastr.error('Something went wrong.', 'Oh No!');
});
}
});
};

6
src/app/settings/settingsChangePasswordController.js
View File

@ -33,9 +33,11 @@
// User is not using an enc key, let's make them one
$scope.savePromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
return cipherService.updateKey(hash);
}, processError).then(function () {
}).then(function () {
return changePassword(model);
}, processError);
}, function (err) {
toastr.error('Something went wrong.', 'Oh No!');
});
}
};