Skip to content

Remove Session config from Activate Admin #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
francesmcmullin wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Remove Session config from Activate Admin #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1116a6
Avoid secondary activate admin session cookie
francesmcmullin Apr 23, 2021
2173687
Remove session set to avoid clobbering redis sessions
francesmcmullin Apr 24, 2021
ef2cf36
Provide login redirect in prod as well as dev
francesmcmullin Apr 23, 2021
c742270
Remove dependency on active-admin-any_of
francesmcmullin Apr 20, 2022
2bd413a
Merge branch '38degrees:main' into uplift-redis-session
francesmcmullin Feb 13, 2024
cacc076
Update for AR 7.2.3 - connection pools hurray
francesmcmullin Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions app/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,12 @@
helpers Activate::ParamHelpers
helpers Activate::NavigationHelpers

enable :sessions

if ENV['SSL']
use Rack::SslEnforcer
use Rack::Session::Cookie, :key => '_rack_session', :path => '/', :expire_after => 30*24*60*60, :secret => ENV['SESSION_SECRET']
else
set :sessions, :expire_after => 1.year
end

def initialize
unless ActiveRecord::Base.connection.active?
unless ActiveRecord::Base.connection.active? || ActiveRecord::Base.connection_pool.active_connection?

Check warning

Code scanning / Rubocop (reported by Codacy)

Limit lines to 80 characters. Warning

Line is too long. [107/80]
if ENV['DATABASE_URL'] and ENV['DATABASE_SCHEMA']
ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
ActiveRecord::Base.connection.schema_search_path = ENV['DATABASE_SCHEMA']
Expand Down Expand Up @@ -410,7 +405,7 @@
if account = Account.authenticate(params[:email], params[:password])
session[:account_id] = account.id
flash[:notice] = "Logged in successfully."
redirect url(:home)
redirect params[:redir] or url(:home)

Check warning

Code scanning / Rubocop (reported by Codacy)

Use &&/|| instead of and/or. Warning

Use || instead of or.
elsif Padrino.env == :development && params[:bypass]
account = Account.first
session[:account_id] = account.id
Expand Down
4 changes: 4 additions & 0 deletions app/views/login.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

<% form_tag url(:login), :class => 'form-horizontal' do %>

<% if params[:redir] %>
<%= hidden_field_tag :redir, :value => params[:redir] %>
<% end %>

<div class="form-group">
<label class="control-label col-sm-3">Email</label>
<div class="col-sm-3">
Expand Down
Loading