action_auth 0.2.14 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e8b4bf3c3d5177f2b551da1f75a74431389d883d3c254b5278203deac98a59
-  data.tar.gz: 1555aa754f519bc1161ae5586e76e5ee14d53057e86a7eb5adb7a66bb2611b8a
+  metadata.gz: fa8d3dbc8281ff24b428e82568470f21268c085d94352302c4f5bf4134041526
+  data.tar.gz: e266314b2359d22db1983ae7a9a13ddda8fd589819c834ccb5fb5e28418176a6
 SHA512:
-  metadata.gz: 12abbb107930bd843549316ff33ac33c3299ebdaebd161849098d6a36b7dbfdfa26c96b97bc73c42764788df7c3fb723395d04dbdcf9960000aca44b1c13be85
-  data.tar.gz: 81f28336faa6387f2cb2cd4af45a5dcc4b1b7c7817fc908eea2d67664bbb4362c72d349699a743ba4bff2ec39e22343021fc1aa30a052dc6f1ec32b2a5f183bd
+  metadata.gz: dd44e5d7bc676a69f0b7d60196a68b02c77ea9c7c042faa3251acce7b937e6a13fa7f8e44d4c982dc1d45a28d6e29124d7489f06649bd97296278964c409d12e
+  data.tar.gz: 288208466865e199fd803d5dc57fcb537467c166084be4812261083742de66d3314a86b287f612e261bfba7ed4ebd4c35ddcfd7199ad99de9aac8ea04937dbf1

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

@@ -76,24 +76,40 @@ Stimulus.register(
   }
 );
 
-document.addEventListener('DOMContentLoaded', function () {
-  const form = document.getElementById('webauthn_credential_form');
-  if (form) {
-    form.addEventListener('submit', function (event) {
-      event.preventDefault();
-      const formData = new FormData(form);
-      fetch(form.action, {
-        method: 'POST',
-        body: formData,
-        headers: {
-          'X-CSRF-Token': document.querySelector('[name="csrf-token"]').content
-        },
-        credentials: 'same-origin'
-      }).then(response => {
-        return response.json();
-      }).then(data => {
-        form.dispatchEvent(new CustomEvent('ajax:success', { detail: data }));
+function submitFormWithTurbo(form) {
+  const formData = new FormData(form);
+  fetch(form.action, {
+    method: 'POST',
+    body: formData,
+    headers: {
+      'X-CSRF-Token': document.querySelector('[name="csrf-token"]').content
+    },
+    credentials: 'same-origin'
+  }).then(response => {
+    return response.json();
+  }).then(data => {
+    form.dispatchEvent(new CustomEvent('ajax:success', { detail: data }));
+  });
+}
+
+if (!window.Turbo) {
+  document.addEventListener('DOMContentLoaded', function () {
+    const form = document.getElementById('webauthn_credential_form');
+    if (form) {
+      form.addEventListener('submit', function (event) {
+        event.preventDefault();
+        submitFormWithTurbo(form);
       });
-    });
-  }
-});
+    }
+  });
+} else {
+  document.addEventListener('turbo:load', function () {
+    const form = document.getElementById('webauthn_credential_form');
+    if (form) {
+      form.addEventListener('submit', function (event) {
+        event.preventDefault();
+        submitFormWithTurbo(form);
+      });
+    }
+  });
+}

data/app/controllers/action_auth/identity/email_verifications_controller.rb

@@ -5,13 +5,13 @@ module ActionAuth
 
       def show
         @user.update! verified: true
-        redirect_to main_app.root_path, notice: "Thank you for verifying your email address"
+        redirect_to sign_in_path, notice: "Thank you for verifying your email address"
       end
 
       def create
         user = ActionAuth::User.find_by(email: params[:email])
         UserMailer.with(user: user).email_verification.deliver_later if user
-        redirect_to main_app.root_path, notice: "We sent a verification email to your email address"
+        redirect_to sign_in_path, notice: "We sent a verification email to your email address"
       end
 
       private

data/app/controllers/action_auth/identity/emails_controller.rb

@@ -27,9 +27,9 @@ module ActionAuth
       def redirect_to_root
         if @user.email_previously_changed?
           resend_email_verification
-          redirect_to main_app.root_path, notice: "Your email has been changed"
+          redirect_to sign_in_path, notice: "Your email has been changed. Check your email to verify your email."
         else
-          redirect_to main_app.root_path
+          redirect_to sign_in_path
         end
       end
 

data/app/controllers/action_auth/identity/password_resets_controller.rb

@@ -14,7 +14,7 @@ module ActionAuth
           send_password_reset_email
           redirect_to sign_in_path, notice: "Check your email for reset instructions"
         else
-          redirect_to new_identity_password_reset_path, alert: "You can't reset your password until you verify your email"
+          redirect_to sign_in_path, alert: "You can't reset your password until you verify your email"
         end
       end
 

data/app/controllers/action_auth/passwords_controller.rb

@@ -7,7 +7,7 @@ module ActionAuth
 
     def update
       if @user.update(user_params)
-        redirect_to main_app.root_path, notice: "Your password has been changed"
+        redirect_to sign_in_path, notice: "Your password has been changed"
       else
         render :edit, status: :unprocessable_entity
       end

data/app/controllers/action_auth/registrations_controller.rb

@@ -10,12 +10,12 @@ module ActionAuth
       if @user.save
         if ActionAuth.configuration.verify_email_on_sign_in
           send_email_verification
-          redirect_to main_app.root_path, notice: "Welcome! You have signed up successfully. Please check your email to verify your account."
+          redirect_to sign_in_path, notice: "Welcome! You have signed up successfully. Please check your email to verify your account."
         else
           session_record = @user.action_auth_sessions.create!
           cookies.signed.permanent[:session_token] = { value: session_record.id, httponly: true }
 
-          redirect_to main_app.root_path, notice: "Welcome! You have signed up successfully"
+          redirect_to sign_in_path, notice: "Welcome! You have signed up successfully"
         end
       else
         render :new, status: :unprocessable_entity

data/app/controllers/action_auth/webauthn_credentials_controller.rb

@@ -22,7 +22,9 @@ class ActionAuth::WebauthnCredentialsController < ApplicationController
 
     respond_to do |format|
       format.json { render json: create_options }
-      format.turbo_stream { render json: create_options, status: :see_other }
+      if defined?(Turbo)
+        format.turbo_stream { render json: create_options }
+      end
     end
   end
 

data/lib/action_auth/version.rb

@@ -1,3 +1,3 @@
 module ActionAuth
-  VERSION = "0.2.14"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.3.0
 platform: ruby
 authors:
 - Dave Kimura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A simple Rails engine for authorization.