kaze 0.5.0 → 0.6.0

data/stubs/default/app/views/layouts/mailer.text.erb

@@ -1,13 +1,10 @@
 <!-- Header -->
 <%= ENV.fetch("APP_NAME", "Rails") %>: <%= root_url %>
-
 <!-- Body -->
 <%= yield %>
-
 <!-- Subcopy -->
 <% if content_for?(:subcopy) %>
-<%= yield :subcopy %>
+  <%= yield :subcopy %>
 <% end %>
-
 <!-- Footer -->
 © <%= Time.new.year %> <%= ENV.fetch("APP_NAME", "Rails") %>. All rights reserved.

data/stubs/default/app/views/user_mailer/reset_password.html.erb

@@ -1,39 +1,34 @@
 <!-- Greeting -->
 <h1>Hello!</h1>
-
 <!-- Intro Lines -->
 <p>You are receiving this email because we received a password reset request for your account.</p>
-
 <!-- Action Button -->
 <table class="action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td align="center">
-<table border="0" cellpadding="0" cellspacing="0" role="presentation">
-<tr>
-<td>
-<a href="<%= password_reset_url(token: params[:token]) %>" class="button button-primary" target="_blank" rel="noopener">Reset Password</a>
-</td>
-</tr>
+  <tr>
+    <td align="center">
+      <table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
+        <tr>
+          <td align="center">
+            <table border="0" cellpadding="0" cellspacing="0" role="presentation">
+              <tr>
+                <td>
+                  <a href="<%= password_reset_url(token: params[:token]) %>" class="button button-primary" target="_blank" rel="noopener">Reset Password</a>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-
 <!-- Outro Lines -->
 <p>This password reset link will expire in 60 minutes.</p>
-
 <p>If you did not request a password reset, no further action is required.</p>
-
 <!-- Salutation -->
-<p>Regards,<br><%= ENV.fetch("APP_NAME", "Rails") %></p>
-
+<p>Regards,<br>
+  <%= ENV.fetch("APP_NAME", "Rails") %></p>
 <!-- Subcopy -->
 <% content_for :subcopy do %>
-<p>If you're having trouble clicking the "Reset Password" button, copy and paste the URL below into your web browser: <span class="break-all"><%= link_to password_reset_url(token: params[:token]), password_reset_url(token: params[:token]) %><span></p>
-<% end %>
+  <p>If you're having trouble clicking the "Reset Password" button, copy and paste the URL below into your web browser: <span class="break-all"><%= link_to password_reset_url(token: params[:token]), password_reset_url(token: params[:token]) %><span></p>
+    <% end %>

data/stubs/default/test/factories/users.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :user do
+    name { Faker::Name.name }
+    email { Faker::Internet.email }
+    password { 'password' }
+  end
+end

data/stubs/default/test/integration/auth/authentication_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class Auth::AuthenticationTest < ActionDispatch::IntegrationTest
+  test 'login screen can be rendered' do
+    get login_path
+
+    assert_response :success
+  end
+
+  test 'users can authenticate using the login screen' do
+    user = FactoryBot.create :user
+
+    post login_path, params: {
+      email: user.email,
+      password: 'password'
+    }
+
+    assert_authenticated
+    assert_redirected_to dashboard_path
+  end
+
+  test 'users cannot authenticate with invalid password' do
+    user = FactoryBot.create :user
+
+    post login_path, params: {
+      email: user.email,
+      password: 'wrong-password'
+    }
+
+    assert_guest
+  end
+
+  test 'users can logout' do
+    user = FactoryBot.create :user
+
+    acting_as user
+
+    post logout_path
+
+    assert_guest
+    assert_redirected_to '/'
+  end
+end

