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

Update to use the new WebAuthn iframe

Browse Source
This commit is contained in:
Hinton 2021-03-08 19:12:56 +01:00
parent 907fabdd8e
commit 862f9a5a63
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,14 +35,9 @@
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn"> <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
<div class="content text-center"> <div id="web-authn-frame">
<span *ngIf="!webAuthnReady" class="text-center"><i class="fa fa-spinner fa-spin"></i></span> <iframe id="webauthn_iframe"></iframe>
<div *ngIf="webAuthnReady">
<p>{{'insertU2f' | i18n}}</p>
<img src="../../images/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
</div> </div>
</div>
<div class="box first"> <div class="box first">
<div class="box-content"> <div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow> <div class="box-content-row box-content-row-checkbox" appBoxRow>
@ -91,4 +86,3 @@
</div> </div>
</form> </form>
<ng-template #twoFactorOptions></ng-template> <ng-template #twoFactorOptions></ng-template>
<iframe id="webauthn_iframe" hidden></iframe>

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.", "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." "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
}, },
"u2fDesc": { "webAuthnTitle": {
"message": "Use any FIDO U2F enabled security key to access your account." "message": "FIDO2 WebAuthn"
}, },
"u2fTitle": { "webAuthnDesc": {
"message": "FIDO U2F Security Key" "message": "Use any WebAuthn enabled security key to access your account."
}, },
"emailTitle": { "emailTitle": {
"message": "Email" "message": "Email"
@ -1650,5 +1650,8 @@
}, },
"pendingDeletion": { "pendingDeletion": {
"message": "Pending deletion" "message": "Pending deletion"
},
"webAuthnAuthenticate": {
"message": "Authenticate WebAutn"
} }
} }

12
src/scss/misc.scss
View File

@ -221,6 +221,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, .form {
.form-group { .form-group {
margin-bottom: 10px; margin-bottom: 10px;