Get webauthn working again with importmap

rubygems · Jan 26, 2024 · 85de9b0 · 85de9b0
1 parent f0d06f4
commit 85de9b0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 29 deletions.
diff --git a/app/javascript/controllers/webauthn_controller.js b/app/javascript/controllers/webauthn_controller.js
@@ -1,4 +1,6 @@
 import { Controller } from "@hotwired/stimulus"
+import $ from "jquery"
+import { bufferToBase64url, base64urlToBuffer } from "webauthn-json"
 
 export default class extends Controller {
   connect() {

diff --git a/app/javascript/handle_click.js b/app/javascript/handle_click.js
diff --git a/app/javascript/jquery_tmp.js b/app/javascript/jquery_tmp.js
diff --git a/app/views/multifactor_auths/_webauthn_prompt.html.erb b/app/views/multifactor_auths/_webauthn_prompt.html.erb
@@ -3,7 +3,7 @@
   <div class="t-body">
     <p><%= t("multifactor_auths.prompt.webauthn_credential_note") %></p>
   </div>
-  <%= form_tag @webauthn_verification_url, method: :post, class: "js-webauthn-session--form", data: { options: @webauthn_options.to_json } do %>
+  <%= form_tag @webauthn_verification_url, method: :post, class: "js-webauthn-session--form", data: { controller: "webauthn", options: @webauthn_options.to_json } do %>
     <div class="form_bottom">
       <p hidden class="l-text-red-600 js-webauthn-session--error"></p>
 

diff --git a/app/views/webauthn_verifications/prompt.html.erb b/app/views/webauthn_verifications/prompt.html.erb
@@ -6,7 +6,7 @@
     <p><%= t("settings.edit.webauthn_credential_note") %></p>
   </div>
 
-  <%= form_tag @webauthn_verification_url, method: :post, class: "js-webauthn-session-cli--form", data: { options: @webauthn_options.to_json } do %>
+  <%= form_tag @webauthn_verification_url, method: :post, class: "js-webauthn-session-cli--form", data: { controller: "webauthn", options: @webauthn_options.to_json } do %>
     <div class="form_bottom">
       <p hidden class="l-text-red-600 js-webauthn-session-cli--error"></p>
 

diff --git a/vendor/javascript/webauthn-json.js b/vendor/javascript/webauthn-json.js
@@ -46,3 +46,9 @@ var bufferToBase64url = function (buffer) {
     .replace(/=/g, "")
   return base64urlString
 }
+
+// This is a modified version that adds these exports:
+export {
+  base64urlToBuffer,
+  bufferToBase64url
+}