From 4b911fea03a204a1a1cc0e5f63ede1679e0494c3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 20 Jul 2017 23:07:13 +0200 Subject: Add button to re-subscribe to all accounts from a domain (#4285) --- config/routes.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 2aa89f16d..072ef7984 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,7 +88,12 @@ Rails.application.routes.draw do resources :subscriptions, only: [:index] resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] resource :settings, only: [:edit, :update] - resources :instances, only: [:index] + + resources :instances, only: [:index] do + collection do + post :resubscribe + end + end resources :reports, only: [:index, :show, :update] do resources :reported_statuses, only: [:create, :update, :destroy] -- cgit From 8d6c3cd48ae4f96752ff6b698bc7244d97aa9a27 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 22 Jul 2017 01:09:10 +0200 Subject: Fix sessions being replaced needlessly (#4292) --- config/initializers/devise.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index bf61ea0ea..e6b0e90cb 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,8 +1,12 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| - SessionActivation.deactivate warden.cookies.signed['_session_id'] + if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']) + session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'] + else + session_id = user.activate_session(warden.request) + end warden.cookies.signed['_session_id'] = { - value: user.activate_session(warden.request), + value: session_id, expires: 1.year.from_now, httponly: true, } -- cgit