data/stubs/default/test/integration/auth/password_reset_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class Auth::PasswordResetTest < ActionDispatch::IntegrationTest
+  test 'reset password link screen can be rendered' do
+    get password_request_path
+
+    assert_response :success
+  end
+
+  test 'reset password link can be requested' do
+    user = FactoryBot.create :user
+    token = user.generate_token_for(:password_reset)
+    email = UserMailer.with(user: user, token: token).reset_password
+
+    post password_email_path, params: { email: user.email }
+
+    assert_enqueued_email_with UserMailer, :reset_password, params: { user: user, token: token } do
+      email.deliver_later
+    end
+  end
+
+  test 'reset password screen can be rendered' do
+    user = FactoryBot.create :user
+
+    get password_reset_path(token: user.generate_token_for(:password_reset))
+
+    assert_response :success
+  end
+
+  test 'password can be reset_with_valid_token' do
+    user = FactoryBot.create :user
+
+    post password_store_path, params: {
+      token: user.generate_token_for(:password_reset),
+      password: 'password',
+      password_confirmation: 'password'
+    }
+
+    assert_redirected_to login_path
+  end
+end

data/stubs/default/test/integration/auth/registration_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class Auth::RegistrationTest < ActionDispatch::IntegrationTest
+  test 'registration screen can be rendered' do
+    get register_path
+
+    assert_response :success
+  end
+
+  test 'new users can register' do
+    post register_path, params: {
+      name: 'Test User',
+      email: 'test@example.com',
+      password: 'password',
+      password_confirmation: 'password'
+    }
+
+    assert_authenticated
+    assert_redirected_to dashboard_url
+  end
+end

data/stubs/default/test/integration/password_update_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class PasswordUpdateTest < ActionDispatch::IntegrationTest
+  test 'password can be updated' do
+    user = FactoryBot.create :user
+
+    acting_as(user).put password_update_path, params: {
+      current_password: 'password',
+      password: 'new-password',
+      password_confirmation: 'new-password'
+    }
+
+    assert_redirected_to profile_edit_path
+    assert BCrypt::Password.new(user.reload.password_digest).is_password?('new-password')
+  end
+
+  test 'correct password must be provided to update password' do
+    user = FactoryBot.create :user
+
+    acting_as(user).put password_update_path, params: {
+      current_password: 'wrong-password',
+      password: 'new-password',
+      password_confirmation: 'new-password'
+    }
+
+    assert_response :unprocessable_entity
+  end
+end

data/stubs/default/test/integration/profile_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+class ProfileTest < ActionDispatch::IntegrationTest
+  test 'profile page is displayed' do
+    user = FactoryBot.create :user
+
+    acting_as(user).get profile_edit_path
+
+    assert_response :success
+  end
+
+  test 'profile information can be updated' do
+    user = FactoryBot.create :user
+
+    acting_as(user).patch profile_edit_path, params: {
+      name: 'Test User',
+      email: 'test@example.com'
+    }
+
+    assert_redirected_to profile_edit_path
+
+    user.reload
+
+    assert_equal 'Test User', user.name
+    assert_equal 'test@example.com', user.email
+  end
+
+  test 'user can delete their account' do
+    user = FactoryBot.create :user
+
+    acting_as(user).delete profile_destroy_path, params: {
+      password: 'password'
+    }
+
+    assert_redirected_to '/'
+
+    assert_guest
+    assert_raise(ActiveRecord::RecordNotFound) { user.reload }
+  end
+
+  test 'correct password must be provided to delete account' do
+    user = FactoryBot.create :user
+
+    acting_as(user).delete profile_destroy_path, params: {
+      password: 'wrong-password'
+    }
+
+    assert_response :unprocessable_entity
+    assert_not_nil user.reload
+  end
+end

data/stubs/default/test/test_helper.rb

@@ -0,0 +1,38 @@
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+require 'rails/test_help'
+
+module ActiveSupport
+  class TestCase
+    # Run tests in parallel with specified workers
+    parallelize(workers: :number_of_processors)
+
+    # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+    fixtures :all
+
+    # Add more helper methods to be used by all tests here...
+    def acting_as(user)
+      post login_path, params: { email: user.email, password: 'password' }
+
+      self
+    end
+
+    def current_auth
+      Auth.new('web', session)
+    end
+
+    def assert_authenticated
+      assert is_authenticated, 'The user is not authenticated'
+    end
+
+    def assert_guest
+      assert_not is_authenticated, 'The user is authenticated'
+    end
+
+    private
+
+    def is_authenticated
+      current_auth.check?
+    end
+  end
+end

