Skip to content

Commit df633d9

Browse files
committed
GitHub:12815 (fixes OAuth2 Authorization requestHandler)
1 parent 134eeb3 commit df633d9

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Project/Sources/Classes/OAuth2Authorization.4dm

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ shared singleton Class constructor()
33
Function getResponse($request : 4D.IncomingMessage) : 4D.OutgoingMessage
44

55
var $response:=4D.OutgoingMessage.new()
6-
var $body : Blob
6+
var $responseBody : Blob
77
var $state : Text:=cs.Tools.me.getURLParameterValue($request.url; "state")
8-
var $options : Object:={state: $state}
9-
$options.redirectURI:=$request.urlPath
10-
$options.result:=$request.getJSON()
11-
12-
If (_authorize($options; ->$body))
8+
var $redirectURI : Text:=($request.urlPath.length>0) ? "/"+$request.urlPath[0]+"/@" : $request.url
9+
var $options : Object:={state: $state; redirectURI: $redirectURI}
10+
11+
If (Value type($request.urlQuery)=Is object)
12+
$options.result:=OB Copy($request.urlQuery; ck shared)
13+
End if
14+
15+
If (_authorize($options; ->$responseBody))
1316

1417
$response.setStatus(200)
18+
$response.setBody($responseBody)
1519
$response.setHeader("Content-Type"; "text/html")
16-
$response.setBody($body)
1720
Else
1821

1922
$response.setStatus(404)

0 commit comments

Comments
 (0)