alchemy-devise 4.2.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9642523c1d389acc5e361381437388e09b73bd30a4fee63c13027939620b605d
-  data.tar.gz: e4d5b935a539b55843ed7b17f8e52d98df781d1e710e3e9c3940c8e7e496a51d
+  metadata.gz: 6217ebc5ce12c866ae9b27e1d80a181c302e96f0accced11e0ef9a3df2fdc4be
+  data.tar.gz: c05e0c5d4a260926f293073c00d440b9968dba46a10ea0326f4068ee19065bff
 SHA512:
-  metadata.gz: a6c4b5518d3f65a78392d95d31f315e2b9812206b1ebc307d0c66ee9ace546b18d66d2a1b41c0ade739d326edcece529d380467d273b6b8af2e425b49d9c638e
-  data.tar.gz: e7b44ccaf4bfdd3998fb8f4c6f1b272c1fcea36fbb725b736af5e14ffc92b5d3ad4d3a39d53c510160dc733f86c0b0cfe3a56b5823de8c2e6a23b0dbdbccf625
+  metadata.gz: 0dc57c2c68c836f3ce8f7f1e8c029dc8a8e6ff5ade4a052e1d0b99dcd1cd901d08215b22d046da3d089a950a8b18c5b0d69a95d665ae70803d559bb3040ccdcd
+  data.tar.gz: 033e220a727c0727975b90df7c589b2ecb4a9aefd8bc90e37046ce63be666cebf47a5583780fad2afab4ceffb12aa953aae4c134a4d6aee05a92fa955abbc6d5

data/README.md

@@ -1,10 +1,10 @@
-## 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)
 
 [![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) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master)
 
-AlchemyCMS has no authentication in its core. So it is possibly 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.
+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.
 
 ## Install
 
@@ -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
 bin/rails g alchemy:devise:install --force
 cd -
 BASH

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

@@ -0,0 +1,34 @@
+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_dependency "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/controllers/alchemy/base_controller_extension.rb

@@ -1,12 +1,18 @@
-Alchemy::BaseController.class_eval do
-  before_action :store_user_request_time
+module Alchemy
+  module BaseControllerExtension
+    def self.prepended(base)
+      base.before_action(:store_user_request_time)
+    end
 
-  private
+    private
 
-  # Stores the users request time.
-  def store_user_request_time
-    if alchemy_user_signed_in?
-      current_alchemy_user.store_request_time!
+    # 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

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.2.1"
+    VERSION = "4.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Thomas von Deyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,40 +16,40 @@ 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
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.99'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +112,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0.beta2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Devise based user authentication for AlchemyCMS.
 email:
 - thomas@vondeyen.com
@@ -120,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
@@ -144,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
@@ -183,7 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+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