kaze 0.4.0 → 0.6.0

data/stubs/inertia-common/app/controllers/auth/registered_user_controller.rb

@@ -1,8 +1,10 @@
 class Auth::RegisteredUserController < ApplicationController
-  skip_authentication
+  include RedirectIfAuthenticated
+
+  skip_authenticate
 
   def new
-    render inertia: "Auth/Register"
+    render inertia: 'Auth/Register'
   end
 
   def create
@@ -12,7 +14,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/inertia-common/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/inertia-common/app/controllers/concerns/handle_inertia_requests.rb

@@ -3,7 +3,7 @@ module HandleInertiaRequests
 
   included do
     inertia_share do
-      { auth: { user: Current.user } }
+      { auth: { user: Current.auth.get_user } }
     end
   end
 end

data/stubs/inertia-common/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/inertia-common/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/inertia-common/app/controllers/concerns/verify_csrf_token.rb

@@ -5,20 +5,20 @@ module VerifyCsrfToken
     before_action :set_csrf_cookie
 
     rescue_from ActionController::InvalidAuthenticityToken do
-      redirect_back fallback_location: "/", notice: "The page expired, please try again."
+      redirect_back fallback_location: '/', notice: 'The page expired, please try again.'
     end
   end
 
   def request_authenticity_tokens
-    super << request.headers["HTTP_X_XSRF_TOKEN"]
+    super << request.headers['HTTP_X_XSRF_TOKEN']
   end
 
   private
 
   def set_csrf_cookie
