mirror of
https://github.com/bitwarden/browser.git
synced 2024-09-12 01:48:21 +02:00
cleanup for biometrics (#489)
This commit is contained in:
parent
60030f0354
commit
48aaf4b920
2
jslib
2
jslib
@ -1 +1 @@
|
||||
Subproject commit c62f5287cd259c6385c6e79193e0e5e1746c7a3c
|
||||
Subproject commit 419215fca153fb0686e6d90cc1effd5c21be247d
|
@ -28,18 +28,20 @@
|
||||
{{'loggedInAsOn' | i18n : email : webVaultHostname}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button type="submit" class="btn primary block" appBlurClick>
|
||||
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b>
|
||||
</button>
|
||||
<button type="button" class="btn block" appBlurClick (click)="logOut()">
|
||||
{{'logOut' | i18n}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="button" *ngIf="supportsBiometric && biometricLock">
|
||||
<a class="btn primary block" appBlurClick (click)="unlockBiometric()">
|
||||
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{biometricText | i18n}}</b>
|
||||
</a>
|
||||
<div class="buttons with-rows">
|
||||
<div class="buttons-row">
|
||||
<button type="submit" class="btn primary block" appBlurClick>
|
||||
<i class="fa fa-unlock-alt" aria-hidden="true"></i> <b>{{'unlock' | i18n}}</b>
|
||||
</button>
|
||||
<button type="button" class="btn block" appBlurClick (click)="logOut()">
|
||||
{{'logOut' | i18n}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="buttons-row" *ngIf="supportsBiometric && biometricLock">
|
||||
<a class="btn block" appBlurClick (click)="unlockBiometric()">
|
||||
{{biometricText | i18n}}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
@ -1,5 +1,8 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import {
|
||||
ActivatedRoute,
|
||||
Router,
|
||||
} from '@angular/router';
|
||||
|
||||
import { ApiService } from 'jslib/abstractions/api.service';
|
||||
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
||||
@ -23,8 +26,18 @@ export class LockComponent extends BaseLockComponent {
|
||||
platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
|
||||
userService: UserService, cryptoService: CryptoService,
|
||||
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,
|
||||
storageService, vaultTimeoutService, environmentService, stateService, apiService);
|
||||
}
|
||||
|
||||
async ngOnInit() {
|
||||
await super.ngOnInit();
|
||||
this.route.queryParams.subscribe((params) => {
|
||||
if (this.supportsBiometric && params.promptBiometric) {
|
||||
setTimeout(() => this.unlockBiometric(), 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -13,10 +13,12 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
|
||||
"big-integer": "1.6.36",
|
||||
"desktop-idle": "1.1.2",
|
||||
"electron-log": "2.2.17",
|
||||
"electron-store": "1.3.0",
|
||||
"electron-updater": "4.2.0",
|
||||
"keytar": "4.13.0"
|
||||
"keytar": "4.13.0",
|
||||
"zxcvbn": "4.4.2"
|
||||
}
|
||||
}
|
||||
|
@ -63,8 +63,14 @@
|
||||
}
|
||||
|
||||
.buttons {
|
||||
display: flex;
|
||||
margin-bottom: 20px;
|
||||
&:not(.with-rows), .buttons-row {
|
||||
display: flex;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
&:not(.with-rows), .buttons-row:last-child {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
button {
|
||||
margin-right: 10px;
|
||||
|
Loading…
Reference in New Issue
Block a user