Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-05 09:10:53 +01:00
Code Issues Projects Releases Wiki Activity

cleanup for biometrics (#489)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-07-23 17:24:35 -04:00 committed by GitHub
parent 60030f0354
commit 48aaf4b920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit c62f5287cd259c6385c6e79193e0e5e1746c7a3c Subproject commit 419215fca153fb0686e6d90cc1effd5c21be247d

26
src/app/accounts/lock.component.html
View File

@ -28,18 +28,20 @@
{{'loggedInAsOn' | i18n : email : webVaultHostname}} {{'loggedInAsOn' | i18n : email : webVaultHostname}}
</div> </div>
</div> </div>
<div class="buttons"> <div class="buttons with-rows">
<button type="submit" class="btn primary block" appBlurClick> <div class="buttons-row">
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b> <button type="submit" class="btn primary block" appBlurClick>
</button> <i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b>
<button type="button" class="btn block" appBlurClick (click)="logOut()"> </button>
{{'logOut' | i18n}} <button type="button" class="btn block" appBlurClick (click)="logOut()">
</button> {{'logOut' | i18n}}
</div> </button>
<div class="button" *ngIf="supportsBiometric && biometricLock"> </div>
<a class="btn primary block" appBlurClick (click)="unlockBiometric()"> <div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{biometricText | i18n}}</b> <a class="btn block" appBlurClick (click)="unlockBiometric()">
</a> {{biometricText | i18n}}
</a>
</div>
</div> </div>
</div> </div>
</form> </form>

17
src/app/accounts/lock.component.ts
View File

@ -1,5 +1,8 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import {
ActivatedRoute,
Router,
} from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib/abstractions/crypto.service';
@ -23,8 +26,18 @@ export class LockComponent extends BaseLockComponent {
platformUtilsService: PlatformUtilsService, messagingService: MessagingService, platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
userService: UserService, cryptoService: CryptoService, userService: UserService, cryptoService: CryptoService,
storageService: StorageService, vaultTimeoutService: VaultTimeoutService, storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
environmentService: EnvironmentService, stateService: StateService, apiService: ApiService) { environmentService: EnvironmentService, stateService: StateService,
apiService: ApiService, private route: ActivatedRoute) {
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
storageService, vaultTimeoutService, environmentService, stateService, apiService); storageService, vaultTimeoutService, environmentService, stateService, apiService);
} }
async ngOnInit() {
await super.ngOnInit();
this.route.queryParams.subscribe((params) => {
if (this.supportsBiometric && params.promptBiometric) {
setTimeout(() => this.unlockBiometric(), 1000);
}
});
}
} }

4
src/package.json
View File

@ -13,10 +13,12 @@
}, },
"dependencies": { "dependencies": {
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"big-integer": "1.6.36",
"desktop-idle": "1.1.2", "desktop-idle": "1.1.2",
"electron-log": "2.2.17", "electron-log": "2.2.17",
"electron-store": "1.3.0", "electron-store": "1.3.0",
"electron-updater": "4.2.0", "electron-updater": "4.2.0",
"keytar": "4.13.0" "keytar": "4.13.0",
"zxcvbn": "4.4.2"
} }
} }

10
src/scss/pages.scss
View File

@ -63,8 +63,14 @@
} }
.buttons { .buttons {
display: flex; &:not(.with-rows), .buttons-row {
margin-bottom: 20px; display: flex;
margin-bottom: 10px;
}
&:not(.with-rows), .buttons-row:last-child {
margin-bottom: 20px;
}
button { button {
margin-right: 10px; margin-right: 10px;