mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-03 20:31:35 +00:00
gcpdetails/scopes cleanup #1891
This commit is contained in:
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
Added new client access scopes used by `gam print tokens`.
|
Added new client access scopes used by `gam print tokens`.
|
||||||
```
|
```
|
||||||
[*] 52) Resource Manager - Organizations readonly
|
[*] 52) Resource Manager API - Organizations readonly
|
||||||
[*] 53) Resource Manager - Projects readonly
|
[*] 53) Resource Manager API - Projects readonly
|
||||||
```
|
```
|
||||||
|
|
||||||
Added option `gcpdetails` to `gam print tokens` that uses these scopes to get additional project information.
|
Added option `gcpdetails` to `gam print tokens` that uses these scopes to get additional project information.
|
||||||
|
|||||||
@@ -72453,7 +72453,6 @@ def _printShowTokens(entityType, users):
|
|||||||
if result['project'] in internal_projects:
|
if result['project'] in internal_projects:
|
||||||
result['internal'] = True
|
result['internal'] = True
|
||||||
continue
|
continue
|
||||||
result['internal'] = False
|
|
||||||
try:
|
try:
|
||||||
results = callGAPI(crm1.projects(), 'getAncestry',
|
results = callGAPI(crm1.projects(), 'getAncestry',
|
||||||
throwReasons=[GAPI.PERMISSION_DENIED],
|
throwReasons=[GAPI.PERMISSION_DENIED],
|
||||||
|
|||||||
@@ -264,8 +264,8 @@ _INFO = {
|
|||||||
CLOUDIDENTITY_POLICY: {'name': 'Cloud Identity API - Policy', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
CLOUDIDENTITY_POLICY: {'name': 'Cloud Identity API - Policy', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
||||||
CLOUDIDENTITY_POLICY_BETA: {'name': 'Cloud Identity API - Policy Beta', 'version': 'v1beta1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
CLOUDIDENTITY_POLICY_BETA: {'name': 'Cloud Identity API - Policy Beta', 'version': 'v1beta1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
||||||
CLOUDIDENTITY_USERINVITATIONS: {'name': 'Cloud Identity API - User Invitations', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
CLOUDIDENTITY_USERINVITATIONS: {'name': 'Cloud Identity API - User Invitations', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudidentity'},
|
||||||
CLOUDRESOURCEMANAGER: {'name': 'Cloud Resource Manager API v3', 'version': 'v3', 'v2discovery': True},
|
CLOUDRESOURCEMANAGER: {'name': 'Resource Manager API v3', 'version': 'v3', 'v2discovery': True},
|
||||||
CLOUDRESOURCEMANAGERV1: {'name': 'Cloud Resource Manager API v1', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudresourcemanager'},
|
CLOUDRESOURCEMANAGERV1: {'name': 'Resource Manager API v1', 'version': 'v1', 'v2discovery': True, 'mappedAPI': 'cloudresourcemanager'},
|
||||||
CONTACTS: {'name': 'Contacts API', 'version': 'v3', 'v2discovery': False},
|
CONTACTS: {'name': 'Contacts API', 'version': 'v3', 'v2discovery': False},
|
||||||
CONTACTDELEGATION: {'name': 'Contact Delegation API', 'version': 'v1', 'v2discovery': True, 'localjson': True},
|
CONTACTDELEGATION: {'name': 'Contact Delegation API', 'version': 'v1', 'v2discovery': True, 'localjson': True},
|
||||||
DATATRANSFER: {'name': 'Data Transfer API', 'version': 'datatransfer_v1', 'v2discovery': True, 'mappedAPI': 'admin'},
|
DATATRANSFER: {'name': 'Data Transfer API', 'version': 'datatransfer_v1', 'v2discovery': True, 'mappedAPI': 'admin'},
|
||||||
@@ -514,11 +514,11 @@ _CLIENT_SCOPES = [
|
|||||||
'api': RESELLER,
|
'api': RESELLER,
|
||||||
'offByDefault': True,
|
'offByDefault': True,
|
||||||
'scope': 'https://www.googleapis.com/auth/apps.order'},
|
'scope': 'https://www.googleapis.com/auth/apps.order'},
|
||||||
{'name': 'Resource Manager - Organizations readonly',
|
{'name': 'Resource Manager API - Organizations readonly',
|
||||||
'api': CLOUDRESOURCEMANAGER,
|
'api': CLOUDRESOURCEMANAGER,
|
||||||
'offByDefault': True,
|
'offByDefault': True,
|
||||||
'scope': 'https://www.googleapis.com/auth/cloudplatformorganizations.readonly'},
|
'scope': 'https://www.googleapis.com/auth/cloudplatformorganizations.readonly'},
|
||||||
{'name': 'Resource Manager - Projects readonly',
|
{'name': 'Resource Manager API - Projects readonly',
|
||||||
'api': CLOUDRESOURCEMANAGER,
|
'api': CLOUDRESOURCEMANAGER,
|
||||||
'offByDefault': True,
|
'offByDefault': True,
|
||||||
'scope': 'https://www.googleapis.com/auth/cloudplatformprojects.readonly'},
|
'scope': 'https://www.googleapis.com/auth/cloudplatformprojects.readonly'},
|
||||||
|
|||||||
Reference in New Issue
Block a user