data/stubs/hotwire/app/components/dropdown_component.html.erb

@@ -1,20 +1,19 @@
-<div class="relative" x-data="{ open: false }" @click.outside="open = false" @close.stop="open = false">
-    <div @click="open = ! open">
-        <%= trigger %>
-    </div>
-
-    <div x-show="open"
-            x-transition:enter="transition ease-out duration-200"
-            x-transition:enter-start="opacity-0 scale-95"
-            x-transition:enter-end="opacity-100 scale-100"
-            x-transition:leave="transition ease-in duration-75"
-            x-transition:leave-start="opacity-100 scale-100"
-            x-transition:leave-end="opacity-0 scale-95"
-            class="absolute z-50 mt-2 <%= @width %> rounded-md shadow-lg <%= @alignment_classes %>"
-            style="display: none;"
-            @click="open = false">
-        <div class="rounded-md ring-1 ring-black ring-opacity-5 <%= @content_classes %>">
-            <%= content %>
-        </div>
+<div class="relative" x-data="{ open: false }" x-on:click.outside="open = false" x-on:close.stop="open = false">
+  <div x-on:click="open = ! open">
+    <%= trigger %>
+  </div>
+  <div x-show="open"
+    x-transition:enter="transition ease-out duration-200"
+    x-transition:enter-start="opacity-0 scale-95"
+    x-transition:enter-end="opacity-100 scale-100"
+    x-transition:leave="transition ease-in duration-75"
+    x-transition:leave-start="opacity-100 scale-100"
+    x-transition:leave-end="opacity-0 scale-95"
+    class="absolute z-50 mt-2 <%= @width %> rounded-md shadow-lg <%= @alignment_classes %>"
+    style="display: none;"
+    x-on:click="open = false">
+    <div class="rounded-md ring-1 ring-black ring-opacity-5 <%= @content_classes %>">
+      <%= content %>
     </div>
+  </div>
 </div>

data/stubs/hotwire/app/components/modal_component.html.erb

@@ -1,62 +1,58 @@
 <div
