mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-04 12:51:36 +00:00
Updated gam create datatransfer to handle the following error:
ERROR: 401: Active session is invalid. Error code: 4 - authError
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -10,9 +10,21 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
|
|||||||
|
|
||||||
See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation
|
See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation
|
||||||
|
|
||||||
|
### 6.66.10
|
||||||
|
|
||||||
|
Updated `gam create datatransfer` to handle the following error:
|
||||||
|
```
|
||||||
|
ERROR: 401: Active session is invalid. Error code: 4 - authError
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6.66.09
|
||||||
|
|
||||||
|
Fixed bug in `gam <UserTypeEntity> print filelist ... allfields` that caused a trap
|
||||||
|
when `gam.cfg` contained `drive_v3_native_names = False`.
|
||||||
|
|
||||||
### 6.66.08
|
### 6.66.08
|
||||||
|
|
||||||
Added additional columns `isBase` and `baseId' to `gam <UserTypeEntity> print fileparenttree`
|
Added additional columns `isBase` and `baseId` to `gam <UserTypeEntity> print fileparenttree`
|
||||||
to simplify processing the output in a script.
|
to simplify processing the output in a script.
|
||||||
|
|
||||||
### 6.66.07
|
### 6.66.07
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt.
|
|||||||
admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt
|
admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt
|
||||||
admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version
|
admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version
|
||||||
WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
|
WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
|
||||||
GAMADV-XTD3 6.66.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
GAMADV-XTD3 6.66.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.10.8 64-bit final
|
Python 3.10.8 64-bit final
|
||||||
MacOS High Sierra 10.13.6 x86_64
|
MacOS High Sierra 10.13.6 x86_64
|
||||||
@@ -1002,7 +1002,7 @@ writes the credentials into the file oauth2.txt.
|
|||||||
C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt
|
C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt
|
||||||
C:\GAMADV-XTD3>gam version
|
C:\GAMADV-XTD3>gam version
|
||||||
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
|
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
|
||||||
GAMADV-XTD3 6.66.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
GAMADV-XTD3 6.66.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.12.0 64-bit final
|
Python 3.12.0 64-bit final
|
||||||
Windows-10-10.0.17134 AMD64
|
Windows-10-10.0.17134 AMD64
|
||||||
|
|||||||
@@ -80,6 +80,7 @@
|
|||||||
canaddfolderfromanotherdrive|
|
canaddfolderfromanotherdrive|
|
||||||
canaddmydriveparent|
|
canaddmydriveparent|
|
||||||
canchangecopyrequireswriterpermission|
|
canchangecopyrequireswriterpermission|
|
||||||
|
canchangecopyrequireswriterpermissionrestriction|
|
||||||
canchangedomainusersonlyrestriction|
|
canchangedomainusersonlyrestriction|
|
||||||
canchangedrivebackground|
|
canchangedrivebackground|
|
||||||
canchangedrivemembersonlyrestriction|
|
canchangedrivemembersonlyrestriction|
|
||||||
@@ -97,11 +98,14 @@
|
|||||||
canmanagemembers|
|
canmanagemembers|
|
||||||
canmodifycontent|
|
canmodifycontent|
|
||||||
canmodifycontentrestriction|
|
canmodifycontentrestriction|
|
||||||
|
canmodifyeditorcontentrestriction|
|
||||||
canmodifylabels|
|
canmodifylabels|
|
||||||
|
canmodifyownercontentrestriction|
|
||||||
canmovechildrenoutofdrive|
|
canmovechildrenoutofdrive|
|
||||||
canmovechildrenoutofteamdrive|
|
canmovechildrenoutofteamdrive|
|
||||||
canmovechildrenwithindrive|
|
canmovechildrenwithindrive|
|
||||||
canmovechildrenwithinteamdrive|
|
canmovechildrenwithinteamdrive|
|
||||||
|
canmoveitemintodrive|
|
||||||
canmoveitemintoteamdrive|
|
canmoveitemintoteamdrive|
|
||||||
canmoveitemoutofdrive|
|
canmoveitemoutofdrive|
|
||||||
canmoveitemoutofteamdrive|
|
canmoveitemoutofteamdrive|
|
||||||
@@ -113,6 +117,7 @@
|
|||||||
canreadrevisions|
|
canreadrevisions|
|
||||||
canreadteamdrive|
|
canreadteamdrive|
|
||||||
canremovechildren|
|
canremovechildren|
|
||||||
|
canremovecontentrestriction|
|
||||||
canremovemydriveparent|
|
canremovemydriveparent|
|
||||||
canrename|
|
canrename|
|
||||||
canrenamedrive|
|
canrenamedrive|
|
||||||
@@ -1076,6 +1081,12 @@ Use the following option to select a subset of files based on their permissions.
|
|||||||
* `<PermissionMatch>* [<PermissionMatchAction>]` - Use permission matching to select files
|
* `<PermissionMatch>* [<PermissionMatchAction>]` - Use permission matching to select files
|
||||||
|
|
||||||
## File selection starting point for Display file list
|
## File selection starting point for Display file list
|
||||||
|
You can limit the selection for files on a specific Shared drive.
|
||||||
|
Any query will be applied to the Shared drive.
|
||||||
|
```
|
||||||
|
select <SharedDriveEntity>
|
||||||
|
```
|
||||||
|
|
||||||
You can specify a specific folder from which to select files.
|
You can specify a specific folder from which to select files.
|
||||||
```
|
```
|
||||||
select <DriveFileEntity> [selectsubquery <QueryDriveFile>]
|
select <DriveFileEntity> [selectsubquery <QueryDriveFile>]
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
Print the current version of Gam with details
|
Print the current version of Gam with details
|
||||||
```
|
```
|
||||||
gam version
|
gam version
|
||||||
GAMADV-XTD3 6.66.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
GAMADV-XTD3 6.66.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.12.0 64-bit final
|
Python 3.12.0 64-bit final
|
||||||
MacOS Monterey 12.7 x86_64
|
MacOS Monterey 12.7 x86_64
|
||||||
@@ -16,7 +16,7 @@ Time: 2023-06-02T21:10:00-07:00
|
|||||||
Print the current version of Gam with details and time offset information
|
Print the current version of Gam with details and time offset information
|
||||||
```
|
```
|
||||||
gam version timeoffset
|
gam version timeoffset
|
||||||
GAMADV-XTD3 6.66.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
GAMADV-XTD3 6.66.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.12.0 64-bit final
|
Python 3.12.0 64-bit final
|
||||||
MacOS Monterey 12.7 x86_64
|
MacOS Monterey 12.7 x86_64
|
||||||
@@ -28,7 +28,7 @@ Your system time differs from www.googleapis.com by less than 1 second
|
|||||||
Print the current version of Gam with extended details and SSL information
|
Print the current version of Gam with extended details and SSL information
|
||||||
```
|
```
|
||||||
gam version extended
|
gam version extended
|
||||||
GAMADV-XTD3 6.66.08 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
GAMADV-XTD3 6.66.10 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.12.0 64-bit final
|
Python 3.12.0 64-bit final
|
||||||
MacOS Monterey 12.7 x86_64
|
MacOS Monterey 12.7 x86_64
|
||||||
@@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64
|
|||||||
Path: /Users/Admin/bin/gamadv-xtd3
|
Path: /Users/Admin/bin/gamadv-xtd3
|
||||||
Version Check:
|
Version Check:
|
||||||
Current: 5.35.08
|
Current: 5.35.08
|
||||||
Latest: 6.66.08
|
Latest: 6.66.10
|
||||||
echo $?
|
echo $?
|
||||||
1
|
1
|
||||||
```
|
```
|
||||||
@@ -73,7 +73,7 @@ echo $?
|
|||||||
Print the current version number without details
|
Print the current version number without details
|
||||||
```
|
```
|
||||||
gam version simple
|
gam version simple
|
||||||
6.66.08
|
6.66.10
|
||||||
```
|
```
|
||||||
In Linux/MacOS you can do:
|
In Linux/MacOS you can do:
|
||||||
```
|
```
|
||||||
@@ -83,7 +83,7 @@ echo $VER
|
|||||||
Print the current version of Gam and address of this Wiki
|
Print the current version of Gam and address of this Wiki
|
||||||
```
|
```
|
||||||
gam help
|
gam help
|
||||||
GAM 6.66.08 - https://github.com/taers232c/GAMADV-XTD3
|
GAM 6.66.10 - https://github.com/taers232c/GAMADV-XTD3
|
||||||
Ross Scroggs <ross.scroggs@gmail.com>
|
Ross Scroggs <ross.scroggs@gmail.com>
|
||||||
Python 3.12.0 64-bit final
|
Python 3.12.0 64-bit final
|
||||||
MacOS Monterey 12.7 x86_64
|
MacOS Monterey 12.7 x86_64
|
||||||
|
|||||||
@@ -2,6 +2,13 @@
|
|||||||
|
|
||||||
Merged GAM-Team version
|
Merged GAM-Team version
|
||||||
|
|
||||||
|
6.66.10
|
||||||
|
|
||||||
|
Updated `gam create datatransfer` to handle the following error:
|
||||||
|
```
|
||||||
|
ERROR: 401: Active session is invalid. Error code: 4 - authError
|
||||||
|
```
|
||||||
|
|
||||||
6.66.09
|
6.66.09
|
||||||
|
|
||||||
Fixed bug in `gam <UserTypeEntity> print filelist ... allfields` that caused a trap
|
Fixed bug in `gam <UserTypeEntity> print filelist ... allfields` that caused a trap
|
||||||
|
|||||||
@@ -5084,13 +5084,11 @@ def checkGAPIError(e, softErrors=False, retryOnHttpError=False, mapNotFound=True
|
|||||||
http_status = error['error']['code']
|
http_status = error['error']['code']
|
||||||
if 'errors' in error['error'] and 'message' in error['error']['errors'][0]:
|
if 'errors' in error['error'] and 'message' in error['error']['errors'][0]:
|
||||||
message = error['error']['errors'][0]['message']
|
message = error['error']['errors'][0]['message']
|
||||||
status = ''
|
|
||||||
elif 'errors' in error['error'] and 'Unknown Error' in error['error']['message'] and 'reason' in error['error']['errors'][0]:
|
elif 'errors' in error['error'] and 'Unknown Error' in error['error']['message'] and 'reason' in error['error']['errors'][0]:
|
||||||
message = error['error']['errors'][0]['reason']
|
message = error['error']['errors'][0]['reason']
|
||||||
status = error['error'].get('status', '')
|
|
||||||
else:
|
else:
|
||||||
message = error['error']['message']
|
message = error['error']['message']
|
||||||
status = error['error'].get('status', '')
|
status = error['error'].get('status', '')
|
||||||
lmessage = message.lower() if message is not None else ''
|
lmessage = message.lower() if message is not None else ''
|
||||||
if http_status == 500:
|
if http_status == 500:
|
||||||
if not lmessage or status == 'UNKNOWN':
|
if not lmessage or status == 'UNKNOWN':
|
||||||
@@ -5133,6 +5131,9 @@ def checkGAPIError(e, softErrors=False, retryOnHttpError=False, mapNotFound=True
|
|||||||
error = makeErrorDict(http_status, GAPI.INVALID_ARGUMENT, message)
|
error = makeErrorDict(http_status, GAPI.INVALID_ARGUMENT, message)
|
||||||
elif 'does not match' in lmessage or 'invalid' in lmessage:
|
elif 'does not match' in lmessage or 'invalid' in lmessage:
|
||||||
error = makeErrorDict(http_status, GAPI.INVALID, message)
|
error = makeErrorDict(http_status, GAPI.INVALID, message)
|
||||||
|
elif http_status == 401:
|
||||||
|
if status == 'PERMISSION_DENIED':
|
||||||
|
error = makeErrorDict(http_status, GAPI.PERMISSION_DENIED, message)
|
||||||
elif http_status == 403:
|
elif http_status == 403:
|
||||||
if 'quota exceeded for quota metric' in lmessage:
|
if 'quota exceeded for quota metric' in lmessage:
|
||||||
error = makeErrorDict(http_status, GAPI.QUOTA_EXCEEDED, message)
|
error = makeErrorDict(http_status, GAPI.QUOTA_EXCEEDED, message)
|
||||||
@@ -16342,9 +16343,9 @@ def doCreateDataTransfer():
|
|||||||
_assignAppParameter(Cmd.Previous().upper(), getString(Cmd.OB_PARAMETER_VALUE).upper().split(','), True)
|
_assignAppParameter(Cmd.Previous().upper(), getString(Cmd.OB_PARAMETER_VALUE).upper().split(','), True)
|
||||||
try:
|
try:
|
||||||
result = callGAPI(dt.transfers(), 'insert',
|
result = callGAPI(dt.transfers(), 'insert',
|
||||||
throwReasons=[GAPI.UNKNOWN_ERROR, GAPI.FORBIDDEN],
|
throwReasons=[GAPI.UNKNOWN_ERROR, GAPI.FORBIDDEN, GAPI.PERMISSION_DENIED],
|
||||||
body=body, fields='id')
|
body=body, fields='id')
|
||||||
except (GAPI.unknownError, GAPI.forbidden) as e:
|
except (GAPI.unknownError, GAPI.forbidden, GAPI.permissionDenied) as e:
|
||||||
entityActionFailedExit([Ent.USER, old_owner], str(e))
|
entityActionFailedExit([Ent.USER, old_owner], str(e))
|
||||||
entityActionPerformed([Ent.TRANSFER_REQUEST, None])
|
entityActionPerformed([Ent.TRANSFER_REQUEST, None])
|
||||||
Ind.Increment()
|
Ind.Increment()
|
||||||
|
|||||||
Reference in New Issue
Block a user