Skip to content

Commit

Permalink
Revert "GitHub:9479 ([Google] User information: fixes)"
Browse files Browse the repository at this point in the history
This reverts commit 8d5cc31.
  • Loading branch information
yannicktrinh committed Oct 2, 2024
1 parent 0182783 commit 140b074
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
13 changes: 6 additions & 7 deletions Project/Sources/Classes/GoogleUser.4dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Class extends _GoogleAPI

property _internals : Object:={_defaultPersonFields: "names,emailAddresses,photos"}

Class constructor($inProvider : cs.OAuth2Provider)

Super($inProvider;"https://people.googleapis.com/v1/")

This._internals._defaultPersonFields:="names,emailAddresses,photos"
Super($inProvider)


// ----------------------------------------------------
Expand All @@ -15,7 +14,7 @@ Class constructor($inProvider : cs.OAuth2Provider)
Function _get($inResourceName : Text; $inPersonFields : Variant) : Object

Super._clearErrorStack()

var $URL : Text:=Super._getURL()
var $resourceName : Text:=Length(String($inResourceName))>0 ? String($inResourceName) : "me"
var $personFields : Text
Expand All @@ -33,7 +32,7 @@ Function _get($inResourceName : Text; $inPersonFields : Variant) : Object

var $headers : Object:={}
$headers["Content-Type"]:="application/json"
var $response : Object:=Super._sendRequestAndWaitResponse("GET"; $URL; $headers)
var $response : Object:=Super._sendRequestAndWaitResponse("GET"; $inURL; $headers)

return $response

Expand Down Expand Up @@ -62,7 +61,7 @@ Function get($inResourceName : Text; $inPersonFields : Variant) : Object
Function list($inParameter : Object) : Object

Super._clearErrorStack()

var $URL : Text:=Super._getURL()
var $personFields : Text
var $sources : Text
Expand Down Expand Up @@ -97,5 +96,5 @@ Function list($inParameter : Object) : Object
If (Type($inParameter.requestSyncToken)=Is boolean)
$URL+="&requestSyncToken="+$inParameter.requestSyncToken ? "true" : "false"
End if

return cs.GoogleUserList.new(This._getOAuth2Provider(); $URL)
4 changes: 1 addition & 3 deletions Project/Sources/Classes/OAuth2Provider.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -625,9 +625,7 @@ Function _checkPrerequisites($obj : Object) : Boolean
: (Length(String($obj.clientId))=0)
This._throwError(2; {attribute: "clientId"})

: ((Length(String($obj.name))>0) && \
((Value type($obj.scope)=Is text) && (Length(String($obj.scope))=0)) || \
((Value type($obj.scope)=Is collection) && ($obj.scope.length=0)))
: ((Length(String($obj.name))>0) && (Length(String($obj.scope))=0))
This._throwError(2; {attribute: "scope"})

: (Length(String($obj.permission))=0)
Expand Down
4 changes: 2 additions & 2 deletions Project/Sources/Classes/_GoogleAPI.4dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Class extends _BaseAPI

Class constructor($inProvider : cs.OAuth2Provider; $inBaseURL : Text)
Class constructor($inProvider : cs.OAuth2Provider)

Super($inProvider)

This._internals._URL:=(Length(String($inBaseURL)) > 0) ? $inBaseURL : "https://gmail.googleapis.com/gmail/v1/"
This._internals._URL:="https://gmail.googleapis.com/gmail/v1/"


// ----------------------------------------------------
Expand Down

0 comments on commit 140b074

Please sign in to comment.