webauthn-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ded36acb2b7a3f4d67cdd4e860dc41e6f8490bb9143be6a0575117e1e7a84e
-  data.tar.gz: 8b2d46393c0d24e340b82f7f5d908e34fdd7cedb30501b8e8ba9663f217c23b9
+  metadata.gz: a8425de86118ec096864312cfb7b4ef98947437da28d88cdc5f12b0a4191aea9
+  data.tar.gz: 43f56151976719e1bb00200b3134cdde63b6786f5afaf225c274982e324258fc
 SHA512:
-  metadata.gz: 89c27f2bd69320aef0d3a36207788478ce85e7eea4b1f722950ec12749fa3fdcaa5a3eed1f322b77425d5d8b8e1d848cf912d84cd55c7872fa2142750626b345
-  data.tar.gz: d125c6229d26da7d19794479091ec59b706e10166a70a5e3f228a4d3571906a5b3d3a3db23c81cfb2c735e56c91c9bdf1ee01f249689761641d46aad1319f8ff
+  metadata.gz: d44fa7ccb7a3adc9248a74ab73f2758e0b3fb3fd4b7b70e98cb8956fac70c9c84b3eec954f39e4f261f26d8a4e3112bc4e4a289cab19542b2c11bbe4d4462d99
+  data.tar.gz: 784af4bb7538eccd87f50c4ce61d57ee8e3d92b823586c0c08c3c24718405b21d4258de6f599eca3e33b143a24ba1384fbc1365ec8e357186483dd708ef7686b

data/lib/generators/erb/webauthn_authentication/templates/app/views/passkeys/new.html.erb.tt

@@ -10,9 +10,9 @@
     "webauthn-credentials-options-url-value": create_options_passkeys_path,
   }) do |form| %>
   <div class="field">
-    <%%= form.label :nickname, 'Security Key nickname' %>
+    <%%= form.label :nickname, 'Passkey nickname' %>
     <%%= form.text_field :nickname, required: true %>
   </div>
   <%%= form.hidden_field :public_key_credential, data: { "webauthn-credentials-target": "credentialHiddenInput" } %>
-  <%%= form.submit "Add Security Key", disabled: true, data: { "webauthn-credentials-target": "submitButton" } %>
+  <%%= form.submit "Add Passkey", disabled: true, data: { "webauthn-credentials-target": "submitButton" } %>
 <%% end %>

data/lib/generators/test_unit/webauthn_authentication/templates/test/controllers/passkeys_controller_test.rb

@@ -48,7 +48,7 @@ class PasskeysControllerTest < ActionDispatch::IntegrationTest
     end
 
     assert_redirected_to root_path
-    assert_match (/Security Key registered successfully/), flash[:notice]
+    assert_match (/Passkey registered successfully/), flash[:notice]
     assert_nil session[:current_registration]
   end
 

data/lib/generators/test_unit/webauthn_authentication/templates/test/system/manage_webauthn_credentials_test.rb

@@ -5,8 +5,7 @@ class ManageWebauthnCredentialsTest < ApplicationSystemTestCase
   include VirtualAuthenticatorTestHelper
 
   def setup
-    user = User.create!(email_address: "alice@example.com", password: "S3cr3tP@ssw0rd!")
-    sign_in_as(user)
+    @user = User.create!(email_address: "alice@example.com", password: "S3cr3tP@ssw0rd!")
     @authenticator = add_virtual_authenticator
   end
 
@@ -14,63 +13,64 @@ class ManageWebauthnCredentialsTest < ApplicationSystemTestCase
     @authenticator.remove!
   end
 
-  test "add credentials and sign in" do
-    visit root_path
+  test "adding a passkey" do
+    sign_in_as(@user)
 
+    visit new_passkey_path
+    fill_in("Passkey nickname", with: "Touch ID")
     click_on "Add Passkey"
 
-    fill_in("Security Key nickname", with: "Touch ID")
-    click_on "Add Security Key"
-
-    assert_current_path "/"
-    assert_selector "div", text: "Security Key registered successfully"
-    assert_selector "span", text: "Touch ID"
+    assert_current_path root_path
+    # Add custom assertions based on your application's behavior
+    # assert_text "Passkey registered successfully"
+  end
 
-    click_on "Sign out"
-    assert_selector("input[type=submit][value='Sign in']")
+  test "signing in with existing passkey" do
+    add_passkey_to_authenticator(@authenticator, @user)
 
+    visit new_session_path
     click_on "Sign In with Passkey"
 
-    assert_current_path "/"
-    assert_selector "h3", text: "Your Passkeys"
+    assert_current_path root_path
+    # Add custom assertions based on your application's behavior
   end
 
-  test "sign in with 2FA WebAuthn credential" do
-    visit root_path
-
-    click_on "Add Second Factor Key"
+  test "adding a 2FA WebAuthn credential" do
+    sign_in_as(@user)
 
