action_auth 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ec4916e3c5419a6e41d09f0d3ae58f01622bdc338759ceb977afeaa8f94f82
-  data.tar.gz: 6d4cb0b65288ba2963f3fad43aa9147d8e1e9c9139679c1378750cea74d3646a
+  metadata.gz: e0d4717c14c8a74f3c08552d11dadd6a709a9d7d23972b61f3627afa8ded5775
+  data.tar.gz: 9f5339e1e752f85e1136339805d04b7738b228f426846858dc5c596f6594a130
 SHA512:
-  metadata.gz: b9a7183e95f4bdb6a0a8b6ec8924d67ebb945ed1510467c36b52c51550ba963d13bca21906fa7dd61bd3c90cf7087952ff9a162cecc0790bae4e3b6966fec5f8
-  data.tar.gz: b8a4ff19fdb107fe75b4cf96a9ac5d2b8fe9d2600522cdc6647691af1c93c69c5eb299c6c85a17c5291e218222ba50124b0a63f19f796963bf610b46939630e8
+  metadata.gz: 9a1e71e5fa998a07f4bcd2c2db4be596b2d88da3a35545f53ad5242c7c51ee3c252a2be6086e727e6c5456426831a12608f9fe1c5c134f660057807ad363ef61
+  data.tar.gz: 80833cbffda59cf7335b3ab6fb9df49518ff510b391d450ec4805d09af3b6918f76f76800c495b4d4710be19bb9a66d324e8e6feec7deee8277f572f26936844

data/app/assets/javascripts/action_auth/application.js

@@ -12,7 +12,7 @@ const Credential = {
     }
   },
 
