66 "oauth2/models"
77
88 "github.com/gofiber/fiber/v3"
9+ "github.com/gofiber/fiber/v3/client"
910 "github.com/gofiber/fiber/v3/middleware/session"
1011)
1112
@@ -22,26 +23,33 @@ func OAUTHRedirect(ctx fiber.Ctx) error {
2223
2324 // Next, lets for the HTTP request to call the github oauth enpoint to get our access token
2425
25- a := fiber .AcquireAgent ()
26- req := a .Request ()
27- req .Header .SetMethod (fiber .MethodPost )
28- req .Header .Set ("accept" , "application/json" )
29- req .SetRequestURI (fmt .Sprintf ("https://github.com/login/oauth/access_token?client_id=%s&client_secret=%s&code=%s" , models .ClientID , models .ClientSecret , code ))
30- if err := a .Parse (); err != nil {
31- models .SYSLOG .Errorf ("could not create HTTP request: %v" , err )
32- }
33-
26+ a := client .New ()
27+ req := a .R ()
28+ req .SetMethod ("POST" )
29+ req .SetURL (fmt .Sprintf ("https://github.com/login/oauth/access_token?client_id=%s&client_secret=%s&code=%s" , models .ClientID , models .ClientSecret , code ))
30+ req .SetHeader ("accept" , "application/json" )
3431 var retCode int
3532 var retBody []byte
36- var errs []error
3733 // Send out the HTTP request
3834 var t * models.OAuthAccessResponse
39-
40- if retCode , retBody , errs = a .Struct (& t ); len (errs ) > 0 {
35+ resp , clientErr := req .Send ()
36+ if clientErr != nil {
37+ models .SYSLOG .Errorf ("could not create HTTP request: %v" , clientErr )
38+ }
39+ if clientErr == nil {
40+ retCode = resp .StatusCode ()
41+ retBody = resp .Body ()
42+ clientErr = resp .JSON (& t )
43+ }
44+ if clientErr != nil {
4145 models .SYSLOG .Tracef ("received: %v" , string (retBody ))
42- models .SYSLOG .Errorf ("could not send HTTP request: %v" , errs )
46+ models .SYSLOG .Errorf ("could not send HTTP request: %v" , clientErr )
4347 return ctx .SendStatus (fiber .StatusInternalServerError )
4448 }
49+ var errs []error
50+ if clientErr != nil {
51+ errs = append (errs , clientErr )
52+ }
4553 models .SYSLOG .Tracef ("received : %v %v %v" , retCode , string (retBody ), errs )
4654
4755 var sess * session.Session
0 commit comments