bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 22:33:35 +00:00
Code Issues Releases Wiki Activity

react to two factor changes in auth apis

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-24 22:20:52 -05:00
parent a55a70564f
commit 4057c478c6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/models/api/requestModels.js
View File

@@ -12,10 +12,10 @@ var FolderRequest = function (folder) {
this.name = folder.name ? folder.name.encryptedString : null; this.name = folder.name ? folder.name.encryptedString : null;
}; };
var TokenRequest = function (email, masterPasswordHash, code, device) { var TokenRequest = function (email, masterPasswordHash, token, device) {
this.email = email; this.email = email;
this.masterPasswordHash = masterPasswordHash; this.masterPasswordHash = masterPasswordHash;
this.code = code; this.token = token;
this.provider = 'Authenticator'; this.provider = 'Authenticator';
this.device = null; this.device = null;
if (device) { if (device) {
@@ -38,8 +38,8 @@ var TokenRequest = function (email, masterPasswordHash, code, device) {
obj.devicePushToken = this.device.pushToken; obj.devicePushToken = this.device.pushToken;
} }
if (this.code && this.provider) { if (this.token && this.provider) {
obj.twoFactorCode = this.code; obj.twoFactorToken = this.token;
obj.twoFactorProvider = this.provider; obj.twoFactorProvider = this.provider;
} }

4
src/popup/app/services/authService.js
View File

@@ -5,12 +5,12 @@
folderService, settingsService, syncService) { folderService, settingsService, syncService) {
var _service = {}; var _service = {};
_service.logIn = function (email, masterPassword, twoFactorCode) { _service.logIn = function (email, masterPassword, twoFactorToken) {
email = email.toLowerCase(); email = email.toLowerCase();
var key = cryptoService.makeKey(masterPassword, email); var key = cryptoService.makeKey(masterPassword, email);
var deferred = $q.defer(); var deferred = $q.defer();
cryptoService.hashPassword(masterPassword, key, function (hashedPassword) { cryptoService.hashPassword(masterPassword, key, function (hashedPassword) {
var request = new TokenRequest(email, hashedPassword, twoFactorCode); var request = new TokenRequest(email, hashedPassword, twoFactorToken);
apiService.postIdentityToken(request, function (response) { apiService.postIdentityToken(request, function (response) {
// success // success