-    x-data="{
-        show: <%= @show %>,
-        focusables() {
-            // All focusable element types...
-            let selector = 'a, button, input:not([type=\'hidden\']), textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
-            return [...$el.querySelectorAll(selector)]
-                // All non-disabled elements...
-                .filter(el => ! el.hasAttribute('disabled'))
-        },
-        firstFocusable() { return this.focusables()[0] },
-        lastFocusable() { return this.focusables().slice(-1)[0] },
-        nextFocusable() { return this.focusables()[this.nextFocusableIndex()] || this.firstFocusable() },
-        prevFocusable() { return this.focusables()[this.prevFocusableIndex()] || this.lastFocusable() },
-        nextFocusableIndex() { return (this.focusables().indexOf(document.activeElement) + 1) % (this.focusables().length + 1) },
-        prevFocusableIndex() { return Math.max(0, this.focusables().indexOf(document.activeElement)) -1 },
-    }"
-    x-init="$watch('show', value => {
-        if (value) {
-            document.body.classList.add('overflow-y-hidden');
-            <%= @attributes.has_key?(:focusable) ? 'setTimeout(() => firstFocusable().focus(), 100)' : '' %>
-        } else {
-            document.body.classList.remove('overflow-y-hidden');
-        }
-    })"
-    x-on:open-modal.window="$event.detail == '<%= @name %>' ? show = true : null"
-    x-on:close-modal.window="$event.detail == '<%= @name %>' ? show = false : null"
-    x-on:close.stop="show = false"
-    x-on:keydown.escape.window="show = false"
-    x-on:keydown.tab.prevent="$event.shiftKey || nextFocusable().focus()"
-    x-on:keydown.shift.tab.prevent="prevFocusable().focus()"
+  x-data="{
+    show: <%= @show %>,
+    focusables() {
+      // All focusable element types...
+      let selector = 'a, button, input:not([type=\'hidden\']), textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
+      return [...$el.querySelectorAll(selector)]
+        // All non-disabled elements...
+        .filter(el => ! el.hasAttribute('disabled'))
+  },
+  firstFocusable() { return this.focusables()[0] },
+  lastFocusable() { return this.focusables().slice(-1)[0] },
+  nextFocusable() { return this.focusables()[this.nextFocusableIndex()] || this.firstFocusable() },
+  prevFocusable() { return this.focusables()[this.prevFocusableIndex()] || this.lastFocusable() },
+  nextFocusableIndex() { return (this.focusables().indexOf(document.activeElement) + 1) % (this.focusables().length + 1) },
+  prevFocusableIndex() { return Math.max(0, this.focusables().indexOf(document.activeElement)) -1 },
+  }"
+  x-init="$watch('show', value => {
+  if (value) {
+  document.body.classList.add('overflow-y-hidden')
+  <%= @attributes.has_key?(:focusable) ? 'setTimeout(() => firstFocusable().focus(), 100)' : '' %>
+  } else {
+  document.body.classList.remove('overflow-y-hidden')
+  }
+  })"
+  x-on:open-modal.window="$event.detail == '<%= @name %>' ? show = true : null"
+  x-on:close-modal.window="$event.detail == '<%= @name %>' ? show = false : null"
+  x-on:close.stop="show = false"
+  x-on:keydown.escape.window="show = false"
+  x-on:keydown.tab.prevent="$event.shiftKey || nextFocusable().focus()"
+  x-on:keydown.shift.tab.prevent="prevFocusable().focus()"
+  x-show="show"
+  class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50"
+  style="display: <%= @show ? 'block' : 'none' %>">
+  <div
     x-show="show"
-    class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50"
-    style="display: <%= @show ? 'block' : 'none' %>;"
->
-    <div
-        x-show="show"
-        class="fixed inset-0 transform transition-all"
-        x-on:click="show = false"
-        x-transition:enter="ease-out duration-300"
-        x-transition:enter-start="opacity-0"
-        x-transition:enter-end="opacity-100"
-        x-transition:leave="ease-in duration-200"
-        x-transition:leave-start="opacity-100"
-        x-transition:leave-end="opacity-0"
-    >
-        <div class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75"></div>
-    </div>
-
-    <div
-        x-show="show"
-        class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full <%= @max_width %> sm:mx-auto"
-        x-transition:enter="ease-out duration-300"
-        x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-        x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
-        x-transition:leave="ease-in duration-200"
-        x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
-        x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-    >
-        <%= content %>
-    </div>
+    class="fixed inset-0 transform transition-all"
+    x-on:click="show = false"
+    x-transition:enter="ease-out duration-300"
+    x-transition:enter-start="opacity-0"
+    x-transition:enter-end="opacity-100"
+    x-transition:leave="ease-in duration-200"
+    x-transition:leave-start="opacity-100"
+    x-transition:leave-end="opacity-0">
+    <div class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75"></div>
+  </div>
+  <div
+    x-show="show"
+    class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full <%= @max_width %> sm:mx-auto"
+    x-transition:enter="ease-out duration-300"
+    x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+    x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+    x-transition:leave="ease-in duration-200"
+    x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+    x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95">
+    <%= content %>
+  </div>
 </div>

data/stubs/hotwire/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
+  include SetCurrentAuth
   include Authenticate
 end

data/stubs/hotwire/app/controllers/auth/authenticated_session_controller.rb

@@ -1,5 +1,8 @@
 class Auth::AuthenticatedSessionController < ApplicationController
-  skip_authentication only: %i[new create]
+  include RedirectIfAuthenticated
+
+  skip_authenticate only: %i[new create]
+  skip_redirect_if_authenticated only: %i[destroy]
 
   layout 'guest'
 
