alchemy-devise 4.3.1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ff701dc927764bc7c9cf43cc470f882d35c50bf4ad9f9a29c828b33934200e
-  data.tar.gz: b78d425267af7117f47e525553c63a1a744a0ec19857b0b615a2f01c26daac24
+  metadata.gz: d7cf8952620a0f56d95f9f809b61d1711b617a213d43ac6ed55e8b180aa194ef
+  data.tar.gz: 85ea1e249415b2d8aa14a4edcf2dc429bc18a813f26f740ee3aca43240bbd907
 SHA512:
-  metadata.gz: '0898ee0e43338c75145a93b7c7007ca86f60a1896688561f705a83fdc6f521f54eeb1ad31639416c2605f3028b62f517a3d6de2a53d07066bb57874383494f35'
-  data.tar.gz: 95f9ca999bc45d9ceaff08bde3369e296aa546714c029491f33b93e0228f0d44900a43cb4a70e1e28b1c2517a9006daa8f598e44d8c39dc26b34a283235c4142
+  metadata.gz: cf1515c619d2231aea6032dce59d2d64a75c8588810b7438466b5ab38275c67e4207e05e2ebf7ecb3e373a6bbe0472b4a7572b709ac959933ca624676b257bce
+  data.tar.gz: d275895d02b2b8646dfb7a92a8724a9fc1ba258ba116e6dc0c359933fd9e4f06dbd4390bab5706aafc8f09822d953af12d40c4311e1822a07f7509c751bb0683

data/README.md

