alchemy-devise 7.1.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dba17f7796f78c02350259cc911af0f7a282da96a067350e68e07a2af10643e
-  data.tar.gz: 115b4571d47e99323d9d68d7b1ecd5347eb8ac3a0e42fd503d378cd0e237c192
+  metadata.gz: 50fb7555da0609c974b6455982abcc8cd18e023ab14bca6c8d925c698edca6a5
+  data.tar.gz: b5e00e701e89fbd07b9f63886562e0ada6e0daeba1b7c53787b91d0fb65bc844
 SHA512:
-  metadata.gz: 5540972780cc1d5c00986f8691890882c48ba95616a693424fa9fee6e78b5a317c09c213693d325b33612a02d746ced546d31b9874717d1d8b22dc2eb71704a7
-  data.tar.gz: 8f319ab62741f16116de9171d18f84115d2d51a5152507d0dd07f7f56f4c0c3b712c27cbe03fab1c79f0c980b76baf5254e749f44df5094de3ac94ff483693ef
+  metadata.gz: cf3b05ce4e55d5bcedd941acbb7736a1ffe3b377d52c4084ee0bf61b387c9bc343cf07d3f21e2fa4362693fdddd3a8d7c643b71fe2d83117acfe95c43cfec90c
+  data.tar.gz: bea6ab34bc7216a89a835fa916dbe08b03ebb5e66db087e1cd9d38908722971cb909e370581bf0ddab822dbc5434370c1637973822d29c4391890899c3024d15

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.3.0 (2024-09-06)
+
+- Use new resource_table component for user list [#213](https://github.com/AlchemyCMS/alchemy-devise/pull/213) ([tvdeyen](https://github.com/tvdeyen))
+- Compile CSS into Gem [#211](https://github.com/AlchemyCMS/alchemy-devise/pull/211) ([tvdeyen](https://github.com/tvdeyen))
+
+## 7.2.0 (2024-06-07)
+
+- Update Devise config for Turbo [#209](https://github.com/AlchemyCMS/alchemy-devise/pull/209) ([tvdeyen](https://github.com/tvdeyen))
+- Disable Turbo Drive on login form [#203](https://github.com/AlchemyCMS/alchemy-devise/pull/203) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.1.2 (2024-02-29)
 
 - Allow setting a layout for user_sessions and passwords controller [#127](https://github.com/AlchemyCMS/alchemy-devise/pull/127) ([robinboening](https://github.com/robinboening))

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

@@ -0,0 +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%)}.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)}form.user_roles .checkbox{display:inline-block;width:50%}/*# sourceMappingURL=alchemy-devise.css.map */

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

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

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

@@ -1,10 +1,10 @@
 body.user_sessions,
 body.passwords {
-  background-color: $main-menu-bg-color;
-  color: $white;
+  background-color: var(--color-blue_dark);
+  color: var(--color-white);
 
   a {
-    color: $white;
+    color: var(--color-white);
   }
 
   #errors,
@@ -43,7 +43,7 @@ body.passwords {
   }
 
   button.secondary {
-    color: $white;
-    border-color: $white;
+    color: var(--color-white);
+    border-color: var(--color-white);
   }
 }

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

@@ -1,2 +1 @@
-@import "alchemy/defaults";
-@import "alchemy-devise/*";
+@import "alchemy-devise/login";

data/app/models/alchemy/user.rb

@@ -47,6 +47,10 @@ module Alchemy
         ]
       end
 
+      def ransortable_attributes(_auth_object = nil)
+        %w[last_sign_in_at]
+      end
+
       alias_method :searchable_alchemy_resource_attributes, :ransackable_attributes
 
       def ransackable_associations(_auth_object = nil)

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

@@ -1,3 +1,7 @@
+<%= content_for :stylesheets do %>
+  <%= stylesheet_link_tag "alchemy-devise" %>
+<% end %>
+
 <div class="login_signup_box">
   <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
 <% if @user.errors.blank? %>

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

@@ -1,3 +1,7 @@
+<%= content_for :stylesheets do %>
+  <%= stylesheet_link_tag "alchemy-devise" %>
+<% end %>
+
 <div class="login_signup_box">
   <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
 <% if @user.errors.blank? %>

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

@@ -1,6 +1,10 @@
+<%= content_for :stylesheets do %>
+  <%= stylesheet_link_tag "alchemy-devise" %>
+<% end %>
+
 <div class="login_signup_box">
   <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
-  <%= alchemy_form_for :user, url: {action: 'create'}, id: 'login' do |f| %>
+  <%= 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">
@@ -13,11 +17,3 @@
     </div>
   <% end %>
 </div>
-
-<%- content_for :javascripts do -%>
-<script type="text/javascript" charset="utf-8">
-  jQuery(function($) {
-    $('#user_login').focus();
-  });
-</script>
-<%- end -%>

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

@@ -0,0 +1,34 @@
+<%= render Alchemy::Admin::Resource::Table.new(@users, query: @query) do |table| %>
+  <% table.icon_column do |user| %>
+    <%= render_icon(:user, style: user.logged_in? ? "solid" : "regular") %>
+  <% end %>
+  <% table.column :login, sortable: true do |user| %>
+    <% 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) %>
+    <% else %>
+      <%= user.login %>
+    <% end %>
+  <% end %>
+  <% table.column :firstname, class_name: "name", sortable: true %>
+  <% table.column :lastname, sortable: true %>
+  <% table.column :email, sortable: true %>
+  <% table.column :language do |user| %>
+    <%= Alchemy.t(user.language, scope: :translations, default: Alchemy.t(:unknown)) %>
+  <% end %>
+  <% table.column :last_sign_in_at, sortable: true do |user| %>
+    <%= user.last_sign_in_at.present? ? l(user.last_sign_in_at, format: :"alchemy.default") : Alchemy.t(:unknown) %>
+  <% end %>
+  <% table.column :role, header: Alchemy::User.human_attribute_name(:alchemy_roles) do |user| %>
+    <%= 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" %>
+<% end %>
+
+<%= paginate @users, theme: "alchemy" %>

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