-  callback: function (url, body) {
+  callback: function (url, body, redirectUrl) {
     const token = this.getCRFSToken();
     fetch(url, {
       method: "POST",
@@ -25,7 +25,8 @@ const Credential = {
       credentials: 'same-origin'
     }).then(function (response) {
       if (response.ok) {
-        window.location.replace("/");
+        console.log("Credential created", response);
+        window.location.replace(redirectUrl);
       } else if (response.status < 500) {
         response.text();
       }
@@ -34,8 +35,9 @@ const Credential = {
 
   create: function (callbackUrl, credentialOptions) {
     const self = this;
+    const webauthnRedirectUrl = document.querySelector('meta[name="webauthn_redirect_url"]').getAttribute("content");
     WebAuthnJSON.create({ "publicKey": credentialOptions }).then(function (credential) {
-      self.callback(callbackUrl, credential);
+      self.callback(callbackUrl, credential, webauthnRedirectUrl);
     });
   },
 
@@ -43,7 +45,7 @@ const Credential = {
     const self = this;
     const webauthnUrl = document.querySelector('meta[name="webauthn_auth_url"]').getAttribute("content");
     WebAuthnJSON.get({ "publicKey": credentialOptions }).then(function (credential) {
-      self.callback(webauthnUrl, credential);
+      self.callback(webauthnUrl, credential, "/");
     });
   }
 };

data/app/assets/stylesheets/action_auth/application.css

@@ -154,3 +154,7 @@ input[type="password"] {
 .action-auth--table td {
   transition: background-color 0.3s;
 }
+
+.action-auth--text-center {
+  text-align: center !important;
+}

data/app/controllers/action_auth/webauthn_credential_authentications_controller.rb

@@ -1,7 +1,7 @@
 class ActionAuth::WebauthnCredentialAuthenticationsController < ApplicationController
   before_action :ensure_user_not_authenticated
   before_action :ensure_login_initiated
-  layout "action_auth/application-full-width"
+  layout "action_auth/application"
 
   def new
     get_options = WebAuthn::Credential.options_for_get(allow: user.action_auth_webauthn_credentials.pluck(:external_id))

data/app/controllers/action_auth/webauthn_credentials_controller.rb

@@ -1,6 +1,6 @@
 class ActionAuth::WebauthnCredentialsController < ApplicationController
   before_action :authenticate_user!
-  layout "action_auth/application-full-width"
+  layout "action_auth/application"
 
   def new
   end

data/app/views/action_auth/webauthn_credential_authentications/new.html.erb

@@ -1,12 +1,18 @@
-<h2 class="">Use one of your security keys to sign in</h2>
+<h2 class="action-auth--text-center">Use a passkey to sign in</h2>
 
 <%= content_tag :div,
   id: "webauthn_credential_form",
-  data: { controller: "credential-authenticator",
-  "credential-authenticator-options-value": @options } do %>
+  data: {
+    controller: "credential-authenticator",
+    "credential-authenticator-options-value": @options
+  },
+  class: "action-auth--text-center" do %>
 
-  <div class="mb-3">
-    If it's an USB key be sure to insert it and, if necessary, tap it.
+  <div class="mb-3 action-auth--text-center">
+    Insert a USB key, if necessary, and tap it.
   </div>
 <% end %>
 
+<%= content_for :cancel_path do %>
+  <%= link_to "Cancel", action_auth.sign_in_path %>
+<% end %>

data/app/views/action_auth/webauthn_credentials/new.html.erb

@@ -1,4 +1,4 @@
-<h2 class="">Add a security key:</h2>
+<h2 class="action-auth--text-center">Add a security key</h2>
 <%= form_with scope: :webauthn_credential,
               url: options_for_webauthn_credentials_path,
               id: "webauthn_credential_form",
@@ -11,11 +11,15 @@
     <%= form.text_field :nickname, autofocus: true, placeholder: "New Security Key nickname", required: true %>
   </div>
 
-  <div class="mb-3">
+  <div class="mb-3 action-auth--text-center">
     <%= form.submit "Add Security Key", class: "btn btn-primary" %>
   </div>
 
-  <div class="">
-    <span class="">If it's an USB key be sure to insert it and, if necessary, tap it.</span>
+  <div class="mb-3 action-auth--text-center">
+    Insert a USB key, if necessary, and tap it.
   </div>
 <% end %>
+
+<%= content_for :cancel_path do %>
+  <%= link_to "Cancel", action_auth.sessions_path %>
+<% end %>

data/app/views/layouts/action_auth/application-full-width.html.erb

@@ -9,6 +9,7 @@
   <% if ActionAuth.configuration.webauthn_enabled? %>
     <%= tag :meta, name: :webauthn_auth_url, content: action_auth.webauthn_credential_authentications_url %>
     <%= tag :meta, name: :webauthn_cred_url, content: action_auth.webauthn_credentials_url %>
+    <%= tag :meta, name: :webauthn_redirect_url, content: action_auth.sessions_url %>
   <% end %>
 </head>
 <body class="bg-light">

data/app/views/layouts/action_auth/application.html.erb

@@ -6,10 +6,18 @@
   <%= csp_meta_tag %>
   <%= stylesheet_link_tag "action_auth/application", media: "all" %>
   <%= javascript_include_tag "action_auth/application", "data-turbo-track": "reload", type: "module" %>
+  <% if ActionAuth.configuration.webauthn_enabled? %>
+    <%= tag :meta, name: :webauthn_auth_url, content: action_auth.webauthn_credential_authentications_url %>
+    <%= tag :meta, name: :webauthn_cred_url, content: action_auth.webauthn_credentials_url %>
+    <%= tag :meta, name: :webauthn_redirect_url, content: action_auth.sessions_url %>
+  <% end %>
 </head>
 <body class="bg-light">
   <div class="container bg-white border pb-3">
     <%= yield %>
   </div>
+  <div class="action-auth--text-center">
+    <%= yield(:cancel_path) %>
+  </div>
 </body>
 </html>

data/lib/action_auth/version.rb

@@ -1,3 +1,3 @@
 module ActionAuth
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Dave Kimura