+    visit new_second_factor_webauthn_credential_path
     fill_in("Security Key nickname", with: "Touch ID")
     click_on "Add Security Key"
 
-    assert_current_path "/"
-    assert_selector "div", text: "Security Key registered successfully"
-    assert_selector "span", text: "Touch ID"
+    assert_current_path root_path
+    # Add custom assertions based on your application's behavior
+    # assert_text "Security Key registered successfully"
+  end
 
-    click_on "Sign out"
-    assert_selector("input[type=submit][value='Sign in']")
+  test "sign in with existing 2FA WebAuthn credential" do
+    add_security_key_to_authenticator(@authenticator, @user)
 
-    fill_in "email_address", with: "alice@example.com"
-    fill_in "password", with: "S3cr3tP@ssw0rd!"
+    visit new_session_path
+    fill_in "email_address", with: @user.email_address
+    fill_in "password", with: @user.password
     click_on "Sign in"
 
+    assert_current_path new_second_factor_authentication_path
     assert_selector "h3", text: "Two-factor authentication"
     click_on "Use Security Key"
 
-    assert_current_path "/"
-    assert_selector "h3", text: "Your Passkeys"
+    assert_current_path root_path
+    # Add custom assertions based on your application's behavior
   end
 
   private
 
   def sign_in_as(user)
     visit new_session_path
-
     fill_in "email_address", with: user.email_address
     fill_in "password", with: user.password
-
     click_on "Sign in"
 
-    assert_selector "h3", text: "Your Passkeys"
+    assert_current_path root_path
   end
 end

data/lib/generators/test_unit/webauthn_authentication/templates/test/test_helpers/virtual_authenticator_test_helper.rb

@@ -6,4 +6,42 @@ module VirtualAuthenticatorTestHelper
     options.resident_key = true
     page.driver.browser.add_virtual_authenticator(options)
   end
+
+  def add_passkey_to_authenticator(authenticator, user)
+    add_credential_to_authenticator(authenticator, user, passkey: true)
+  end
+
+  def add_security_key_to_authenticator(authenticator, user)
+    add_credential_to_authenticator(authenticator, user, passkey: false)
+  end
+
+  def add_credential_to_authenticator(authenticator, user, passkey:)
+    credential_id = SecureRandom.random_bytes(16)
+    encoded_credential_id = Base64.urlsafe_encode64(credential_id)
+    key = OpenSSL::PKey.generate_key("ED25519")
+    encoded_private_key = Base64.urlsafe_encode64(key.private_to_der)
+
+    cose_public_key = COSE::Key::OKP.from_pkey(OpenSSL::PKey.read(key.public_to_der))
+    cose_public_key.alg = -8
+    encoded_cose_public_key = Base64.urlsafe_encode64(cose_public_key.serialize)
+
+    credential_json = {
+      "credentialId" => encoded_credential_id,
+      "isResidentCredential" => passkey,
+      "rpId" => "localhost",
+      "privateKey" => encoded_private_key,
+      "signCount" => 0
+    }
+    credential_json["userHandle"] = user.webauthn_id if passkey
+
+    authenticator.add_credential(credential_json)
+
+    user.webauthn_credentials.create!(
+      nickname: "My Credential",
+      external_id: Base64.urlsafe_encode64(credential_id, padding: false),
+      public_key: encoded_cose_public_key,
+      sign_count: 0,
+      authentication_factor: passkey ? :first_factor : :second_factor
+    )
+  end
 end

data/lib/generators/webauthn_authentication/templates/app/controllers/passkeys_controller.rb

@@ -35,7 +35,7 @@ class PasskeysController < ApplicationController
           public_key: webauthn_credential.public_key,
           sign_count: webauthn_credential.sign_count
       )
-        redirect_to root_path, notice: "Security Key registered successfully"
+        redirect_to root_path, notice: "Passkey registered successfully"
       else
         flash[:alert] = "Error registering credential"
         render :new
@@ -50,7 +50,7 @@ class PasskeysController < ApplicationController
   def destroy
     Current.user.passkeys.destroy(params[:id])
 
-    redirect_to root_path, notice: "Security Key deleted successfully"
+    redirect_to root_path, notice: "Passkey deleted successfully"
   end
 
   private

data/lib/generators/webauthn_authentication/webauthn_authentication_generator.rb

@@ -32,7 +32,7 @@ class WebauthnAuthenticationGenerator < ::Rails::Generators::Base
     if File.exist?(File.join(destination_root, "app/controllers/sessions_controller.rb"))
       gsub_file "app/controllers/sessions_controller.rb",
         /^  def create.*?^  end/m,
-        <<~RUBY.strip_heredoc.indent(2)
+        <<~RUBY.chomp.indent(2)
           def create
             if user = User.authenticate_by(params.permit(:email_address, :password))
               if user.second_factor_enabled?

data/lib/webauthn/rails/version.rb

@@ -1,5 +1,5 @@
 module Webauthn
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webauthn-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cedarcode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-01 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties