-
Notifications
You must be signed in to change notification settings - Fork 3.5k
fix: added 'enable_granular_consent' parameter #2582
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.
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
alebedev80
wants to merge
4
commits into
googleapis:main
Choose a base branch
from
alebedev80:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
45b8601
Added 'enable_granular_consent' parameter
alebedev80 c388167
fix: added 'enable_granular_consent' parameter
alebedev80 9df4a6b
fix: added 'enable_granular_consent' parameter
alebedev80 7495be8
Merge remote-tracking branch 'origin/main'
alebedev80 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -142,6 +142,7 @@ class Client | |||
* @type string $prompt | ||||
* @type string $openid | ||||
* @type bool $include_granted_scopes | ||||
* @type bool $enable_granular_consent | ||||
* @type string $login_hint | ||||
* @type string $request_visible_actions | ||||
* @type string $access_type | ||||
|
@@ -187,6 +188,7 @@ public function __construct(array $config = []) | |||
'prompt' => '', | ||||
'openid.realm' => '', | ||||
'include_granted_scopes' => null, | ||||
'enable_granular_consent' => null, | ||||
'login_hint' => '', | ||||
'request_visible_actions' => '', | ||||
'access_type' => 'online', | ||||
|
@@ -404,11 +406,17 @@ public function createAuthUrl($scope = null, array $queryParams = []) | |||
? null | ||||
: var_export($this->config['include_granted_scopes'], true); | ||||
|
||||
|
||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
$enableGranularConsent = $this->config['enable_granular_consent'] === null | ||||
? null | ||||
: var_export($this->config['enable_granular_consent'], true); | ||||
|
||||
$params = array_filter([ | ||||
'access_type' => $this->config['access_type'], | ||||
'approval_prompt' => $approvalPrompt, | ||||
'hd' => $this->config['hd'], | ||||
'include_granted_scopes' => $includeGrantedScopes, | ||||
'enable_granular_consent' => $enableGranularConsent, | ||||
'login_hint' => $this->config['login_hint'], | ||||
'openid.realm' => $this->config['openid.realm'], | ||||
'prompt' => $this->config['prompt'], | ||||
|
@@ -785,6 +793,18 @@ public function setIncludeGrantedScopes($include) | |||
$this->config['include_granted_scopes'] = $include; | ||||
} | ||||
|
||||
/** | ||||
* If set to false, more granular Google Account permissions | ||||
* will be disabled for OAuth client IDs created before 2019. | ||||
* No effect for newer OAuth client IDs, since more granular | ||||
* permissions is always enabled for them | ||||
* @param bool $consent | ||||
*/ | ||||
public function setEnableGranularConsent($consent) | ||||
{ | ||||
$this->config['enable_granular_consent'] = $consent; | ||||
} | ||||
|
||||
/** | ||||
* sets function to be called when an access token is fetched | ||||
* @param callable $tokenCallback - function ($cacheKey, $accessToken) | ||||
|
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changelog gets updated automatically through our release-please bot. We can revert this change.