alchemy-devise 7.4.1 → 8.0.0.b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5d447cfdfb707f5624e4b1803029dbb76e1516964be8df050e997a52a173202
-  data.tar.gz: 251266f1e5032339894c027e27d36943303ac7e2663e6cd8a706a556d206e56d
+  metadata.gz: 3c1338a60cd662f003273c43a2389f1138c7c889909fc0aaf8ddb7ee6ab59812
+  data.tar.gz: a86d926627ab17965deb01378a3d67e872a3b042fee0e1340290702bb0b19229
 SHA512:
-  metadata.gz: e55c976529fabecea15bb9d103d86e2fb3fe057e6c719e464764ea1f716403edd2c2d9e11ce9685b0bf6cb46b374c7ab30d514e1273e9700145d8116d8ce13aa
-  data.tar.gz: 2772bbfcf3d755654832055e168fe45fb30c893718322622b463d2b7fc98add973dd41ccad91d5fa03b7f4a6002b957b8ec842488430bc2233e33ce093cce8a8
+  metadata.gz: 184e26ecc9d543c34db5aaa90aa83ab7d37b21113bd33af9878cc6e5bf5bf1e441914029198a4233f6b68d6eb5bc0c9bb6b6ab26e9cf2aaa9cf5f736590944be
+  data.tar.gz: 6e49acd84dc13aa600b75b3eaaacfc71498375f4fb7363c37bba61bfc8f4267efd02f87f750f2abbf109c5dfd5eed29abd7a648beb0d22017c352e678c8e08c3

data/README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/AlchemyCMS/alchemy-devise/actions/workflows/ci.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy-devise/actions/workflows/ci.yml)
 [![Brakeman Scan](https://github.com/AlchemyCMS/alchemy-devise/actions/workflows/brakeman-analysis.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy-devise/actions/workflows/brakeman-analysis.yml)
 
-[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise)
+[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![codecov](https://codecov.io/gh/AlchemyCMS/alchemy-devise/graph/badge.svg?token=b47JTwIYJG)](https://codecov.io/gh/AlchemyCMS/alchemy-devise)
 
 AlchemyCMS has no authentication in its core. So it is possible to bring your own authentication and use it to authorize users in AlchemyCMS. If you don't have your own authentication, you can use this gem.
 

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%)}.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 */
+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 */

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

@@ -1 +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"}
+{"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/assets/stylesheets/alchemy-devise/login.scss

@@ -29,6 +29,9 @@ body.passwords {
   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 & {
     display: none;

data/app/mailers/alchemy/notifications.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class Notifications < ActionMailer::Base
-    default(from: Config.get(:mailer)["mail_from"])
+    default(from: Alchemy.config.get(:mailer)["mail_from"])
 
     def member_created(user)
       @user = user

data/app/models/alchemy/user.rb

@@ -35,7 +35,7 @@ module Alchemy
     scope :logged_in, -> { where("last_request_at > ?", logged_in_timeout.seconds.ago) }
     scope :logged_out, -> { where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago) }
 
-    ROLES = Config.get(:user_roles)
+    ROLES = Alchemy.config.user_roles
 
     class << self
       def ransackable_attributes(_auth_object = nil)
@@ -65,7 +65,7 @@ module Alchemy
       end
 
       def logged_in_timeout
-        Config.get(:auto_logout_time).minutes.to_i
+        Alchemy.config.get(:auto_logout_time).minutes.to_i
       end
     end
 

data/app/patches/controllers/alchemy/devise/base_controller_patch.rb

@@ -0,0 +1,20 @@
+module Alchemy
+  module Devise
+    module BaseControllerPatch
+      def self.prepended(base)
+        base.before_action(:store_user_request_time)
+      end
+
+      private
+
+      # Stores the users request time.
+      def store_user_request_time
+        if alchemy_user_signed_in?
+          current_alchemy_user.store_request_time!
+        end
+      end
+
+      Alchemy::BaseController.prepend self
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= content_for :toolbar do %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: :plus,
     label: Alchemy.t(:create_user),
     url: alchemy.new_admin_user_path,

data/config/initializers/alchemy.rb

@@ -3,16 +3,6 @@
 Rails.application.config.to_prepare do
   require "alchemy/devise/ability"
 
-  alchemy_7_4 = Gem::Version.new("7.4.0.a")
-
-  icon = if Alchemy.gem_version.between? Gem::Version.new("7.1.0-b1"), alchemy_7_4
-    "group-line"
-  elsif Alchemy.gem_version > alchemy_7_4
-    "group"
-  else
-    "users"
-  end
-
   Alchemy.register_ability(Alchemy::Devise::Ability)
 
   Alchemy::Modules.register_module({
@@ -23,7 +13,7 @@ Rails.application.config.to_prepare do
       name: "modules.users",
       controller: "/alchemy/admin/users",
       action: "index",
-      icon: icon
+      icon: "group"
     }
   })
 

data/lib/alchemy/devise/engine.rb

@@ -1,9 +1,12 @@
 require "alchemy_cms"
 require "devise"
+require "flickwerk"
 
 module Alchemy
   module Devise
     class Engine < ::Rails::Engine
+      include Flickwerk
+
       isolate_namespace Alchemy
       engine_name "alchemy_devise"
 
@@ -16,10 +19,6 @@ module Alchemy
           "alchemy-devise.css"
         ]
       end
-
-      config.to_prepare do
-        require_relative "../../../app/controllers/alchemy/base_controller_extension"
-      end
     end
   end
 end

data/lib/alchemy/devise/version.rb

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

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

@@ -24,7 +24,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = Alchemy::Config.get(:mailer)['mail_from']
+  config.mailer_sender = Alchemy.config.mailer.mail_from
 
   # Configure the class responsible to send e-mails.
   config.mailer = "Alchemy::Notifications"
@@ -188,7 +188,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  config.timeout_in = Rails.env.development? ? nil : Alchemy::Config.get(:auto_logout_time).minutes
+  config.timeout_in = Rails.env.development? ? nil : Alchemy.config.auto_logout_time.minutes
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 7.4.1
+  version: 8.0.0.b
 platform: ruby
 authors:
 - Thomas von Deyen
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.0.0.a
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 8.0.0.a
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +43,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
+- !ruby/object:Gem::Dependency
+  name: flickwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -138,9 +158,9 @@ files:
 - app/controllers/alchemy/admin/passwords_controller.rb
 - app/controllers/alchemy/admin/user_sessions_controller.rb
 - app/controllers/alchemy/admin/users_controller.rb
-- app/controllers/alchemy/base_controller_extension.rb
 - app/mailers/alchemy/notifications.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/new.html.erb
@@ -199,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.
 test_files: []

data/app/controllers/alchemy/base_controller_extension.rb

@@ -1,18 +0,0 @@
-module Alchemy
-  module BaseControllerExtension
-    def self.prepended(base)
-      base.before_action(:store_user_request_time)
-    end
-
-    private
-
-    # Stores the users request time.
-    def store_user_request_time
-      if alchemy_user_signed_in?
-        current_alchemy_user.store_request_time!
-      end
-    end
-  end
-end
-
-Alchemy::BaseController.prepend Alchemy::BaseControllerExtension