devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

allow ciphers to be passed into search service

This commit is contained in:
Kyle Spearrin 2018-08-16 23:32:37 -04:00
parent f16fc58d70
commit 9ba3c17626
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/abstractions/search.service.ts
View File

@ -4,6 +4,7 @@ export abstract class SearchService {
clearIndex: () => void; clearIndex: () => void;
isSearchable: (query: string) => boolean; isSearchable: (query: string) => boolean;
indexCiphers: () => Promise<void>; indexCiphers: () => Promise<void>;
searchCiphers: (query: string, filter?: (cipher: CipherView) => boolean) => Promise<CipherView[]>; searchCiphers: (query: string, filter?: (cipher: CipherView) => boolean,
ciphers?: CipherView[]) => Promise<CipherView[]>;
searchCiphersBasic: (ciphers: CipherView[], query: string) => CipherView[]; searchCiphersBasic: (ciphers: CipherView[], query: string) => CipherView[];
} }

17
src/services/search.service.ts
View File

@ -63,7 +63,7 @@ export class SearchService implements SearchServiceAbstraction {
console.timeEnd('search indexing'); console.timeEnd('search indexing');
} }
async searchCiphers(query: string, filter: (cipher: CipherView) => boolean = null): async searchCiphers(query: string, filter: (cipher: CipherView) => boolean = null, ciphers: CipherView[] = null):
Promise<CipherView[]> { Promise<CipherView[]> {
const results: CipherView[] = []; const results: CipherView[] = [];
if (query != null) { if (query != null) {
@ -73,7 +73,9 @@ export class SearchService implements SearchServiceAbstraction {
query = null; query = null;
} }
let ciphers = await this.cipherService.getAllDecrypted(); if (ciphers == null) {
ciphers = await this.cipherService.getAllDecrypted();
}
if (filter != null) { if (filter != null) {
ciphers = ciphers.filter(filter); ciphers = ciphers.filter(filter);
} }
@ -82,7 +84,8 @@ export class SearchService implements SearchServiceAbstraction {
return ciphers; return ciphers;
} }
if (this.index == null) { const index = this.getIndexForSearch();
if (index == null) {
// Fall back to basic search if index is not available // Fall back to basic search if index is not available
return this.searchCiphersBasic(ciphers, query); return this.searchCiphersBasic(ciphers, query);
} }
@ -94,12 +97,12 @@ export class SearchService implements SearchServiceAbstraction {
const isQueryString = query != null && query.length > 1 && query.indexOf('>') === 0; const isQueryString = query != null && query.length > 1 && query.indexOf('>') === 0;
if (isQueryString) { if (isQueryString) {
try { try {
searchResults = this.index.search(query.substr(1)); searchResults = index.search(query.substr(1));
} catch { } } catch { }
} else { } else {
// tslint:disable-next-line // tslint:disable-next-line
const soWild = lunr.Query.wildcard.LEADING | lunr.Query.wildcard.TRAILING; const soWild = lunr.Query.wildcard.LEADING | lunr.Query.wildcard.TRAILING;
searchResults = this.index.query((q) => { searchResults = index.query((q) => {
q.term(query, { fields: ['name'], wildcard: soWild }); q.term(query, { fields: ['name'], wildcard: soWild });
q.term(query, { fields: ['subTitle'], wildcard: soWild }); q.term(query, { fields: ['subTitle'], wildcard: soWild });
q.term(query, { fields: ['login.uris'], wildcard: soWild }); q.term(query, { fields: ['login.uris'], wildcard: soWild });
@ -141,6 +144,10 @@ export class SearchService implements SearchServiceAbstraction {
}); });
} }
getIndexForSearch(): lunr.Index {
return this.index;
}
private fieldExtractor(c: CipherView, joined: boolean) { private fieldExtractor(c: CipherView, joined: boolean) {
if (!c.hasFields) { if (!c.hasFields) {
return null; return null;