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

null or empty on password changed checks

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-30 16:40:16 -04:00
parent 557b2fc3f0
commit cfa4664b31
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/cipher.service.ts
View File

@ -70,7 +70,8 @@ export class CipherService implements CipherServiceAbstraction {
if (existingCipher != null) { if (existingCipher != null) {
model.passwordHistory = existingCipher.passwordHistory || []; model.passwordHistory = existingCipher.passwordHistory || [];
if (model.type === CipherType.Login && existingCipher.type === CipherType.Login) { if (model.type === CipherType.Login && existingCipher.type === CipherType.Login) {
if (existingCipher.login.password !== model.login.password) { if (existingCipher.login.password != null && existingCipher.login.password !== '' &&
existingCipher.login.password !== model.login.password) {
const ph = new PasswordHistoryView(); const ph = new PasswordHistoryView();
ph.password = existingCipher.login.password; ph.password = existingCipher.login.password;
ph.lastUsedDate = model.login.passwordRevisionDate = new Date(); ph.lastUsedDate = model.login.passwordRevisionDate = new Date();
@ -80,9 +81,10 @@ export class CipherService implements CipherServiceAbstraction {
} }
} }
if (existingCipher.hasFields) { if (existingCipher.hasFields) {
const existingHiddenFields = existingCipher.fields.filter((f) => f.type === FieldType.Hidden); const existingHiddenFields = existingCipher.fields.filter((f) => f.type === FieldType.Hidden &&
f.name != null && f.name !== '' && f.value != null && f.value !== '');
const hiddenFields = model.fields == null ? [] : const hiddenFields = model.fields == null ? [] :
model.fields.filter((f) => f.type === FieldType.Hidden); model.fields.filter((f) => f.type === FieldType.Hidden && f.name != null && f.name !== '');
existingHiddenFields.forEach((ef) => { existingHiddenFields.forEach((ef) => {
const matchedField = hiddenFields.filter((f) => f.name === ef.name); const matchedField = hiddenFields.filter((f) => f.name === ef.name);
if (matchedField.length === 0 || matchedField[0].value !== ef.value) { if (matchedField.length === 0 || matchedField[0].value !== ef.value) {