OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth #58782
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Extract access token validity check to a function
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42156 |
mgyongyosi
changed the title
mgyongyosi
changed the title
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42284 |
mgyongyosi
force-pushed
the
mgyongyosi/oauth-rt-improv
branch
from
3ae1493
to
8a93e18
Compare
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42322 |
mgyongyosi
force-pushed
the
mgyongyosi/oauth-rt-improv
branch
3 times, most recently
from
1bc556f
to
645bc1f
Compare
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42324 |
mgyongyosi
changed the title
mgyongyosi
force-pushed
the
mgyongyosi/oauth-rt-improv
branch
from
645bc1f
to
70b88a7
Compare
mgyongyosi
requested review from
sakjur,
papagian and
ying-jeanne
and removed request for
a team
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42333 |
kalleep
reviewed
Nov 17, 2022
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42364 |
Jguer
reviewed
Nov 17, 2022
| // FIXME: access_type is a Google OAuth2 specific thing, consider refactoring this and moving to google_oauth.go | ||
| opts := []oauth2.AuthCodeOption{oauth2.AccessTypeOffline} | ||
|
|
||
| var opts []oauth2.AuthCodeOption |
There was a problem hiding this comment.
With these last changes, the extra AuthCodeOptions that were added to gitlab,github and azure will be removed regardless of the feature flag.
From our discussion I think that's fine since it's not used by these providers but it's a small increase in risk compared to the previous version that we should be aware of
Jguer
reviewed
Nov 17, 2022
kalleep
reviewed
Nov 17, 2022
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/42400 |
mgyongyosi
force-pushed
the
mgyongyosi/oauth-rt-improv
branch
from
690387f
to
92540f7
Compare
grafanabot
added
enterprise-ok
enterprise-failed
and removed
enterprise-failed
enterprise-ok
labels
grafanabot
pushed a commit
that referenced
this pull request
Nov 18, 2022
…h tokens for Google OAuth (#58782) * Add ApprovalForce to AuthCodeOptions * Extract access token validity check to a function * Refactor * Oauth: set options internally instead of exposing new function * Align tests * Remove unused function Co-authored-by: Karl Persson <kalle.persson@grafana.com> (cherry picked from commit 9c98314)
mgyongyosi
added a commit
that referenced
this pull request
Nov 18, 2022
…ng refresh tokens for Google OAuth (#58940) OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (#58782) * Add ApprovalForce to AuthCodeOptions * Extract access token validity check to a function * Refactor * Oauth: set options internally instead of exposing new function * Align tests * Remove unused function Co-authored-by: Karl Persson <kalle.persson@grafana.com> (cherry picked from commit 9c98314) Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
GuYounes
pushed a commit
to paul-wurth/BIXpert
that referenced
this pull request
Feb 8, 2023
…ng refresh tokens for Google OAuth (grafana#58940) OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (grafana#58782) * Add ApprovalForce to AuthCodeOptions * Extract access token validity check to a function * Refactor * Oauth: set options internally instead of exposing new function * Align tests * Remove unused function Co-authored-by: Karl Persson <kalle.persson@grafana.com> (cherry picked from commit 9c98314) Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
These changes make sure that Grafana does get a refresh token from Google OAuth each time the user logs in to Grafana using Google as an OAuth IdP. To make this happen the responsibility to specify custom query string parameters (that are sent to the authorize endpoint) have moved to the separate OAuth connectors.
This functionality is only available when the
accessTokenExpirationCheckfeature toggle is enabled.Why do we need this feature?
We discovered that without the
prompt=consentparameter the refresh token is only returned when the user first logs into Grafana through Google OAuth.Who is this feature for?
Special notes for your reviewer: