Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-30 12:54:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #750 from bitwarden/feature/webauthn

Browse Source
This commit is contained in:
Oscar Hinton 2021-03-17 22:14:14 +01:00 committed by GitHub
commit a3e7bab76a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/accounts/two-factor.component.html
View File

@ -34,6 +34,19 @@
</div>
</div>
</ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
<div id="web-authn-frame">
<iframe id="webauthn_iframe"></iframe>
</div>
<div class="box first">
<div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow>
<label for="remember">{{'rememberMe' | i18n}}</label>
<input id="remember" type="checkbox" name="Remember" [(ngModel)]="remember">
</div>
</div>
</div>
</ng-container>
<ng-container *ngIf="selectedProviderType === providerType.Duo ||
selectedProviderType === providerType.OrganizationDuo">
<div id="duo-frame"><iframe id="duo_iframe"></iframe></div>

11
src/locales/en/messages.json
View File

@ -592,11 +592,11 @@
"message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
"description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
},
"u2fDesc": {
"message": "Use any FIDO U2F enabled security key to access your account."
"webAuthnTitle": {
"message": "FIDO2 WebAuthn"
},
"u2fTitle": {
"message": "FIDO U2F Security Key"
"webAuthnDesc": {
"message": "Use any WebAuthn enabled security key to access your account."
},
"emailTitle": {
"message": "Email"
@ -1653,5 +1653,8 @@
},
"pendingDeletion": {
"message": "Pending deletion"
},
"webAuthnAuthenticate": {
"message": "Authenticate WebAutn"
}
}

12
src/scss/misc.scss
View File

@ -213,6 +213,18 @@ p.lead {
}
}
#web-authn-frame {
background: url('../images/loading.svg') 0 0 no-repeat;
height: 250px;
margin: 0 0 15px 0;
iframe {
width: 100%;
height: 100%;
border: none;
}
}
form, .form {
.form-group {
margin-bottom: 10px;