@@ -12,18 +15,18 @@ class Auth::AuthenticatedSessionController < ApplicationController
   def create
     @form = Auth::LoginForm.new params.permit(:email, :password)
 
-    user = @form.authenticate
-
-    return render 'auth/login', status: :unprocessable_entity if user.nil?
+    @form.authenticate
 
-    login user
+    return render 'auth/login', status: :unprocessable_entity if Current.auth.user.nil?
 
     redirect_to dashboard_path
   end
 
   def destroy
-    logout
+    Current.auth.logout
+
+    reset_session
 
-    redirect_to login_path
+    redirect_to '/'
   end
 end

data/stubs/hotwire/app/controllers/auth/new_password_controller.rb

@@ -1,5 +1,7 @@
 class Auth::NewPasswordController < ApplicationController
-  skip_authentication
+  include RedirectIfAuthenticated
+
+  skip_authenticate
 
   layout 'guest'
 

data/stubs/hotwire/app/controllers/auth/password_reset_link_controller.rb

@@ -1,5 +1,7 @@
 class Auth::PasswordResetLinkController < ApplicationController
-  skip_authentication
+  include RedirectIfAuthenticated
+
+  skip_authenticate
 
   layout 'guest'
 

data/stubs/hotwire/app/controllers/auth/registered_user_controller.rb

@@ -1,5 +1,7 @@
 class Auth::RegisteredUserController < ApplicationController
-  skip_authentication
+  include RedirectIfAuthenticated
+
+  skip_authenticate
 
   layout 'guest'
 
@@ -16,7 +18,7 @@ class Auth::RegisteredUserController < ApplicationController
 
     user = User.create(name: @form.name, email: @form.email, password: @form.password)
 
-    login user
+    Current.auth.login user
 
     redirect_to dashboard_path
   end

data/stubs/hotwire/app/controllers/concerns/authenticate.rb

@@ -2,33 +2,18 @@ module Authenticate
   extend ActiveSupport::Concern
 
   included do
-    before_action :authenticate_user!
+    before_action :authenticate!
   end
 
   class_methods do
-    def skip_authentication(**options)
-      skip_before_action :authenticate_user!, **options
+    def skip_authenticate(**options)
+      skip_before_action :authenticate!, **options
     end
   end
 
   private
 
-  def authenticate_user!
-    if user = User.find_by(id: session[:user_id])
-      Current.user = user
-    else
-      redirect_to login_path
-    end
-  end
-
-  def login(user)
-    Current.user = user
-    reset_session
-    session[:user_id] = user.id
-  end
-
-  def logout
-    Current.user = nil
-    reset_session
+  def authenticate!
+    redirect_to login_path unless Current.auth.check?
   end
 end

data/stubs/hotwire/app/controllers/concerns/redirect_if_authenticated.rb

@@ -0,0 +1,19 @@
+module RedirectIfAuthenticated
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :redirect_if_authenticated!
+  end
+
+  class_methods do
+    def skip_redirect_if_authenticated(**options)
+      skip_before_action :redirect_if_authenticated!, **options
+    end
+  end
+
+  private
+
+  def redirect_if_authenticated!
+    redirect_to dashboard_path if Current.auth.check?
+  end
+end

data/stubs/hotwire/app/controllers/concerns/set_current_auth.rb

@@ -0,0 +1,9 @@
+module SetCurrentAuth
+  extend ActiveSupport::Concern
+
+  included do
+    before_action do
+      Current.auth = Auth.new('web', session)
+    end
+  end
+end

data/stubs/hotwire/app/controllers/password_controller.rb

@@ -4,7 +4,7 @@ class PasswordController < ApplicationController
 
     return render partial: 'profile/partials/update_password_form', status: :unprocessable_entity if @update_password_form.invalid?
 
-    Current.user.update(password: @update_password_form.password)
+    Current.auth.user.update(password: @update_password_form.password)
 
     redirect_back_or_to profile_edit_path, flash: { status: 'password-updated' }
   end