app/controllers/alchemy/admin/user_sessions_controller.rb in alchemy-devise-4.5.0 vs app/controllers/alchemy/admin/user_sessions_controller.rb in alchemy-devise-4.6.0

- old
+ new

@@ -1,33 +1,38 @@ +# 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 - before_action except: 'destroy' do - enforce_ssl if ssl_required? && !request.ssl? + 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' + helper "Alchemy::Admin::Base" - layout 'alchemy/admin' + 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,}/, '/') + redirect_path = session[:redirect_path].gsub(/\A\/{2,}/, "/") end redirect_to redirect_path, - notice: t(:signed_in, scope: 'devise.sessions') + notice: t(:signed_in, scope: "devise.sessions") else super end end