Skip to content
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

Use cookies only when available #684

Merged
merged 4 commits into from
May 26, 2020
Merged

Use cookies only when available #684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d160500
use cookies only it available
epaew Sep 12, 2019
fc574db
Add simple Authlogic::TestCase::MockApiController
epaew Sep 24, 2019
2f0c9e2
Update adapter_test
epaew Sep 24, 2019
7345d23
Update session/persistence test
epaew Sep 28, 2019
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
Next Next commit
use cookies only it available
  • Loading branch information
@epaew
epaew committed Sep 15, 2019
commit d1605007a271498b97126b9fa68d3b97fb04d68a
2 changes: 1 addition & 1 deletion lib/authlogic/controller_adapters/rails_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def authenticate_with_http_basic(&block)
# Returns a `ActionDispatch::Cookies::CookieJar`. See the AC guide
# http://guides.rubyonrails.org/action_controller_overview.html#cookies
def cookies
controller.send(:cookies)
controller.respond_to?(:cookies, true) ? controller.send(:cookies) : nil
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. I spent some time playing around with ActionController::API and I was able to reproduce the need for this.

end

def cookie_domain
Expand Down
10 changes: 8 additions & 2 deletions lib/authlogic/session/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@ def self.#{method}(*filter_list, &block)
before_save :set_last_request_at

after_save :reset_perishable_token!
after_save :save_cookie
after_save :save_cookie, if: :cookie_enabled?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a reasonable change, but without it the tests still pass, so is it really necessary?

after_save :update_session

after_destroy :destroy_cookie
after_destroy :destroy_cookie, if: :cookie_enabled?
after_destroy :update_session

# `validate` callbacks, in deliberate order. For example,
Expand Down Expand Up @@ -1611,12 +1611,18 @@ def cookie_key
# @api private
# @return ::Authlogic::CookieCredentials or if no cookie is found, nil
def cookie_credentials
return unless cookie_enabled?

cookie_value = cookie_jar[cookie_key]
unless cookie_value.nil?
::Authlogic::CookieCredentials.parse(cookie_value)
end
end

def cookie_enabled?
!controller.cookies.nil?
end

def cookie_jar
if self.class.sign_cookie
controller.cookies.signed
Expand Down