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

rebuild tokenrequest obj on login api

Browse Source
This commit is contained in:
Kyle Spearrin 2017-09-06 15:52:06 -04:00
parent fbb9ae38d5
commit ff0fde161e
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,31 +24,31 @@ var TokenRequest = function (email, masterPasswordHash, provider, token, remembe
if (device) { if (device) {
this.device = device; this.device = device;
} }
};
this.toIdentityToken = function () { TokenRequest.prototype.toIdentityToken = function () {
var obj = { var obj = {
grant_type: 'password', grant_type: 'password',
username: this.email, username: this.email,
password: this.masterPasswordHash, password: this.masterPasswordHash,
scope: 'api offline_access', scope: 'api offline_access',
client_id: 'browser' client_id: 'browser'
};
if (this.device) {
obj.deviceType = this.device.type;
obj.deviceIdentifier = this.device.identifier;
obj.deviceName = this.device.name;
obj.devicePushToken = this.device.pushToken;
}
if (this.token && this.provider !== null && (typeof this.provider !== 'undefined')) {
obj.twoFactorToken = this.token;
obj.twoFactorProvider = this.provider;
obj.twoFactorRemember = this.remember ? '1' : '0';
}
return obj;
}; };
if (this.device) {
obj.deviceType = this.device.type;
obj.deviceIdentifier = this.device.identifier;
obj.deviceName = this.device.name;
obj.devicePushToken = this.device.pushToken;
}
if (this.token && this.provider !== null && (typeof this.provider !== 'undefined')) {
obj.twoFactorToken = this.token;
obj.twoFactorProvider = this.provider;
obj.twoFactorRemember = this.remember ? '1' : '0';
}
return obj;
}; };
var RegisterRequest = function (email, masterPasswordHash, masterPasswordHint, key) { var RegisterRequest = function (email, masterPasswordHash, masterPasswordHint, key) {

4
src/services/apiService.js
View File

@ -55,6 +55,10 @@ function initApiService() {
ApiService.prototype.postIdentityToken = function (tokenRequest, success, successWithTwoFactor, error) { ApiService.prototype.postIdentityToken = function (tokenRequest, success, successWithTwoFactor, error) {
var self = this; var self = this;
// Hack for Edge. For some reason tokenRequest loses proto. Rebuild it here.
tokenRequest = new TokenRequest(tokenRequest.email, tokenRequest.masterPasswordHash, tokenRequest.provider,
tokenRequest.token, tokenRequest.remeber, tokenRequest.device);
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: self.identityBaseUrl + '/connect/token', url: self.identityBaseUrl + '/connect/token',