alchemy-devise 8.0.0.b → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c1338a60cd662f003273c43a2389f1138c7c889909fc0aaf8ddb7ee6ab59812
-  data.tar.gz: a86d926627ab17965deb01378a3d67e872a3b042fee0e1340290702bb0b19229
+  metadata.gz: aa739c92a801c881866bb6892e6173fdd1fd71cee618ec1f71e14fb8fb97308e
+  data.tar.gz: 7ab851553d4284cb21cfe6fe9042925008ad01209412c3587fd48b3adc267769
 SHA512:
-  metadata.gz: 184e26ecc9d543c34db5aaa90aa83ab7d37b21113bd33af9878cc6e5bf5bf1e441914029198a4233f6b68d6eb5bc0c9bb6b6ab26e9cf2aaa9cf5f736590944be
-  data.tar.gz: 6e49acd84dc13aa600b75b3eaaacfc71498375f4fb7363c37bba61bfc8f4267efd02f87f750f2abbf109c5dfd5eed29abd7a648beb0d22017c352e678c8e08c3
+  metadata.gz: 338681631406095227adee11ed992a8c6b9a32027cfa332792f4207e735df90f0dc289268c5b9c78382910f8615fcc070b9426f823886e8336fdadc37330ddea
+  data.tar.gz: b01851129e4b08a1535895d7aad2ea50038514a72ff988f82ae92d8a679e3b42b3168d801ae3b10356e3b4b9ec332578307754a2209637a8b9d9b038b33b3731

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 8.0.0 (2025-11-28)
+
+- Enable rememberable module [#237](https://github.com/AlchemyCMS/alchemy-devise/pull/237) ([tvdeyen](https://github.com/tvdeyen))
+- Use Alchemy::Configuration for config [#236](https://github.com/AlchemyCMS/alchemy-devise/pull/236) ([tvdeyen](https://github.com/tvdeyen))
+- CI: Test Alchemy 8.0-stable branch [#234](https://github.com/AlchemyCMS/alchemy-devise/pull/234) ([tvdeyen](https://github.com/tvdeyen))
+- Make `Alchemy::Devise::Ability` auto-loadable [#233](https://github.com/AlchemyCMS/alchemy-devise/pull/233) ([mamhoff](https://github.com/mamhoff))
+- Login, Signup and Password reset forms improvements [#231](https://github.com/AlchemyCMS/alchemy-devise/pull/231) ([tvdeyen](https://github.com/tvdeyen))
+- Test with Rails 8.0 [#230](https://github.com/AlchemyCMS/alchemy-devise/pull/230) ([tvdeyen](https://github.com/tvdeyen))
+- New login screen with dark mode support [#229](https://github.com/AlchemyCMS/alchemy-devise/pull/229) ([tvdeyen](https://github.com/tvdeyen))
+- Updates for Alchemy 8.0 [#228](https://github.com/AlchemyCMS/alchemy-devise/pull/228) ([mamhoff](https://github.com/mamhoff))
+- Update puma requirement from ~> 6.0 to ~> 7.0 [#227](https://github.com/AlchemyCMS/alchemy-devise/pull/227) ([dependabot](https://github.com/apps/dependabot))
+- Update rspec-rails requirement from ~> 7.1 to ~> 8.0 [#226](https://github.com/AlchemyCMS/alchemy-devise/pull/226) ([dependabot](https://github.com/apps/dependabot))
+- Add support for Alchemy 8.0 [#225](https://github.com/AlchemyCMS/alchemy-devise/pull/225) ([tvdeyen](https://github.com/tvdeyen))
+- Load Base Controller Extension when autoloading [#216](https://github.com/AlchemyCMS/alchemy-devise/pull/216) ([mamhoff](https://github.com/mamhoff))
+
 ## 7.4.1 (2025-02-12)
 
 - Fix module icon for Alchemy 7.4 [#224](https://github.com/AlchemyCMS/alchemy-devise/pull/224) ([tvdeyen](https://github.com/tvdeyen))

data/README.md

@@ -42,14 +42,15 @@ Default Devise modules included in `Alchemy::User` model
 - `:validatable`
 - `:timeoutable`
 - `:recoverable`
+- `:rememberable`
 
-If you want to add additional modules into the Alchemy user class append them to `Alchemy.devise_modules` in an initializer in your app.
+If you want to add additional modules into the Alchemy user class append them to `Alchemy::Devise.config.devise_modules` in an initializer in your app.
 
 ### Register additional modules example
 
 ```ruby
 # config/initializers/alchemy.rb
-Alchemy.devise_modules << :registerable
+Alchemy::Devise.config.devise_modules << :registerable
 ```
 
 ### Using old encryption
@@ -58,7 +59,7 @@ If your app uses an old encryption that needs the +devise-encryptable+ gem you a
 
 ```ruby
 # config/initializers/alchemy.rb
-Alchemy.devise_modules << :encryptable
+Alchemy::Devise.config.devise_modules << :encryptable
 ```
 
 ## Testing

data/app/assets/builds/alchemy-devise.css

@@ -1 +1 @@
-body.user_sessions,body.passwords{background-color:var(--color-blue_dark);color:var(--color-white)}body.user_sessions a,body.passwords a{color:var(--color-white)}body.user_sessions #errors,body.user_sessions .message.info,body.passwords #errors,body.passwords .message.info{border-color:rgba(0,0,0,0)}body.user_sessions #errors,body.passwords #errors{margin-left:157px}#logo{width:275px;height:auto;margin:0 0 1em 164px}.login_signup_box{position:absolute;width:450px;top:50%;left:50%;transform:translate(-60%, -50%);--form-field-label-color: var(--color-white);--button-secondary-bg-color: var(--color-blue_dark);--button-secondary-hover-bg-color: var(--color-blue_medium)}.no-js .login_signup_box{display:none}.login_signup_box .message{margin-left:157px}.login_signup_box .link{text-align:right}.login_signup_box button.secondary{color:var(--color-white);border-color:var(--color-white)}/*# sourceMappingURL=alchemy-devise.css.map */
+body.user_sessions #errors,body.user_sessions .message.info,body.passwords #errors,body.passwords .message.info{border-color:rgba(0,0,0,0)}body.user_sessions #errors,body.passwords #errors{margin-left:157px}.logo-box{width:250px;margin:0 10px 1.5em 200px}.logo-box svg{width:200px;height:auto}.login_signup_box{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%)}.login_signup_box alchemy-message{width:300px;margin-left:var(--form-left-column-width)}.no-js .login_signup_box{display:none}.login_signup_box .message{margin-left:157px}.login_signup_box .submit{display:flex;align-items:center;justify-content:space-between;gap:var(--spacing-4);margin-left:var(--form-left-column-width);padding-left:var(--spacing-0)}.login_signup_box .submit.align-right{justify-content:end}.login_signup_box .submit>label{text-align:start}.login_signup_box .submit>label input[type=checkbox]{margin:0 var(--spacing-0) 0 0}.login_signup_box .submit>a{display:inline-flex;align-items:center;gap:var(--spacing-0)}.login_signup_box .submit>a:hover alchemy-icon{transform:translateX(-2px);transition:transform var(--transition-duration)}

data/app/assets/stylesheets/alchemy-devise/login.scss

@@ -1,12 +1,5 @@
 body.user_sessions,
 body.passwords {
-  background-color: var(--color-blue_dark);
-  color: var(--color-white);
-
-  a {
-    color: var(--color-white);
-  }
-
   #errors,
   .message.info {
     border-color: transparent;
@@ -17,21 +10,26 @@ body.passwords {
   }
 }
 
-#logo {
-  width: 275px;
-  height: auto;
-  margin: 0 0 1em 164px;
+.logo-box {
+  width: 250px;
+  margin: 0 10px 1.5em 200px;
+
+  svg {
+    width: 200px;
+    height: auto;
+  }
 }
 
 .login_signup_box {
   position: absolute;
-  width: 450px;
   top: 50%;
   left: 50%;
-  transform: translate(-60%, -50%);
-  --form-field-label-color: var(--color-white);
-  --button-secondary-bg-color: var(--color-blue_dark);
-  --button-secondary-hover-bg-color: var(--color-blue_medium);
+  transform: translate(-50%, -50%);
+
+  alchemy-message {
+    width: 300px;
+    margin-left: var(--form-left-column-width);
+  }
 
   .no-js & {
     display: none;
@@ -41,12 +39,37 @@ body.passwords {
     margin-left: 157px;
   }
 
-  .link {
-    text-align: right;
-  }
+  .submit {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: var(--spacing-4);
+    margin-left: var(--form-left-column-width);
+    padding-left: var(--spacing-0);
+
+    &.align-right {
+      justify-content: end;
+    }
+
+    > label {
+      text-align: start;
+
+      input[type="checkbox"] {
+        margin: 0 var(--spacing-0) 0 0;
+      }
+    }
+
+    > a {
+      display: inline-flex;
+      align-items: center;
+      gap: var(--spacing-0);
 
-  button.secondary {
-    color: var(--color-white);
-    border-color: var(--color-white);
+      &:hover {
+        alchemy-icon {
+          transform: translateX(-2px);
+          transition: transform var(--transition-duration);
+        }
+      }
+    }
   }
 }

data/app/controllers/alchemy/admin/passwords_controller.rb

@@ -9,7 +9,7 @@ module Alchemy
 
       helper "Alchemy::Admin::Base"
 
-      layout Alchemy::Devise.layout
+      layout Alchemy::Devise.config.layout
 
       private
 

data/app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -13,7 +13,7 @@ module Alchemy
 
       helper "Alchemy::Admin::Base"
 
-      layout Alchemy::Devise.layout
+      layout Alchemy::Devise.config.layout
 
       def create
         authenticate_user!
@@ -49,7 +49,7 @@ module Alchemy
 
       # Overwriting the default of Devise
       def after_sign_out_path_for(resource_or_scope)
-        if request.referer.blank? || request.referer.to_s =~ /admin/
+        if request.referer.blank? || request.referer.to_s.include?("admin")
           root_path
         else
           request.referer

data/app/controllers/alchemy/admin/users_controller.rb

@@ -98,7 +98,7 @@ module Alchemy
           deliver_welcome_mail
           redirect_to admin_pages_path
         else
-          render :signup
+          render :signup, status: :unprocessable_content
         end
       end
 

data/app/models/alchemy/user.rb

@@ -17,7 +17,7 @@ module Alchemy
       :tag_list
     ]
 
-    devise(*Alchemy.devise_modules)
+    devise(*Alchemy::Devise.config.devise_modules)
 
     include Alchemy::Taggable
 
@@ -25,7 +25,7 @@ module Alchemy
 
     has_many :folded_pages
 
-    validates_uniqueness_of :login
+    validates :login, uniqueness: {case_sensitive: false}, presence: :login_required?
     validates_presence_of :alchemy_roles
 
     # Unlock all locked pages before destroy.
@@ -140,6 +140,14 @@ module Alchemy
     alias_method :name, :fullname
     alias_method :alchemy_display_name, :fullname
 
+    def email_required?
+      ::Devise.authentication_keys.include?(:email)
+    end
+
+    def login_required?
+      ::Devise.authentication_keys.include?(:login)
+    end
+
     # Returns true if the last request not longer ago then the logged_in_time_out
     def logged_in?
       raise "Can not determine the records login state because there is no last_request_at column" if !respond_to?(:last_request_at)

data/app/views/alchemy/admin/passwords/edit.html.erb

@@ -3,10 +3,12 @@
 <% end %>
 
 <div class="login_signup_box">
-  <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
+  <%= render "alchemy/admin/user_sessions/logo" %>
 <% if @user.errors.blank? %>
   <%= render_message do %>
-    <h1><%= Alchemy.t('Password reset') %></h1>
+    <p>
+      <strong><%= Alchemy.t('Password reset') %></strong>
+    </p>
     <p><%= Alchemy.t('Please enter a new password') %></p>
   <% end %>
 <% else %>
@@ -16,13 +18,18 @@
 <% end %>
   <%= alchemy_form_for resource, as: resource_name, url: admin_update_password_path, method: 'patch' do |f| %>
     <%= f.hidden_field :reset_password_token %>
-    <%= f.input :password, autofocus: true, label: Alchemy.t("New password") %>
-    <%= f.input :password_confirmation, label: Alchemy.t("Confirm new password") %>
-    <div class="input link">
-      <small>
-        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
-      </small>
+    <%= f.input :password, autofocus: true, label: Alchemy.t("New password"),
+      required: true, input_html: {autocomplete: "new-password"} %>
+    <%= f.input :password_confirmation, label: Alchemy.t("Confirm new password"),
+      required: true, input_html: {autocomplete: "new-password"} %>
+    <div class="submit">
+      <%= link_to alchemy.admin_login_path do %>
+        <%= render_icon("arrow-left-s", size: "1x") %>
+        <%= Alchemy.t(:login) %>
+      <% end %>
+      <button type="submit">
+        <%= Alchemy.t("Change password") %>
+      </button>
     </div>
-    <%= f.submit Alchemy.t("Change password") %>
   <% end %>
 </div>

data/app/views/alchemy/admin/passwords/new.html.erb

@@ -3,10 +3,12 @@
 <% end %>
 
 <div class="login_signup_box">
-  <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
+  <%= render "alchemy/admin/user_sessions/logo" %>
 <% if @user.errors.blank? %>
   <%= render_message do %>
-    <h1><%= Alchemy.t('Password reset') %></h1>
+    <p>
+      <strong><%= Alchemy.t('Password reset') %></strong>
+    </p>
     <p><%= Alchemy.t('Please enter your email address') %></p>
   <% end %>
 <% else %>
@@ -17,12 +19,19 @@
   <%= alchemy_form_for :user, url: admin_reset_password_path, html: {method: 'post'} do |f| %>
     <%= f.input :email,
       autofocus: true,
-      input_html: {value: params[:email]} %>
-    <div class="input link">
-      <small>
-        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
-      </small>
+      required: true,
+      input_html: {
+        autocomplete: "email",
+        value: params[:email]
+      } %>
+    <div class="submit">
+      <%= link_to alchemy.admin_login_path do %>
+        <%= render_icon("arrow-left-s", size: "1x") %>
+        <%= Alchemy.t(:login) %>
+      <% end %>
+      <button type="submit">
+        <%= Alchemy.t("Send reset instructions") %>
+      </button>
     </div>
-    <%= f.submit Alchemy.t("Send reset instructions"), input_html: {class: 'secondary'} %>
   <% end %>
 </div>

data/app/views/alchemy/admin/user_sessions/_logo.html.erb

@@ -0,0 +1,35 @@
+<div class="logo-box">
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="267"
+    height="91"
+    viewBox="0 0 267 91"
+  >
+    <path
+      d="M261.749 29.77h-9.812l-.72 2.738a193.53 193.53 0 0 0-.802 3.217c-.334-1.384-.604-2.5-.767-3.162l-.685-2.792H234.075c-1.102-.371-2.338-.564-3.705-.564-2.537 0-4.557.864-6.104 1.934-1.406-1.15-3.402-1.934-6.221-1.934-1.341 0-2.524.242-3.564.625l-.006-.061H201.334v4.17c-2.345-3.051-5.884-4.735-10.401-4.735-4.196 0-8.831 1.936-11.655 6.784-1.194-3.746-3.896-6.784-9.557-6.784-1.385 0-2.626.24-3.727.617v-12.19l-4.204.623-6.934 1.027-3.132.464v10.324a22.109 22.109 0 0 0-6.086-.864c-5.96 0-9.341 2.652-11.128 4.876-.108.133-.2.284-.303.422V17.633l-4.207.623-6.933 1.027-3.131.464v24.04l-5.118-18.709-.739-2.701H99.863l-.745 2.686L95.854 36.8 80.915 21.597a2.922 2.922 0 0 0-2.823-.776l-18.554 4.875a2.918 2.918 0 0 0-.634-.981L39.437 4.906a2.927 2.927 0 0 0-2.826-.777L9.797 11.173a2.92 2.92 0 0 0-2.073 2.054L.372 40.078a2.922 2.922 0 0 0 .735 2.818L20.6 62.705a2.921 2.921 0 0 0 2.822.774l9.259-2.43-3.051 11.1a2.921 2.921 0 0 0 .735 2.821l10.94 11.122a2.92 2.92 0 0 0 2.822.778l15.08-3.953a2.919 2.919 0 0 0 2.077-2.055l3.536-12.978.316.324a2.928 2.928 0 0 0 2.064.872c.254.001.508-.031.761-.098l20.839-5.48H103.275l.72-2.733.82-3.121h3.794l.822 3.122.718 2.732h24.059v-4.307c.07.092.133.194.207.282 1.729 2.119 5.001 4.643 10.76 4.643 2.735 0 4.945-.705 6.55-1.415v.797H180.119v-4.383c2.392 3.007 5.737 4.495 9.134 4.885-1.602 1.106-3.095 2.759-4.467 4.952-2.161 3.454-3.211 6.441-3.211 9.137 0 2.014.524 3.774 1.562 5.236 1.388 1.967 3.57 3.053 6.143 3.053.226 0 .384-.016.896-.073.142-.014.243-.025.312-.03 1.014-.043 2.078-.446 4.047-1.521.468-.248.973-.622 2.077-1.656.966 3.029 2.97 3.501 4.119 3.501 2.479 0 4.354-1.665 4.575-4.057.007-.045.041-.233.189-.649.774 1.335 2.059 2.415 4.188 2.415 2.658 0 4.791-2.088 6.555-4.378.065.155.132.312.203.47 1.794 4.082 4.646 4.694 6.185 4.694.76 0 1.52-.168 2.307-.503.228.213.463.419.726.605a6.818 6.818 0 0 0 3.993 1.302c2.273 0 4.515-.764 6.661-2.274 3.357-2.369 4.061-5.111 4.061-6.996 0-2.266-1.092-4.215-3.014-5.406a4.177 4.177 0 0 0 2.142-1.312c.918 1.27 1.794 2.475 2.303 3.129l1.917 2.468 2.74-1.503.268-.144c2.382-1.291 7.335-3.979 9.847-12.048l8.677-27.888 1.479-4.759h-4.984z"
+      fill="transparent"
+    />
+    <path
+      fill="currentColor"
+      d="M102.705 26.102h8.626l9.245 33.793h-7.549l-1.541-5.856h-9.448l-1.541 5.856h-7.189l9.397-33.793zm.411 23.008h7.291c-1.282-5.857-2.925-12.841-3.594-16.487-.719 3.647-2.362 10.63-3.697 16.487zm27.472 10.786h-6.931V22.969l6.931-1.026v37.953zm22.187-1.748c-.977.409-3.545 2.364-7.549 2.364-6.883 0-10.682-4.314-10.682-13.405 0-9.554 3.953-14.176 11.143-14.176 2.878 0 5.239.719 6.163 1.079l-.822 5.083c-.666-.256-2.517-.822-4.365-.822-3.388 0-4.981 2.62-4.981 8.579 0 6.061 1.747 8.267 4.775 8.267 2.108 0 4.008-1.128 4.726-1.386l1.592 4.417zm2.671-35.179l6.931-1.026v14.943h.105c.717-.667 3.079-3.954 7.291-3.954 4.826 0 6.728 2.979 6.728 9.193v17.771h-6.934V43.819c0-3.801-.616-4.879-2.721-4.879-2.107 0-3.853 2.157-4.47 2.876v18.079h-6.931V22.969zm44.73 35.026c-.771.514-3.956 2.518-9.038 2.518-5.957 0-10.785-3.852-10.785-13.097 0-9.811 4.775-14.484 10.63-14.484 5.854 0 9.963 3.646 9.963 12.273 0 1.851-.257 3.339-.309 3.597h-13.401c.05 4.571 2.311 6.469 5.235 6.469 2.773 0 5.086-1.231 6.319-1.795l1.386 4.519zm-12.941-13.509h7.034c0-5.237-1.437-6.624-3.338-6.624-1.798 0-3.646 1.643-3.696 6.624zm17.82-10.989h6.107l.31 3.543c.772-.925 2.722-4.109 6.624-4.109 2.98 0 4.828 1.027 5.598 4.057.874-1.181 3.03-4.057 6.728-4.057 4.468 0 6.37 2.517 6.37 9.141v17.823h-6.883V42.637c0-2.311-.358-3.697-2.158-3.697-1.797 0-3.183 2.054-3.543 2.876v18.079h-6.625V42.637c0-2.311-.358-3.697-2.157-3.697-1.796 0-3.131 2.003-3.542 2.876v18.079h-6.828V33.497zm56.744 0l-8.679 27.887c-2.156 6.934-6.213 8.886-8.37 10.067-.718-.926-2.414-3.287-3.081-4.213.771-.668 4.467-2.566 5.546-6.778l-8.318-26.963h7.239c.771 3.132 3.545 14.688 4.314 19.002.821-4.417 3.545-15.87 4.367-19.002h6.982z"
+    />
+    <g>
+      <path
+        fill="currentColor"
+        d="M193.986 68.011c.319 0 .667.193 1.031.578.897.95 1.506 1.125 2.353.546.367-.254.548-.633.508-1.05-.054-.799-.66-1.456-1.799-1.957-.818-.364-1.438-.541-1.896-.541-2.436.013-4.74 1.736-6.854 5.116-1.807 2.889-2.722 5.389-2.722 7.435 0 1.336.326 2.474.969 3.379.796 1.128 1.983 1.701 3.526 1.701.029 0 .213-.016.555-.054.268-.028.427-.045.47-.046.306 0 .867-.139 2.703-1.14.226-.117.704-.468 2.439-2.166 1.932-1.896 2.285-2.549 2.366-2.884.084-.275.01-.583-.22-.921-.238-.344-.523-.518-.838-.518a.786.786 0 0 0-.708.429c-.872 1.35-1.932 2.444-3.146 3.266-1.295.868-2.615 1.308-3.923 1.308-.778 0-1.671-.234-1.671-2.074 0-1.427.742-3.47 2.211-6.08 1.621-2.872 3.183-4.327 4.646-4.327zm30.25 10.553c-.354 0-.695.247-1.103.798-.301.408-.535.409-.654.408-.259-.01-1.135-.388-1.441-4.977l-.305-4.414c-.25-1.795-.915-2.704-1.979-2.704-.68 0-1.78.545-4.245 4.804a46.07 46.07 0 0 1-2.457 3.695c-.936 1.256-1.511 1.87-1.856 2.171-.082-.436-.124-.979-.124-1.635 0-.533.027-1.253.081-2.143.055-.995.089-1.633.101-1.925.039-2.004-.251-3.293-.885-3.941a1.569 1.569 0 0 0-1.157-.483c-1.114 0-2.453 1.26-4.214 3.968-.44.683-1.144 1.88-2.093 3.565.149-2.311.529-4.59 1.141-6.795.071-.267.054-.669-.433-1.089-.33-.287-.703-.436-1.107-.436-.863 0-1.277 1.173-1.539 2.19-.313 1.16-.526 2.592-.635 4.245-.119 1.754-.181 3.891-.181 6.36 0 .357.075.868.233 1.577.203.807.5 1.631 1.17 1.631.813 0 1.32-.423 1.381-1.157.113-1.165 1.095-3.422 2.918-6.71 1.54-2.804 2.334-3.953 2.701-4.42 0 .089 0 .194-.005.32-.15 3.265-.211 5.245-.182 5.886.105 2.516.823 3.792 2.139 3.792 1.21 0 2.685-1.261 4.636-3.968.255-.355 2.324-3.588 3.537-5.488.234-.37.414-.648.545-.854.012.086.021.184.031.293.052.55.064 1.329.038 2.328v2.002c.01 1.115.313 2.354.903 3.685.812 1.851 1.907 2.786 3.252 2.786.459 0 .972-.164 1.575-.502.819-.475 1.234-1.083 1.234-1.804.001-.652-.392-1.059-1.021-1.059zm6.628-4.902c-2.19 0-2.468-.365-2.475-.365 0-.874.821-2.04 2.372-3.37 1.809-1.556 2.828-1.882 3.366-1.882.036 0 .073.003.123.006.072.004.298.046.826.328.721.386.872.415 1.009.415.727 0 1.163-.494 1.163-1.324 0-.631-.425-1.187-1.268-1.647-.651-.35-1.201-.517-1.684-.517-1.572 0-3.401 1.039-5.592 3.175-2.195 2.138-3.262 3.892-3.262 5.361 0 .738.509 1.313 1.518 1.711.65.258 1.33.402 2.023.432l3.86.141c.473.023.891.157 1.28.407.556.367.619.737.619.983 0 .86-1.161 1.629-2.133 2.122-1.358.688-2.57 1.035-3.598 1.035-.625 0-.625-.247-.625-.444 0-.104.017-.197.054-.283.126-.3.213-.694.266-1.218l.035-.339-.312-.132c-.656-.279-1.311.032-1.813.841-.316.495-.47.93-.47 1.33 0 .904.4 1.646 1.192 2.199a3.557 3.557 0 0 0 2.134.712c1.598 0 3.218-.569 4.811-1.693 1.794-1.263 2.701-2.733 2.701-4.371.002-2.398-2.057-3.613-6.12-3.613z"
+      />
+    </g>
+    <g fill-rule="evenodd" clip-rule="evenodd" fill="currentColor">
+      <path
+        d="M47.632 51.588L23.382 57.956 5.754 40.043 12.401 15.762 36.65 9.393 54.254 27.305z"
+      />
+      <path
+        d="M57.42 79.029L43.781 82.603 33.888 72.543 37.632 58.91 51.244 55.334 61.138 65.395z"
+      />
+      <path
+        d="M86.963 59.079L67.775 64.128 53.829 49.94 59.066 30.726 78.277 25.679 92.223 39.865z"
+      />
+    </g>
+  </svg>
+  <small><%= Alchemy.version %></small>
+</div>

data/app/views/alchemy/admin/user_sessions/new.html.erb

@@ -3,17 +3,30 @@
 <% end %>
 
 <div class="login_signup_box">
-  <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
+  <%= render "alchemy/admin/user_sessions/logo" %>
+  <%= render_message do %>
+    <p>
+      <strong><%= Alchemy.t('modules.user_sessions') %></strong>
+    </p>
+    <p><%= Alchemy.t('welcome_please_identify_notice') %></p>
+  <% end %>
   <%= alchemy_form_for :user, url: {action: 'create'}, id: 'login', data: { turbo: false } do |f| %>
-    <%= f.input Devise.authentication_keys.first, autofocus: true %>
-    <%= f.input :password %>
-    <div class="input link">
-      <small>
-        <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
-      </small>
-    </div>
+    <%= f.input Devise.authentication_keys.first, autofocus: true, required: true,
+      input_html: {autocomplete: Devise.authentication_keys.first == :email ? "email" : "username"} %>
+    <%= f.input :password, required: true, input_html: {autocomplete: "current-password"} %>
+    <% if devise_mapping.rememberable? %>
+      <div class="input">
+        <span class="control-label">&nbsp;</span>
+
+        <%= f.label :remember_me, class: "checkbox" do %>
+          <%= f.check_box :remember_me, checked: true %>
+          <%= Alchemy.t(:remember_me, scope: 'admin.login', days: Devise.remember_for.in_days.to_i) %>
+        <% end %>
+      </div>
+    <% end %>
     <div class="submit">
-      <button class="secondary"><%= Alchemy.t(:login) %></button>
+      <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
+      <button type="submit"><%= Alchemy.t(:login) %></button>
     </div>
   <% end %>
 </div>

data/app/views/alchemy/admin/users/_fields.html.erb

@@ -1,13 +1,15 @@
-<%= f.input :firstname %>
-<%= f.input :lastname %>
-<%= f.input :login, autofocus: true %>
-<%= f.input :email %>
-<%= f.input :language,
-  collection: translations_for_select,
-  include_blank: false,
-  input_html: {class: 'alchemy_selectbox'} %>
-<%= f.input :password %>
-<%= f.input :password_confirmation %>
+<%= f.input :firstname, input_html: {autocomplete: "given-name"} %>
+<%= f.input :lastname, input_html: {autocomplete: "family-name"} %>
+<%= f.input :login, autofocus: true, required: @user.login_required?, input_html: {autocomplete: "username"} %>
+<%= f.input :email, required: @user.email_required?, input_html: {autocomplete: "email"} %>
+<% if Alchemy::I18n.available_locales.many? %>
+  <div class="input select">
+    <%= f.label(:language) %>
+    <%= render Alchemy::Admin::LocaleSelect.new(f.field_name(:language)) %>
+  </div>
+<% end %>
+<%= f.input :password, required: while_signup?, input_html: {autocomplete: "new-password"} %>
+<%= f.input :password_confirmation, required: while_signup?, input_html: {autocomplete: "new-password"} %>
 <% if can_update_role? %>
   <%= f.input :alchemy_roles,
     collection: @user_roles,
@@ -27,4 +29,8 @@
   </div>
 <% end %>
 <%= f.input :send_credentials, as: 'boolean' %>
-<%= f.submit Alchemy.t(:save) %>
+<div class="submit align-right">
+  <button type="submit">
+    <%= Alchemy.t(:save) %>
+  </button>
+</div>

data/app/views/alchemy/admin/users/_resource_table.html.erb

@@ -8,7 +8,7 @@
         alchemy.edit_admin_user_path(user), {
           title: Alchemy.t(:edit_user),
           overflow: true,
-          size: "430x560"
+          size: "430x500"
         },
         title: Alchemy.t(:edit_user) %>
     <% else %>
@@ -28,7 +28,7 @@
     <%= user.human_roles_string %>
   <% end %>
   <% table.delete_button tooltip: Alchemy.t(:delete_user), confirm_message: Alchemy.t(:confirm_to_delete_user) %>
-  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "430x560" %>
+  <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "430x500" %>
 <% end %>
 
 <%= paginate @users, theme: "alchemy" %>

data/app/views/alchemy/admin/users/index.html.erb

@@ -12,7 +12,7 @@
     tooltip_placement: "top-start",
     dialog_options: {
       title: Alchemy.t(:create_user),
-      size: "430x560"
+      size: "430x500"
     },
     if_permitted_to: [:create, Alchemy::User]
   ) %>
@@ -22,12 +22,7 @@
 <div id="archive_all" class="resources-table-wrapper">
 <% if @users.any? %>
   <%= render "alchemy/admin/resources/table_header" %>
-
-  <% if Alchemy::Admin.const_defined?(:Resource) %>
-    <%= render "resource_table" %>
-  <% else %>
-    <%= render "table" %>
-  <% end %>
+  <%= render "resource_table" %>
 
   <%= paginate @users, theme: 'alchemy' %>
 

data/app/views/alchemy/admin/users/signup.html.erb

@@ -3,9 +3,11 @@
 <% end %>
 
 <div class="login_signup_box">
-  <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
+  <%= render "alchemy/admin/user_sessions/logo" %>
   <%= render_message do %>
-    <h1><%= Alchemy.t('Welcome to Alchemy') %></h1>
+    <p>
+      <strong><%= Alchemy.t('Welcome to Alchemy') %></strong>
+    </p>
     <p><%= Alchemy.t("Please Signup") %></p>
   <% end %>
   <%= alchemy_form_for [:admin, @user] do |f| %>

data/config/initializers/alchemy.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.config.to_prepare do
-  require "alchemy/devise/ability"
-
   Alchemy.register_ability(Alchemy::Devise::Ability)
 
   Alchemy::Modules.register_module({

data/config/locales/de.yml

@@ -0,0 +1,5 @@
+de:
+  alchemy:
+    admin:
+      login:
+        remember_me: "Für %{days} Tage angemeldet bleiben"

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  alchemy:
+    admin:
+      login:
+        remember_me: "Remember me for %{days} days"

data/db/migrate/20251127170649_add_rememberable_column.rb

@@ -0,0 +1,5 @@
+class AddRememberableColumn < ActiveRecord::Migration[7.1]
+  def change
+    add_column :alchemy_users, :remember_created_at, :datetime, if_not_exists: true
+  end
+end

data/lib/alchemy/devise/configuration.rb

@@ -0,0 +1,46 @@
+require "alchemy/configuration"
+
+module Alchemy
+  module Devise
+    class Configuration < Alchemy::Configuration
+      # Layout for Alchemy Devise controllers
+      # Default is +alchemy/admin+
+      option :layout, :string, default: "alchemy/admin"
+
+      # Devise modules included in +Alchemy::User+ model
+      #
+      # === Default modules
+      #
+      #     [
+      #       :database_authenticatable,
+      #       :trackable,
+      #       :validatable,
+      #       :timeoutable,
+      #       :recoverable,
+      #       :rememberable
+      #     ]
+      #
+      # If you want to add additional modules into the Alchemy user class append
+      # them to this collection in an initializer in your app.
+      #
+      # === Example
+      #
+      #     # config/initializers/alchemy.rb
+      #     Alchemy::Devise.config.devise_modules << :registerable
+      #
+      # If your app uses an old encryption that needs the +devise-encryptable+ gem
+      # you also need to load the devise module.
+      #
+      #     Alchemy::Devise.config.devise_modules << :encryptable
+      #
+      option :devise_modules, :collection, collection_class: Set, item_type: :symbol, default: [
+        :database_authenticatable,
+        :trackable,
+        :validatable,
+        :timeoutable,
+        :recoverable,
+        :rememberable
+      ]
+    end
+  end
+end

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "8.0.0.b"
+    VERSION = "8.0.0"
   end
 end

data/lib/alchemy/devise.rb

@@ -1,48 +1,33 @@
+require "alchemy/devise/configuration"
 require "alchemy/devise/engine"
 
 module Alchemy
-  # Devise modules included in +Alchemy::User+ model
-  #
-  # === Default modules
-  #
-  #     [
-  # .      :database_authenticatable,
-  #       :trackable,
-  #       :validatable,
-  #       :timeoutable,
-  #       :recoverable
-  # .    ]
-  #
-  # If you want to add additional modules into the Alchemy user class append
-  # them to this collection in an initializer in your app.
-  #
-  # === Example
-  #
-  #     # config/initializers/alchemy.rb
-  #     Alchemy.devise_modules << :registerable
-  #
-  # If your app uses an old encryption that needs the +devise-encryptable+ gem
-  # you also need to load the devise module.
-  #
-  #     Alchemy.devise_modules << :encryptable
-  #
-  def self.devise_modules
-    @devise_modules ||= [
-      :database_authenticatable,
-      :trackable,
-      :validatable,
-      :timeoutable,
-      :recoverable
-    ]
-  end
-
   module Devise
-    def self.layout=(value)
-      @layout = value
+    extend self
+
+    def deprecator
+      ActiveSupport::Deprecation.new("9.0", "Alchemy::Devise")
     end
 
-    def self.layout
-      @layout || "alchemy/admin"
+    delegate :layout=, to: :config
+    deprecate "layout=": "Use `Alchemy::Devise.config.layout=` instead.",
+      deprecator: Alchemy::Devise.deprecator
+
+    delegate :layout, to: :config
+    deprecate layout: "Use `Alchemy::Devise.config.layout` instead.",
+      deprecator: Alchemy::Devise.deprecator
+
+    def config
+      @config ||= Alchemy::Devise::Configuration.new
+    end
+
+    def configure(&blk)
+      yield config
     end
   end
+
+  extend self
+
+  deprecate devise_modules: "Alchemy::Devise.config.devise_modules", deprecator: Alchemy::Devise.deprecator
+  delegate :devise_modules, to: "Alchemy::Devise.config"
 end

data/lib/generators/alchemy/devise/install/templates/devise.rb.tt

@@ -302,7 +302,7 @@ Devise.setup do |config|
   # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
   # these new defaults that match Hotwire/Turbo behavior.
   # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = :unprocessable_entity
+  config.responder.error_status = :unprocessable_content
   config.responder.redirect_status = :see_other
 
   # ==> Configuration for :registerable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 8.0.0.b
+  version: 8.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -152,22 +152,21 @@ files:
 - LICENSE
 - README.md
 - app/assets/builds/alchemy-devise.css
-- app/assets/builds/alchemy-devise.css.map
 - app/assets/stylesheets/alchemy-devise.scss
 - app/assets/stylesheets/alchemy-devise/login.scss
 - app/controllers/alchemy/admin/passwords_controller.rb
 - app/controllers/alchemy/admin/user_sessions_controller.rb
 - app/controllers/alchemy/admin/users_controller.rb
 - app/mailers/alchemy/notifications.rb
+- app/models/alchemy/devise/ability.rb
 - app/models/alchemy/user.rb
 - app/patches/controllers/alchemy/devise/base_controller_patch.rb
 - app/views/alchemy/admin/passwords/edit.html.erb
 - app/views/alchemy/admin/passwords/new.html.erb
+- app/views/alchemy/admin/user_sessions/_logo.html.erb
 - app/views/alchemy/admin/user_sessions/new.html.erb
 - app/views/alchemy/admin/users/_fields.html.erb
 - app/views/alchemy/admin/users/_resource_table.html.erb
-- app/views/alchemy/admin/users/_table.html.erb
-- app/views/alchemy/admin/users/_user.html.erb
 - app/views/alchemy/admin/users/edit.html.erb
 - app/views/alchemy/admin/users/index.html.erb
 - app/views/alchemy/admin/users/new.html.erb
@@ -185,13 +184,16 @@ files:
 - app/views/alchemy/notifications/reset_password_instructions.es.text.erb
 - app/views/alchemy/notifications/reset_password_instructions.ru.text.erb
 - config/initializers/alchemy.rb
+- config/locales/de.yml
+- config/locales/en.yml
 - config/routes.rb
 - config/spring.rb
 - db/migrate/20131015124700_create_alchemy_users.rb
 - db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb
 - db/migrate/20141209144532_add_indexes_to_alchemy_users.rb
+- db/migrate/20251127170649_add_rememberable_column.rb
 - lib/alchemy/devise.rb
-- lib/alchemy/devise/ability.rb
+- lib/alchemy/devise/configuration.rb
 - lib/alchemy/devise/engine.rb
 - lib/alchemy/devise/test_support/factories.rb
 - lib/alchemy/devise/version.rb

data/app/assets/builds/alchemy-devise.css.map

@@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["../stylesheets/alchemy-devise/login.scss"],"names":[],"mappings":"AAAA,kCAEE,wCACA,yBAEA,sCACE,yBAGF,gHAEE,2BAGF,kDACE,kBAIJ,MACE,YACA,YACA,qBAGF,kBACE,kBACA,YACA,QACA,SACA,gCACA,6CACA,oDACA,4DAEA,yBACE,aAGF,2BACE,kBAGF,wBACE,iBAGF,mCACE,yBACA","file":"alchemy-devise.css"}

data/app/views/alchemy/admin/users/_table.html.erb

@@ -1,28 +0,0 @@
-<table class="list" id="user_list">
-  <thead>
-    <tr>
-      <th class="icon"></th>
-      <th class="login">
-        <%= sort_link @query, :login, hide_indicator: true %>
-      </th>
-      <th class="name">
-        <%= sort_link @query, :firstname, hide_indicator: true %>
-      </th>
-      <th>
-        <%= sort_link @query, :lastname, hide_indicator: true %>
-      </th>
-      <th class="email">
-        <%= sort_link @query, :email, hide_indicator: true %>
-      </th>
-      <th><%= Alchemy::User.human_attribute_name('language') %></th>
-      <th>
-        <%= sort_link @query, :last_sign_in_at, hide_indicator: true %>
-      </th>
-      <th class="role"><%= Alchemy::User.human_attribute_name('roles') %></th>
-      <th class="tools"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render partial: "user", collection: @users %>
-  </tbody>
-</table>

data/app/views/alchemy/admin/users/_user.html.erb

@@ -1,41 +0,0 @@
-<tr class="<%= cycle('even', 'odd') %>">
-  <td class="icon">
-    <%= render_icon(:user, style: user.logged_in? ? 'solid' : 'regular') %>
-  </td>
-  <td class="login">
-  <% if can?(:edit, user) %>
-    <%= link_to_dialog user.login,
-      alchemy.edit_admin_user_path(user), {
-        title: Alchemy.t(:edit_user),
-        overflow: true,
-        size: '430x560'
-      },
-      title: Alchemy.t(:edit_user) %>
-  <% end %>
-  </td>
-  <td class="name"><%= user.firstname %></td>
-  <td><%= user.lastname %></td>
-  <td class="email"><%= user.email %></td>
-  <td><%= Alchemy.t(user.language, scope: 'translations', default: Alchemy.t(:unknown)) %></td>
-  <td><%= user.last_sign_in_at.present? ? l(user.last_sign_in_at, format: 'alchemy.default'.to_sym) : Alchemy.t(:unknown) %></td>
-  <td class="role"><%= user.human_roles_string %></td>
-  <td class="tools">
-  <% if can?(:destroy, user) %>
-    <%= delete_button alchemy.admin_user_path(user), {
-      message: Alchemy.t(:confirm_to_delete_user),
-      title: Alchemy.t(:delete_user),
-      icon: :minus
-    },
-    title: Alchemy.t(:delete_user) %>
-  <% end %>
-  <% if can?(:edit, user) %>
-    <%= link_to_dialog render_icon(:edit),
-      alchemy.edit_admin_user_path(user), {
-        title: Alchemy.t(:edit_user),
-        overflow: true,
-        size: '430x560'
-      },
-      title: Alchemy.t(:edit_user) %>
-  <% end %>
-  </td>
-</tr>