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

Make remembe_me_token_key customizable #751

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make remembe_me_token_key customizable #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions lib/generators/sorcery/templates/initializer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@
# config.salesforce.scope = "full"
# config.salesforce.user_info_mapping = {:email => "email"}

# Set remember_me_token cookie key.
# Useful for remember_me in submodules.
# Default: `:remember_me_token`
#
# config.remember_me_token_key =

# --- user config ---
config.user_config do |user|
# -- core --
Expand Down
2 changes: 1 addition & 1 deletion lib/sorcery/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def auto_login(user, should_remember = false)

# Overwrite Rails' handle unverified request
def handle_unverified_request
cookies[:remember_me_token] = nil
cookies[Config.remember_me_token_key] = nil
@current_user = nil
super # call the default behaviour which resets the session
end
Expand Down
6 changes: 4 additions & 2 deletions lib/sorcery/controller/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class << self
:after_login,
:after_failed_login,
:before_logout,
:after_logout
:after_logout,
:remember_me_token_key

def init!
@defaults = {
Expand All @@ -29,7 +30,8 @@ def init!
:@before_logout => [],
:@after_logout => [],
:@save_return_to_url => true,
:@cookie_domain => nil
:@cookie_domain => nil,
:@remember_me_token_key => :remember_me_token
}
end

Expand Down
13 changes: 8 additions & 5 deletions lib/sorcery/controller/submodules/remember_me.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ def remember_me!
# Clears the cookie, and depending on the value of remember_me_token_persist_globally, may clear the token value.
def forget_me!
current_user.forget_me!
cookies.delete(:remember_me_token, :domain => Config.cookie_domain)
cookies.delete(remember_me_token_key, :domain => Config.cookie_domain)
end

# Clears the cookie, and clears the token value.
def force_forget_me!
current_user.force_forget_me!
cookies.delete(:remember_me_token, :domain => Config.cookie_domain)
cookies.delete(remember_me_token_key, :domain => Config.cookie_domain)
end

# Override.
Expand All @@ -61,7 +61,7 @@ def remember_me_if_asked_to(user, credentials)
# and logs the user in if found.
# Runs as a login source. See 'current_user' method for how it is used.
def login_from_cookie
user = cookies.signed[:remember_me_token] && user_class.sorcery_adapter.find_by_remember_me_token(cookies.signed[:remember_me_token])
user = cookies.signed[remember_me_token_key] && user_class.sorcery_adapter.find_by_remember_me_token(cookies.signed[remember_me_token_key])
if user && user.has_remember_me_token?
set_remember_me_cookie!(user)
session[:user_id] = user.id.to_s
Expand All @@ -72,15 +72,18 @@ def login_from_cookie
end

def set_remember_me_cookie!(user)
cookies.signed[:remember_me_token] = {
cookies.signed[remember_me_token_key] = {
:value => user.send(user.sorcery_config.remember_me_token_attribute_name),
:expires => user.send(user.sorcery_config.remember_me_token_expires_at_attribute_name),
:httponly => Config.remember_me_httponly,
:domain => Config.cookie_domain
}
end
end

def remember_me_token_key
Config.remember_me_token_key
end
end
end
end
end
Expand Down