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

login model adjustments

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-11 14:50:49 -04:00
parent 2ae21eef82
commit 1053491d28
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/dataModels.js
View File

@ -20,6 +20,8 @@ var LoginData = function (response, userId) {
this.organizationId = response.organizationId;
this.folderId = response.folderId;
this.userId = userId;
this.edit = response.edit;
this.organizationUseTotp = response.organizationUseTotp;
if (response instanceof LoginResponse) {
this.name = response.name;

2
src/models/domainModels.js
View File

@ -93,6 +93,8 @@ var Login = function (obj, alreadyEncrypted) {
this.organizationId = obj.organizationId ? obj.organizationId : null;
this.folderId = obj.folderId ? obj.folderId : null;
this.favorite = obj.favorite ? true : false;
this.organizationUseTotp = obj.organizationUseTotp ? true : false;
this.edit = obj.edit ? true : false;
if (alreadyEncrypted === true) {
this.name = obj.name ? obj.name : null;

2
src/popup/app/vault/vaultViewLoginController.js
View File

@ -39,7 +39,7 @@ angular
$scope.login.showLaunch = false;
}
if (model.totp) {
if (model.totp && (login.organizationUseTotp || false)) {
totpUpdateCode();
totpTick();