Skip to content

Make it possible to use sub-strategies to get offline unexpired access tokens #185

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make it possible to use sub-strategies to get offline unexpired access tokens #185

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21f0dc0
Add refresh_access_token & set_access_token_from_hash methods.
mrj Aug 9, 2025
2336a45
stringify keys of refresh params to match the added id & secret
mrj Aug 18, 2025
fd8b689
Factor out symbolized_auth_token_params, and add to set_access_token_…
mrj Sep 8, 2025
77bd3f4
Fix syntax error
mrj Sep 9, 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
16 changes: 14 additions & 2 deletions lib/omniauth/strategies/oauth2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def callback_phase # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexi
fail!(error, CallbackError.new(request.params["error"], request.params["error_description"] || request.params["error_reason"], request.params["error_uri"]))
else
self.access_token = build_access_token
self.access_token = access_token.refresh! if access_token.expired?
refresh_access_token if access_token.expired?
super
end
rescue ::OAuth2::Error, CallbackError => e
Expand All @@ -100,6 +100,18 @@ def callback_phase # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexi
fail!(:failed_to_connect, e)
end

def symbolized_auth_token_params
deep_symbolize(options.auth_token_params)
end

def set_access_token_from_hash(hash)
self.access_token = ::OAuth2::AccessToken.from_hash(client, hash.update(symbolized_auth_token_params))
end

def refresh_access_token
self.access_token = access_token&.refresh(token_params.to_hash(stringify_keys: true), symbolized_auth_token_params)
end

protected

def pkce_authorize_params
Expand All @@ -123,7 +135,7 @@ def pkce_token_params

def build_access_token
verifier = request.params["code"]
client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)), deep_symbolize(options.auth_token_params))
client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)), symbolized_auth_token_params)
end

def deep_symbolize(options)
Expand Down