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

code cleanup (#6238)

Browse Source
This commit is contained in:
Jonathan Prusik 2023-09-20 16:09:32 -04:00 committed by GitHub
parent 8c06508435
commit 014b32b488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/common/src/vault/services/cipher.service.ts
View File

@ -398,14 +398,21 @@ export class CipherService implements CipherServiceAbstraction {
defaultMatch ??= await this.stateService.getDefaultUriMatch(); defaultMatch ??= await this.stateService.getDefaultUriMatch();
return ciphers.filter((cipher) => { return ciphers.filter((cipher) => {
if (cipher.deletedDate != null) { const cipherIsLogin = cipher.type === CipherType.Login && cipher.login !== null;
if (cipher.deletedDate !== null) {
return false; return false;
} }
if (includeOtherTypes != null && includeOtherTypes.indexOf(cipher.type) > -1) {
if (
Array.isArray(includeOtherTypes) &&
includeOtherTypes.includes(cipher.type) &&
!cipherIsLogin
) {
return true; return true;
} }
if (cipher.type === CipherType.Login && cipher.login !== null) { if (cipherIsLogin) {
return cipher.login.matchesUri(url, equivalentDomains, defaultMatch); return cipher.login.matchesUri(url, equivalentDomains, defaultMatch);
} }