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

updates

Browse Source
This commit is contained in:
Kyle Spearrin 2019-04-16 23:32:02 -04:00
parent 39c1384a98
commit 7252e7cad0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/response/globalDomainResponse.ts
View File

@ -3,7 +3,7 @@ import { BaseResponse } from './baseResponse';
export class GlobalDomainResponse extends BaseResponse {
type: number;
domains: string[];
excluded: number[];
excluded: boolean;
constructor(response: any) {
super(response);

2
src/models/view/loginUriView.ts
View File

@ -15,6 +15,8 @@ const CanLaunchWhitelist = [
'irc://',
'vnc://',
'chrome://',
'iosapp://',
'androidapp://',
];
export class LoginUriView implements View {

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

@ -598,7 +598,7 @@ export class CipherService implements CipherServiceAbstraction {
const userId = await this.userService.getUserId();
const cData = new CipherData(response, userId, cipher.collectionIds);
if (!admin) {
this.upsert(cData);
await this.upsert(cData);
}
return new Cipher(cData);
}
@ -728,14 +728,15 @@ export class CipherService implements CipherServiceAbstraction {
const aLastUsed = a.localData && a.localData.lastUsedDate ? a.localData.lastUsedDate as number : null;
const bLastUsed = b.localData && b.localData.lastUsedDate ? b.localData.lastUsedDate as number : null;
if (aLastUsed != null && bLastUsed != null && aLastUsed < bLastUsed) {
const bothNotNull = aLastUsed != null && bLastUsed != null;
if (bothNotNull && aLastUsed < bLastUsed) {
return 1;
}
if (aLastUsed != null && bLastUsed == null) {
return -1;
}
if (bLastUsed != null && aLastUsed != null && aLastUsed > bLastUsed) {
if (bothNotNull && aLastUsed > bLastUsed) {
return -1;
}
if (bLastUsed != null && aLastUsed == null) {