@@ -0,0 +1,28 @@
+<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/index.html.erb

@@ -1,3 +1,7 @@
+<%= content_for :stylesheets do %>
+  <%= stylesheet_link_tag "alchemy-devise" %>
+<% end %>
+
 <%= content_for :toolbar do %>
   <%= toolbar_button(
     icon: :plus,
@@ -16,37 +20,14 @@
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= render "alchemy/admin/resources/table_header" %>
 <% if @users.any? %>
+  <%= render "alchemy/admin/resources/table_header" %>
 
-  <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: 'alchemy/admin/users/user', collection: @users %>
-    </tbody>
-  </table>
+  <% if Alchemy::Admin.const_defined?(:Resource) %>
+    <%= render "resource_table" %>
+  <% else %>
+    <%= render "table" %>
+  <% end %>
 
   <%= paginate @users, theme: 'alchemy' %>
 

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

@@ -1,3 +1,7 @@
+<%= content_for :stylesheets do %>
+  <%= stylesheet_link_tag "alchemy-devise" %>
+<% end %>
+
 <div class="login_signup_box">
   <%= image_tag 'alchemy/alchemy-logo.svg', id: 'logo' %>
   <%= render_message do %>

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "7.1.2"
+    VERSION = "7.3.0"
   end
 end

data/lib/generators/alchemy/devise/install/install_generator.rb

@@ -16,12 +16,6 @@ module Alchemy
         def run_migrations
           run "bundle exec rake db:migrate"
         end
-
-        def append_assets
-          insert_into_file "vendor/assets/stylesheets/alchemy/admin/all.css",
-            "\n *= require alchemy/admin/alchemy-devise",
-            after: " *= require alchemy/admin"
-        end
       end
     end
   end

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

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+# Assuming you have not yet modified this file, each configuration option below
+# is set to its default value. Note that some are commented out while others
+# are not: uncommented lines are intended to protect your configuration from
+# breaking changes in upgrades (i.e., in the event that future versions of
+# Devise change the default values for those options).
+#
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -68,7 +74,10 @@ Devise.setup do |config|
   # Tell if authentication through HTTP Auth is enabled. False by default.
   # It can be set to an array that will enable http authentication only for the
   # given strategies, for example, `config.http_authenticatable = [:database]` will
-  # enable it only for database authentication. The supported strategies are:
+  # enable it only for database authentication.
+  # For API-only applications to support authentication "out-of-the-box", you will likely want to
+  # enable this with :database unless you are using a custom strategy.
+  # The supported strategies are:
   # :database      = Support basic authentication with authentication key + password
   config.http_authenticatable = true
 
@@ -103,15 +112,18 @@ Devise.setup do |config|
   # config.reload_routes = true
 
   # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # For bcrypt, this is the cost for hashing the password and defaults to 12. If
   # using other algorithms, it sets how many times you want the password to be hashed.
+  # The number of stretches used for generating the hashed password are stored
+  # with the hashed password. This allows you to change the stretches without
+  # invalidating existing passwords.
   #
   # Limiting the stretches to just one in testing will increase the performance of
   # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
   # a value less than 10 in other environments. Note that, for bcrypt (the default
   # algorithm), the cost increases exponentially with the number of stretches (e.g.
   # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
-  config.stretches = Rails.env.test? ? 1 : 11
+  config.stretches = Rails.env.test? ? 1 : 12
 
   # Set up a pepper to generate the hashed password.
   # config.pepper = '<%= SecureRandom.hex(64) %>'
@@ -244,14 +256,14 @@ Devise.setup do |config|
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
+  # :html should redirect to the sign in page when the user does not have
   # access, but formats like :xml or :json, should return 401.
   #
   # If you have any extra navigational formats, like :iphone or :mobile, you
   # should add them to the navigational formats lists.
   #
   # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ['*/*', :html]
+  # config.navigational_formats = ['*/*', :html, :turbo_stream]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :delete
@@ -284,12 +296,14 @@ Devise.setup do |config|
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
 
-  # ==> Turbolinks configuration
-  # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
-  #
-  # ActiveSupport.on_load(:devise_failure_app) do
-  #   include Turbolinks::Controller
-  # end
+  # ==> Hotwire/Turbo configuration
+  # When using Devise with Hotwire/Turbo, the http status for error responses
+  # and some redirects must match the following. The default in Devise for existing
+  # 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.redirect_status = :see_other
 
   # ==> Configuration for :registerable
 

metadata

@@ -1,55 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +132,10 @@ files:
 - CHANGELOG.md
 - 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/assets/stylesheets/alchemy-devise/users.scss
-- app/assets/stylesheets/alchemy/admin/alchemy-devise.css
 - app/controllers/alchemy/admin/passwords_controller.rb
 - app/controllers/alchemy/admin/user_sessions_controller.rb
 - app/controllers/alchemy/admin/users_controller.rb
@@ -158,6 +146,8 @@ files:
 - app/views/alchemy/admin/passwords/new.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
@@ -210,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.

data/app/assets/stylesheets/alchemy/admin/alchemy-devise.css

@@ -1,3 +0,0 @@
-/*
- *= require alchemy-devise
- */

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

@@ -1,7 +0,0 @@
-form {
-
-  &.user_roles .checkbox {
-    display: inline-block;
-    width: 50%;
-  }
-}