@@ -1,4 +1,4 @@
-## Devise based authentication for AlchemyCMS 4.2
+## Devise based authentication for AlchemyCMS
 
 [![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=master)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
 
@@ -12,7 +12,7 @@ Just put the gem into your projects `Gemfile`.
 
 ```ruby
 # Gemfile
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.2-stable'
+gem 'alchemy-devise'
 ```
 
 and run `bundle install`.

data/Rakefile

@@ -33,7 +33,9 @@ namespace :alchemy do
       system <<-BASH
 cd spec/dummy
 export RAILS_ENV=test
-bin/rake db:create db:environment:set db:migrate
+bin/rake railties:install:migrations
+bin/rake db:drop db:create db:migrate
+bin/rails g alchemy:install --force --auto-accept
 bin/rails g alchemy:devise:install --force
 cd -
 BASH
@@ -46,7 +48,7 @@ BASH
       original_file = './CHANGELOG.md'
       new_file = original_file + '.new'
       backup = original_file + '.old'
-      changes = `git rev-list #{ENV['PREVIOUS_VERSION']}...master | bundle exec github_fast_changelog AlchemyCMS/alchemy-devise`
+      changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}...main | bundle exec github_fast_changelog AlchemyCMS/alchemy-devise`
       File.open(new_file, 'w') do |fo|
         fo.puts changes
         File.foreach(original_file) do |li|

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "alchemy/version"
+
+module Alchemy
+  module Admin
+    class PasswordsController < ::Devise::PasswordsController
+      include Alchemy::Admin::Locale
+
+      if Alchemy.gem_version <= Gem::Version.new("4.9")
+        before_action { enforce_ssl if ssl_required? && !request.ssl? }
+      end
+
+      helper "Alchemy::Admin::Base"
+
+      layout "alchemy/admin"
+
+      private
+
+      # Override for Devise method
+      def new_session_path(resource_name)
+        alchemy.admin_login_path
+      end
+
+      def admin_edit_password_url(_resource, options = {})
+        alchemy.admin_edit_password_url(options)
+      end
+
+      def after_resetting_password_path_for(resource)
+        if can? :index, :alchemy_admin_dashboard
+          alchemy.admin_dashboard_path
+        else
+          alchemy.root_path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "alchemy/version"
+
+module Alchemy
+  module Admin
+    class UserSessionsController < ::Devise::SessionsController
+      include Alchemy::Admin::Locale
+
+      protect_from_forgery prepend: true
+
+      if Alchemy.gem_version <= Gem::Version.new("4.9")
+        before_action except: "destroy" do
+          enforce_ssl if ssl_required? && !request.ssl?
+        end
+      end
+      before_action :check_user_count, :only => :new
+
+      helper "Alchemy::Admin::Base"
+
+      layout "alchemy/admin"
+
+      def create
+        authenticate_user!
+
+        if user_signed_in?
+          if session[:redirect_path].blank?
+            redirect_path = admin_dashboard_path
+          else
+            # We have to strip double slashes from beginning of path, because of strange rails/rack bug.
+            redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, "/")
+          end
+          redirect_to redirect_path,
+            notice: t(:signed_in, scope: "devise.sessions")
+        else
+          super
+        end
+      end
+
+      def destroy
+        current_alchemy_user.try(:unlock_pages!)
+        cookies.clear
+        session.clear
+        super
+      end
+
+      private
+
+      def check_user_count
+        if User.count == 0
+          redirect_to admin_signup_path
+        end
+      end
+
+      # Overwriting the default of Devise
+      def after_sign_out_path_for(resource_or_scope)
+        if request.referer.blank? || request.referer.to_s =~ /admin/
+          root_path
+        else
+          request.referer
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Alchemy
   module Admin
     class UsersController < ResourcesController
 
-      before_action :set_roles_and_genders, except: [:index, :destroy]
+      before_action :set_roles, except: [:index, :destroy]
 
       load_and_authorize_resource class: Alchemy::User,
         only: [:edit, :update, :destroy]
@@ -67,13 +67,12 @@ module Alchemy
 
       private
 
-      def set_roles_and_genders
+      def set_roles
         if can_update_role?
           @user_roles = User::ROLES.map do |role|
             [User.human_rolename(role), role]
           end
         end
-        @user_genders = User.genders_for_select
       end
 
       def user_params

data/app/mailers/alchemy/notifications.rb

@@ -5,7 +5,7 @@ module Alchemy
 
     def member_created(user)
       @user = user
-      @url = login_url
+
       mail(
         to: user.email,
         subject: Alchemy.t("Your user credentials")

data/app/models/alchemy/user.rb

@@ -8,7 +8,6 @@ module Alchemy
       :lastname,
       :login,
       :email,
-      :gender,
       :language,
       :password,
       :password_confirmation,
@@ -41,13 +40,6 @@ module Alchemy
         Alchemy.t("user_roles.#{role}")
       end
 
-      def genders_for_select
-        [
-          [Alchemy.t('male'), 'male'],
-          [Alchemy.t('female'), 'female']
-        ]
-      end
-
       def logged_in_timeout
         Config.get(:auto_logout_time).minutes.to_i
       end

data/app/views/alchemy/{passwords → admin/passwords}/edit.html.erb

@@ -10,13 +10,13 @@
     <%= devise_error_messages! %>
   </div>
 <% end %>
-  <%= alchemy_form_for resource, as: resource_name, url: update_password_path, method: 'patch' do |f| %>
+  <%= 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.login_path %>
+        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
       </small>
     </div>
     <%= f.submit Alchemy.t("Change password") %>

data/app/views/alchemy/{passwords → admin/passwords}/new.html.erb

@@ -10,13 +10,13 @@
     <%= devise_error_messages! %>
   </div>
 <% end %>
-  <%= alchemy_form_for :user, url: reset_password_path, html: {method: 'post'} do |f| %>
+  <%= 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.login_path %>
+        <%= link_to Alchemy.t(:back), alchemy.admin_login_path %>
       </small>
     </div>
     <%= f.submit Alchemy.t("Send reset instructions"), input_html: {class: 'secondary'} %>

data/app/views/alchemy/{user_sessions → admin/user_sessions}/new.html.erb

@@ -5,7 +5,7 @@
     <%= f.input :password %>
     <div class="input link">
       <small>
-        <%= link_to Alchemy.t('Forgot your password?'), new_password_path %>
+        <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
       </small>
     </div>
     <div class="submit">

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

@@ -1,7 +1,3 @@
-<%= f.input :gender,
-  collection: @user_genders,
-  prompt: Alchemy.t('Please choose'),
-  input_html: {class: 'alchemy_selectbox'} %>
 <%= f.input :firstname %>
 <%= f.input :lastname %>
 <%= f.input :login, autofocus: true %>

data/app/views/alchemy/notifications/alchemy_user_created.de.text.erb

@@ -10,6 +10,6 @@ Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht dar.
 
 Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 Viel Spaß mit Alchemy!

data/app/views/alchemy/notifications/alchemy_user_created.en.text.erb

@@ -10,6 +10,6 @@ For security reasons we do not show your password here.
 
 If you forgot your password or this is your first login, please goto:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 Have much fun with Alchemy!

data/app/views/alchemy/notifications/alchemy_user_created.es.text.erb

@@ -10,6 +10,6 @@ Por razones de seguridad no mostraremos aquí tu contraseña.
 
 Si has olvidado tu contraseña o es tu primer acceso, por favor, accede a:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 ¡Disfruta de tu web con Alchemy!

data/app/views/alchemy/notifications/alchemy_user_created.ru.text.erb

@@ -10,6 +10,6 @@
 
 Если вы забыли ваш пароль или если это ваш первый визит, пожалуйста, перейдите по ссылке:
 
-<%= alchemy.new_password_url %>
+<%= alchemy.admin_new_password_url %>
 
 Наслаждайтесь использованием Alchemy!

data/app/views/alchemy/notifications/member_created.de.text.erb

@@ -8,6 +8,6 @@ Es wurde ein Zufallspasswort generiert. Aus Sicherheitsgründen wird dieses hier
 
 Klicken Sie bitte daher auf den folgenden Link (*), um sich ein neues Passwort zu vergeben:
 
-<%= alchemy.new_password_url(email: @user.email) %>
+<%= alchemy.admin_new_password_url(email: @user.email) %>
 
 *) Sollte dies nicht funktionieren, so kopieren Sie Sich bitte diesen Link und tragen Sie ihn in die Adresszeile Ihres Webbrowsers ein.

data/app/views/alchemy/notifications/member_created.en.text.erb

@@ -8,6 +8,6 @@ The password was randomly created. For security reasons it is not displayed here
 
 Please follow this link (*) to reset your password:
 
-<%= alchemy.new_password_url(email: @user.email) %>
+<%= alchemy.admin_new_password_url(email: @user.email) %>
 
 *) If this does not work, please copy the url and paste it into the address bar of your web browser.

data/app/views/alchemy/notifications/member_created.es.text.erb

@@ -8,6 +8,6 @@ La contraseña se ha generado aleatoriamente. Por razones de seguridad no se mos
 
 Por favor, accede este enlace (*) para reiniciar tu contraseña:
 
-<%= alchemy.new_password_url(email: @user.email) %>
+<%= alchemy.admin_new_password_url(email: @user.email) %>
 
 *) Si esto no funciona, por favor, copia el enlace y pegalo en el campo de direcciones de tu navegador web.

data/app/views/alchemy/notifications/member_created.ru.text.erb

@@ -8,6 +8,6 @@
 
 Пожалуйста, пройдите по ссылке (*), чтобы назначить собственный пароль:
 
-<%= alchemy.new_password_url(email: @user.email) %>
+<%= alchemy.admin_new_password_url(email: @user.email) %>
 
 *) Если ссылка не работает, пожалуйста, скопируйте ее в адресную строку вашего браузера.

data/app/views/alchemy/notifications/reset_password_instructions.de.text.erb

@@ -2,7 +2,7 @@ Hallo <%= @user.fullname %>.
 
 Sie haben angefordert Ihr Passwort zurückzusetzen. Dies kann durch anklicken des nachfolgenden Links bestätigt werden.
 
-<%= alchemy.edit_password_url(@user, reset_password_token: @token) %>
+<%= alchemy.admin_edit_password_url(@user, reset_password_token: @token) %>
 
 Wenn Sie diese Zurücksetzung nicht angefragt haben, dann können Sie diese E-Mail einfach ignorieren.
 Ihr Passwort wird erst dann zurückgesetzt, wenn Sie den Link anklicken.

data/app/views/alchemy/notifications/reset_password_instructions.en.text.erb

@@ -2,7 +2,7 @@ Hello <%= @user.name %>.
 
 You have requested to change your password. Please confirm this by clicking the link below.
 
-<%= alchemy.edit_password_url(@user, reset_password_token: @token) %>
+<%= alchemy.admin_edit_password_url(@user, reset_password_token: @token) %>
 
 If you didn't request this, please ignore this email.
 Your password won't change until you access the link above and create a new one.

data/app/views/alchemy/notifications/reset_password_instructions.es.text.erb

@@ -2,7 +2,7 @@ Hola <%= @user.name %>.
 
 Has solicitado modificar tu contraseña. Por favor, confírmalo pulsando en el siguiente enlace.
 
-<%= alchemy.edit_password_url(@user, reset_password_token: @token) %>
+<%= alchemy.admin_edit_password_url(@user, reset_password_token: @token) %>
 
 Si no has sido tu el que ha hecho la solicitud, ignora este correo.
 Tu contraseña no cambiará hasta que no accedas al enlace de arriba y generes una nueva.

data/app/views/alchemy/notifications/reset_password_instructions.ru.text.erb

@@ -2,7 +2,7 @@
 
 Вы сделали запрос на смену пароля. Пожалуйста подтвердите это, нажав на ссылку ниже.
 
-<%= alchemy.edit_password_url(@user, reset_password_token: @token) %>
+<%= alchemy.admin_edit_password_url(@user, reset_password_token: @token) %>
 
 Если вы не делали запрос, просто проигнорируйте это письмо.
 Ваш пароль не изменится до тех пор, пока вы не перейдете по ссылке и сами не измените его.

data/config/initializers/alchemy.rb

@@ -18,3 +18,9 @@ Alchemy.user_class_name = 'Alchemy::User'
 Alchemy.signup_path     = '/admin/signup'
 Alchemy.login_path      = '/admin/login'
 Alchemy.logout_path     = '/admin/logout'
+
+if Alchemy.respond_to?(:logout_method)
+  Rails.application.config.after_initialize do
+    Alchemy.logout_method = Devise.sign_out_via
+  end
+end

data/config/routes.rb

@@ -1,22 +1,29 @@
 Alchemy::Engine.routes.draw do
-  devise_for :user,
-    class_name: 'Alchemy::User',
-    controllers: {
-      sessions: 'alchemy/user_sessions'
-    },
-    skip: [:sessions, :passwords]
+  namespace :admin, {
+    path: Alchemy.admin_path,
+    constraints: Alchemy.admin_constraints
+  } do
+
+    devise_for :user,
+      class_name: 'Alchemy::User',
+      singular: :user,
+      skip: :all,
+      controllers: {
+        sessions: 'alchemy/admin/user_sessions',
+        passwords: 'alchemy/admin/passwords'
+      },
+      router_name: :alchemy
 
-  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
     devise_scope :user do
-      get '/dashboard' => 'admin/dashboard#index',
+      get '/dashboard' => 'dashboard#index',
         :as => :user_root
-      get '/signup' => 'admin/users#signup',
-        :as => :admin_signup
+      get '/signup' => 'users#signup',
+        :as => :signup
       get '/login' => 'user_sessions#new',
         :as => :login
       post '/login' => 'user_sessions#create'
-      delete '/logout' => 'user_sessions#destroy',
-        :as => :logout
+      match '/logout' => 'user_sessions#destroy',
+        :as => :logout, via: Devise.sign_out_via
 
       get '/passwords' => 'passwords#new',
         :as => :new_password
@@ -27,9 +34,7 @@ Alchemy::Engine.routes.draw do
       patch '/passwords' => 'passwords#update',
         :as => :update_password
     end
-  end
 
-  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :users
   end
 end

data/db/migrate/20131015124700_create_alchemy_users.rb

@@ -6,7 +6,6 @@ class CreateAlchemyUsers < ActiveRecord::Migration[4.2]
       t.string   "lastname"
       t.string   "login"
       t.string   "email"
-      t.string   "gender"
       t.string   "language"
       t.string   "encrypted_password",     limit: 128, default: "",       null: false
       t.string   "password_salt",          limit: 128, default: "",       null: false

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "4.3.1"
+    VERSION = "5.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta
+        version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 4.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 4.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -148,12 +148,15 @@ files:
 - 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
 - app/controllers/alchemy/base_controller_extension.rb
-- app/controllers/alchemy/passwords_controller.rb
-- app/controllers/alchemy/user_sessions_controller.rb
 - app/mailers/alchemy/notifications.rb
 - app/models/alchemy/user.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
 - app/views/alchemy/admin/users/_fields.html.erb
 - app/views/alchemy/admin/users/_user.html.erb
 - app/views/alchemy/admin/users/edit.html.erb
@@ -172,9 +175,6 @@ files:
 - app/views/alchemy/notifications/reset_password_instructions.en.text.erb
 - app/views/alchemy/notifications/reset_password_instructions.es.text.erb
 - app/views/alchemy/notifications/reset_password_instructions.ru.text.erb
-- app/views/alchemy/passwords/edit.html.erb
-- app/views/alchemy/passwords/new.html.erb
-- app/views/alchemy/user_sessions/new.html.erb
 - config/initializers/alchemy.rb
 - config/routes.rb
 - config/spring.rb
@@ -210,8 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.
 test_files: []
+...

data/app/controllers/alchemy/passwords_controller.rb

@@ -1,31 +0,0 @@
-module Alchemy
-  class PasswordsController < ::Devise::PasswordsController
-    include Alchemy::Admin::Locale
-
-    before_action { enforce_ssl if ssl_required? && !request.ssl? }
-
-    helper 'Alchemy::Admin::Base'
-
-    layout 'alchemy/admin'
-
-    private
-
-    # Override for Devise method
-    def new_session_path(resource_name)
-      alchemy.login_path
-    end
-
-    def edit_password_url(resource, options={})
-      alchemy.edit_password_url(options)
-    end
-
-    def after_resetting_password_path_for(resource)
-      if can? :index, :alchemy_admin_dashboard
-        alchemy.admin_dashboard_path
-      else
-        alchemy.root_path
-      end
-    end
-
-  end
-end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -1,62 +0,0 @@
-module Alchemy
-  class UserSessionsController < ::Devise::SessionsController
-    include Alchemy::Admin::Locale
-
-    protect_from_forgery prepend: true
-
-    before_action except: 'destroy' do
-      enforce_ssl if ssl_required? && !request.ssl?
-    end
-
-    before_action :check_user_count, :only => :new
-
-    helper 'Alchemy::Admin::Base'
-
-    layout 'alchemy/admin'
-
-    def new
-      super
-    end
-
-    def create
-      authenticate_user!
-
-      if user_signed_in?
-        if session[:redirect_path].blank?
-          redirect_path = admin_dashboard_path
-        else
-          # We have to strip double slashes from beginning of path, because of strange rails/rack bug.
-          redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, '/')
-        end
-        redirect_to redirect_path,
-          notice: t(:signed_in, scope: 'devise.sessions')
-      else
-        super
-      end
-    end
-
-    def destroy
-      current_alchemy_user.try(:unlock_pages!)
-      cookies.clear
-      session.clear
-      super
-    end
-
-    private
-
-    def check_user_count
-      if User.count == 0
-        redirect_to admin_signup_path
-      end
-    end
-
-    # Overwriting the default of Devise
-    def after_sign_out_path_for(resource_or_scope)
-      if request.referer.blank? || request.referer.to_s =~ /admin/
-        root_path
-      else
-        request.referer
-      end
-    end
-  end
-end