-    cookies["XSRF-TOKEN"] = {
+    cookies['XSRF-TOKEN'] = {
       value: form_authenticity_token,
-      same_site: "Strict"
+      same_site: 'Strict'
     }
   end
 end

data/stubs/inertia-common/app/controllers/dashboard_controller.rb

@@ -1,5 +1,5 @@
 class DashboardController < ApplicationController
   def index
-    render inertia: "Dashboard"
+    render inertia: 'Dashboard'
   end
 end

data/stubs/inertia-common/app/controllers/password_controller.rb

@@ -4,7 +4,7 @@ class PasswordController < ApplicationController
 
     return redirect_to profile_edit_path, inertia: { errors: form.error_messages } if form.invalid?
 
-    Current.user.update(password: form.password)
+    Current.auth.user.update(password: form.password)
 
     redirect_back_or_to profile_edit_path
   end

data/stubs/inertia-common/app/controllers/profile_controller.rb

@@ -1,6 +1,6 @@
 class ProfileController < ApplicationController
   def edit
-    render inertia: "Profile/Edit", props: {
+    render inertia: 'Profile/Edit', props: {
       status: session[:status]
     }
   end
@@ -10,7 +10,7 @@ class ProfileController < ApplicationController
 
     return redirect_to profile_edit_path, inertia: { errors: form.error_messages } if form.invalid?
 
-    Current.user.update(name: form.name, email: form.email)
+    Current.auth.user.update(name: form.name, email: form.email)
 
     redirect_to profile_edit_path
   end
@@ -20,12 +20,14 @@ class ProfileController < ApplicationController
 
     return redirect_back_or_to profile_edit_path, inertia: { errors: form.error_messages } if form.invalid?
 
-    user = Current.user
+    user = Current.auth.user
 
-    logout
+    Current.auth.logout
 
     user.delete
 
-    redirect_to "/"
+    reset_session
+
+    redirect_to '/'
   end
 end

data/stubs/inertia-common/app/controllers/welcome_controller.rb

@@ -1,8 +1,8 @@
 class WelcomeController < ApplicationController
-  skip_authentication
+  skip_authenticate
 
   def index
-    render inertia: "Welcome", props: {
+    render inertia: 'Welcome', props: {
       railsVersion: Rails.version,
       rubyVersion: RUBY_DESCRIPTION
     }

data/stubs/inertia-common/bin/vite

@@ -8,12 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-bundle_binstub = File.expand_path("bundle", __dir__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+  if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
@@ -21,7 +21,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("vite_ruby", "vite")
+load Gem.bin_path('vite_ruby', 'vite')

data/stubs/inertia-common/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_redirected_to profile_edit_path
+  end
+end

data/stubs/inertia-common/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_redirected_to profile_edit_path
+    assert_not_nil user.reload
+  end
+end

data/stubs/inertia-react-ts/app/javascript/Components/ApplicationLogo.tsx

@@ -1,12 +1,16 @@
-import { SVGAttributes } from 'react';
+import { SVGAttributes } from 'react'
 
 export default function ApplicationLogo(props: SVGAttributes<SVGElement>) {
-    return (
-        <svg {...props} viewBox="0 -6 32 32" xmlns="http://www.w3.org/2000/svg">
-            <g fill="none" fillRule="evenodd">
-                <path d="M0-6h32v32H0z"/>
-                <path fill="#c00" fillRule="nonzero" d="M.985 19.636s.422-4.163 3.375-9.087c2.954-4.924 7.99-8.65 12.083-9.017 8.144-.816 15.46 6.485 15.46 6.485s-.24.168-.494.38C23.42 2.49 18.54 5.274 17.005 6.02c-7.033 3.925-4.91 13.616-4.91 13.616H.987zM24.137 2.32c-.45-.182-.9-.35-1.364-.505l.056-.93c.885.254 1.237.423 1.363.493l-.056.943zM22.8 5.304c.45.028.915.084 1.393.183l-.056.872c-.464-.1-.928-.155-1.392-.17l.056-.885zM17.597.913c-.407 0-.815.015-1.223.058l-.268-.83c.465-.056.915-.084 1.35-.084l.282.858h-.14zm.676 5.178c.35-.154.76-.31 1.237-.45l.31.93c-.41.125-.817.294-1.225.49l-.323-.97zm-6.386-3.7c-.366.184-.718.395-1.083.62l-.647-.985c.38-.225.745-.42 1.097-.604l.633.97zm2.883 6.33c.252-.323.548-.646.87-.942l.634.957c-.31.323-.59.647-.83 1L14.77 8.72zm-2.04 4.53c.112-.506.24-1.027.422-1.547l1.012.802c-.14.548-.24 1.097-.295 1.645l-1.14-.9zM6.57 6.57c-.34.35-.662.73-.958 1.11L4.53 6.752c.323-.352.674-.704 1.04-1.055l1 .872zm-4.25 6.286c-.224.52-.52 1.21-.702 1.688L0 13.954c.14-.38.436-1.084.703-1.69l1.618.592zm10.2 3.967l1.518.548c.084.663.21 1.28.337 1.83l-1.688-.605c-.07-.422-.14-1.027-.168-1.772z"/>
-            </g>
-        </svg>
-    );
+  return (
+    <svg {...props} viewBox="0 -6 32 32" xmlns="http://www.w3.org/2000/svg">
+      <g fill="none" fillRule="evenodd">
+        <path d="M0-6h32v32H0z" />
+        <path
+          fill="#c00"
+          fillRule="nonzero"
+          d="M.985 19.636s.422-4.163 3.375-9.087c2.954-4.924 7.99-8.65 12.083-9.017 8.144-.816 15.46 6.485 15.46 6.485s-.24.168-.494.38C23.42 2.49 18.54 5.274 17.005 6.02c-7.033 3.925-4.91 13.616-4.91 13.616H.987zM24.137 2.32c-.45-.182-.9-.35-1.364-.505l.056-.93c.885.254 1.237.423 1.363.493l-.056.943zM22.8 5.304c.45.028.915.084 1.393.183l-.056.872c-.464-.1-.928-.155-1.392-.17l.056-.885zM17.597.913c-.407 0-.815.015-1.223.058l-.268-.83c.465-.056.915-.084 1.35-.084l.282.858h-.14zm.676 5.178c.35-.154.76-.31 1.237-.45l.31.93c-.41.125-.817.294-1.225.49l-.323-.97zm-6.386-3.7c-.366.184-.718.395-1.083.62l-.647-.985c.38-.225.745-.42 1.097-.604l.633.97zm2.883 6.33c.252-.323.548-.646.87-.942l.634.957c-.31.323-.59.647-.83 1L14.77 8.72zm-2.04 4.53c.112-.506.24-1.027.422-1.547l1.012.802c-.14.548-.24 1.097-.295 1.645l-1.14-.9zM6.57 6.57c-.34.35-.662.73-.958 1.11L4.53 6.752c.323-.352.674-.704 1.04-1.055l1 .872zm-4.25 6.286c-.224.52-.52 1.21-.702 1.688L0 13.954c.14-.38.436-1.084.703-1.69l1.618.592zm10.2 3.967l1.518.548c.084.663.21 1.28.337 1.83l-1.688-.605c-.07-.422-.14-1.027-.168-1.772z"
+        />
+      </g>
+    </svg>
+  )
 }

data/stubs/inertia-react-ts/app/javascript/Components/Checkbox.tsx

@@ -1,14 +1,17 @@
-import { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes } from 'react'
 
-export default function Checkbox({ className = '', ...props }: InputHTMLAttributes<HTMLInputElement>) {
-    return (
-        <input
-            {...props}
-            type="checkbox"
-            className={
-                'rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 ' +
-                className
-            }
-        />
-    );
+export default function Checkbox({
+  className = '',
+  ...props
+}: InputHTMLAttributes<HTMLInputElement>) {
+  return (
+    <input
+      {...props}
+      type="checkbox"
+      className={
+        'rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 ' +
+        className
+      }
+    />
+  )
 }

data/stubs/inertia-react-ts/app/javascript/Components/DangerButton.tsx

@@ -1,17 +1,22 @@
-import { ButtonHTMLAttributes } from 'react';
+import { ButtonHTMLAttributes } from 'react'
 
-export default function DangerButton({ className = '', disabled, children, ...props }: ButtonHTMLAttributes<HTMLButtonElement>) {
-    return (
-        <button
-            {...props}
-            className={
-                `inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 ${
-                    disabled && 'opacity-25'
-                } ` + className
-            }
-            disabled={disabled}
-        >
-            {children}
-        </button>
-    );
+export default function DangerButton({
+  className = '',
+  disabled,
+  children,
+  ...props
+}: ButtonHTMLAttributes<HTMLButtonElement>) {
+  return (
+    <button
+      {...props}
+      className={
+        `inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150 ${
+          disabled && 'opacity-25'
+        } ` + className
+      }
+      disabled={disabled}
+    >
+      {children}
+    </button>
+  )
 }

data/stubs/inertia-react-ts/app/javascript/Components/Dropdown.tsx

@@ -1,99 +1,131 @@
-import { useState, createContext, useContext, Fragment, PropsWithChildren, Dispatch, SetStateAction } from 'react';
-import { Link, InertiaLinkProps } from '@inertiajs/react';
-import { Transition } from '@headlessui/react';
+import {
+  useState,
+  createContext,
+  useContext,
+  Fragment,
+  PropsWithChildren,
+  Dispatch,
+  SetStateAction,
+} from 'react'
+import { Link, InertiaLinkProps } from '@inertiajs/react'
+import { Transition } from '@headlessui/react'
 
 const DropDownContext = createContext<{
-    open: boolean;
-    setOpen: Dispatch<SetStateAction<boolean>>;
-    toggleOpen: () => void;
+  open: boolean
+  setOpen: Dispatch<SetStateAction<boolean>>
+  toggleOpen: () => void
 }>({
-    open: false,
-    setOpen: () => {},
-    toggleOpen: () => {},
-});
+  open: false,
+  setOpen: () => {},
+  toggleOpen: () => {},
+})
 
 const Dropdown = ({ children }: PropsWithChildren) => {
-    const [open, setOpen] = useState(false);
+  const [open, setOpen] = useState(false)
 
-    const toggleOpen = () => {
-        setOpen((previousState) => !previousState);
-    };
+  const toggleOpen = () => {
+    setOpen((previousState) => !previousState)
+  }
 
-    return (
-        <DropDownContext.Provider value={{ open, setOpen, toggleOpen }}>
-            <div className="relative">{children}</div>
-        </DropDownContext.Provider>
-    );
-};
+  return (
+    <DropDownContext.Provider value={{ open, setOpen, toggleOpen }}>
+      <div className="relative">{children}</div>
+    </DropDownContext.Provider>
+  )
+}
 
 const Trigger = ({ children }: PropsWithChildren) => {
-    const { open, setOpen, toggleOpen } = useContext(DropDownContext);
-
-    return (
-        <>
-            <div onClick={toggleOpen}>{children}</div>
-
-            {open && <div className="fixed inset-0 z-40" onClick={() => setOpen(false)}></div>}
-        </>
-    );
-};
-
-const Content = ({ align = 'right', width = '48', contentClasses = 'py-1 bg-white dark:bg-gray-700', children }: PropsWithChildren<{ align?: 'left'|'right', width?: '48', contentClasses?: string }>) => {
-    const { open, setOpen } = useContext(DropDownContext);
-
-    let alignmentClasses = 'origin-top';
-
-    if (align === 'left') {
-        alignmentClasses = 'ltr:origin-top-left rtl:origin-top-right start-0';
-    } else if (align === 'right') {
-        alignmentClasses = 'ltr:origin-top-right rtl:origin-top-left end-0';
-    }
-
-    let widthClasses = '';
-
-    if (width === '48') {
-        widthClasses = 'w-48';
-    }
-
-    return (
-        <>
-            <Transition
-                as={Fragment}
-                show={open}
-                enter="transition ease-out duration-200"
-                enterFrom="opacity-0 scale-95"
-                enterTo="opacity-100 scale-100"
-                leave="transition ease-in duration-75"
-                leaveFrom="opacity-100 scale-100"
-                leaveTo="opacity-0 scale-95"
-            >
-                <div
-                    className={`absolute z-50 mt-2 rounded-md shadow-lg ${alignmentClasses} ${widthClasses}`}
-                    onClick={() => setOpen(false)}
-                >
-                    <div className={`rounded-md ring-1 ring-black ring-opacity-5 ` + contentClasses}>{children}</div>
-                </div>
-            </Transition>
-        </>
-    );
-};
-
-const DropdownLink = ({ className = '', children, ...props }: InertiaLinkProps) => {
-    return (
-        <Link
-            {...props}
+  const { open, setOpen, toggleOpen } = useContext(DropDownContext)
+
+  return (
+    <>
+      <div onClick={toggleOpen}>{children}</div>
+
+      {open && (
+        <div
+          className="fixed inset-0 z-40"
+          onClick={() => setOpen(false)}
+        ></div>
+      )}
+    </>
+  )
+}
+
+const Content = ({
+  align = 'right',
+  width = '48',
+  contentClasses = 'py-1 bg-white dark:bg-gray-700',
+  children,
+}: PropsWithChildren<{
+  align?: 'left' | 'right'
+  width?: '48'
+  contentClasses?: string
+}>) => {
+  const { open, setOpen } = useContext(DropDownContext)
+
+  let alignmentClasses = 'origin-top'
+
+  if (align === 'left') {
+    alignmentClasses = 'ltr:origin-top-left rtl:origin-top-right start-0'
+  } else if (align === 'right') {
+    alignmentClasses = 'ltr:origin-top-right rtl:origin-top-left end-0'
+  }
+
+  let widthClasses = ''
+
+  if (width === '48') {
+    widthClasses = 'w-48'
+  }
+
+  return (
+    <>
+      <Transition
+        as={Fragment}
+        show={open}
+        enter="transition ease-out duration-200"
+        enterFrom="opacity-0 scale-95"
+        enterTo="opacity-100 scale-100"
+        leave="transition ease-in duration-75"
+        leaveFrom="opacity-100 scale-100"
+        leaveTo="opacity-0 scale-95"
+      >
+        <div
+          className={`absolute z-50 mt-2 rounded-md shadow-lg ${alignmentClasses} ${widthClasses}`}
+          onClick={() => setOpen(false)}
+        >
+          <div
             className={
-                'block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out ' +
-                className
+              `rounded-md ring-1 ring-black ring-opacity-5 ` + contentClasses
             }
-        >
+          >
             {children}
-        </Link>
-    );
-};
-
-Dropdown.Trigger = Trigger;
-Dropdown.Content = Content;
-Dropdown.Link = DropdownLink;
-
-export default Dropdown;
+          </div>
+        </div>
+      </Transition>
+    </>
+  )
+}
+
+const DropdownLink = ({
+  className = '',
+  children,
+  ...props
+}: InertiaLinkProps) => {
+  return (
+    <Link
+      {...props}
+      className={
+        'block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out ' +
+        className
+      }
+    >
+      {children}
+    </Link>
+  )
+}
+
+Dropdown.Trigger = Trigger
+Dropdown.Content = Content
+Dropdown.Link = DropdownLink
+
+export default Dropdown

data/stubs/inertia-react-ts/app/javascript/Components/InputError.tsx

@@ -1,9 +1,16 @@
-import { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react'
 
-export default function InputError({ message, className = '', ...props }: HTMLAttributes<HTMLParagraphElement> & { message?: string }) {
-    return message ? (
-        <p {...props} className={'text-sm text-red-600 dark:text-red-400 ' + className}>
-            {message}
-        </p>
-    ) : null;
+export default function InputError({
+  message,
+  className = '',
+  ...props
+}: HTMLAttributes<HTMLParagraphElement> & { message?: string }) {
+  return message ? (
+    <p
+      {...props}
+      className={'text-sm text-red-600 dark:text-red-400 ' + className}
+    >
+      {message}
+    </p>
+  ) : null
 }