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

Change WebAuthn connectors from using inline onclick to external (#969)

Browse Source
This commit is contained in:
Oscar Hinton 2021-05-12 17:19:20 +02:00 committed by GitHub
parent 51f3fee75d
commit a3506e833a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/connectors/webauthn-fallback.html
View File

@ -25,7 +25,7 @@
</div> </div>
<hr> <hr>
<p class="text-center mb-0"> <p class="text-center mb-0">
<button id="webauthn-button" onClick="javascript:init()" class="btn btn-primary btn-lg"></button> <button id="webauthn-button" class="btn btn-primary btn-lg"></button>
</p> </p>
</div> </div>
</div> </div>

9
src/connectors/webauthn-fallback.ts
View File

@ -19,7 +19,10 @@ document.addEventListener('DOMContentLoaded', async () => {
document.getElementById('msg').innerText = translate('webAuthnFallbackMsg'); document.getElementById('msg').innerText = translate('webAuthnFallbackMsg');
document.getElementById('remember-label').innerText = translate('rememberMe'); document.getElementById('remember-label').innerText = translate('rememberMe');
document.getElementById('webauthn-button').innerText = translate('webAuthnAuthenticate');
const button = document.getElementById('webauthn-button');
button.innerText = translate('webAuthnAuthenticate');
button.onclick = start;
document.getElementById('spinner').classList.add('d-none'); document.getElementById('spinner').classList.add('d-none');
const content = document.getElementById('content'); const content = document.getElementById('content');
@ -31,10 +34,6 @@ function translate(id: string) {
return locales[id]?.message || ''; return locales[id]?.message || '';
} }
(window as any).init = () => {
start();
};
function start() { function start() {
if (sentSuccess) { if (sentSuccess) {
return; return;

2
src/connectors/webauthn.html
View File

@ -9,7 +9,7 @@
<body style="background: transparent;"> <body style="background: transparent;">
<img src="../images/u2fkey.jpg" class="rounded img-fluid mb-3"> <img src="../images/u2fkey.jpg" class="rounded img-fluid mb-3">
<div class="text-center"> <div class="text-center">
<button id="webauthn-button" class="btn btn-primary" onclick="javascript:executeWebAuthn()"></button> <button id="webauthn-button" class="btn btn-primary"></button>
</div> </div>
</body> </body>

6
src/connectors/webauthn.ts
View File

@ -9,7 +9,9 @@ document.addEventListener('DOMContentLoaded', () => {
const text = getQsParam('btnText'); const text = getQsParam('btnText');
if (text) { if (text) {
document.getElementById('webauthn-button').innerText = decodeURI(text); const button = document.getElementById('webauthn-button');
button.innerText = decodeURI(text);
button.onclick = executeWebAuthn;
} }
}); });
@ -76,8 +78,6 @@ function executeWebAuthn() {
.catch(err => error('WebAuth Error: ' + err)); .catch(err => error('WebAuth Error: ' + err));
} }
(window as any).executeWebAuthn = executeWebAuthn;
function onMessage() { function onMessage() {
window.addEventListener('message', event => { window.addEventListener('message', event => {
if (!event.origin || event.origin === '' || event.origin !== parentOrigin) { if (!event.origin || event.origin === '' || event.origin !== parentOrigin) {