8027cc4 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Move api to pkg/requests

commit8027cc454e0fd571de69d496f1de13c51d2ab6e7 authorJoel Speed <Joel.speed@hotmail.co.uk> dateFri 24 May 2019, 16:55 (7 years ago) parent572646e

7 files changed+12−12

compare with master

unifiedsplit

api/api.go → pkg/requests/requests.go+1−1 api/api_test.go → pkg/requests/requests_test.go+1−1 providers/azure.go+2−2 providers/facebook.go+2−2 providers/gitlab.go+2−2 providers/internal_util.go+2−2 providers/linkedin.go+2−2

api/api.go → pkg/requests/requests.gorenamed+1−1

@@ -1,4 +1,4 @@

1−package api

1+package requests

33import (

44 "encoding/json"

api/api_test.go → pkg/requests/requests_test.gorenamed+1−1

@@ -1,4 +1,4 @@

1−package api

1+package requests

33import (

44 "io/ioutil"

providers/azure.go+2−2

@@ -7,9 +7,9 @@ import (

77 "net/url"

99 "github.com/bitly/go-simplejson"

10− "github.com/pusher/oauth2_proxy/api"

1110 "github.com/pusher/oauth2_proxy/logger"

1211 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

12+ "github.com/pusher/oauth2_proxy/pkg/requests"

1313)

1414

1515// AzureProvider represents an Azure based Identity Provider

@@ -102,7 +102,7 @@ func (p *AzureProvider) GetEmailAddress(s *sessions.SessionState) (string, error

102102 }

103103 req.Header = getAzureHeader(s.AccessToken)

104104

105− json, err := api.Request(req)

105+ json, err := requests.Request(req)

106106

107107 if err != nil {

108108 return "", err

providers/facebook.go+2−2

@@ -6,8 +6,8 @@ import (

66 "net/http"

77 "net/url"

9− "github.com/pusher/oauth2_proxy/api"

109 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

10+ "github.com/pusher/oauth2_proxy/pkg/requests"

1111)

1212

1313// FacebookProvider represents an Facebook based Identity Provider

@@ -69,7 +69,7 @@ func (p *FacebookProvider) GetEmailAddress(s *sessions.SessionState) (string, er

6969 Email string

7070 }

7171 var r result

72− err = api.RequestJSON(req, &r)

72+ err = requests.RequestJSON(req, &r)

7373 if err != nil {

7474 return "", err

7575 }

providers/gitlab.go+2−2

@@ -4,9 +4,9 @@ import (

44 "net/http"

55 "net/url"

7− "github.com/pusher/oauth2_proxy/api"

87 "github.com/pusher/oauth2_proxy/logger"

98 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

9+ "github.com/pusher/oauth2_proxy/pkg/requests"

1010)

1111

1212// GitLabProvider represents an GitLab based Identity Provider

@@ -53,7 +53,7 @@ func (p *GitLabProvider) GetEmailAddress(s *sessions.SessionState) (string, erro

5353 logger.Printf("failed building request %s", err)

5454 return "", err

5555 }

56− json, err := api.Request(req)

56+ json, err := requests.Request(req)

5757 if err != nil {

5858 logger.Printf("failed making request %s", err)

5959 return "", err

providers/internal_util.go+2−2

@@ -5,8 +5,8 @@ import (

55 "net/http"

66 "net/url"

8− "github.com/pusher/oauth2_proxy/api"

98 "github.com/pusher/oauth2_proxy/logger"

9+ "github.com/pusher/oauth2_proxy/pkg/requests"

1010)

1111

1212// stripToken is a helper function to obfuscate "access_token"

@@ -55,7 +55,7 @@ func validateToken(p Provider, accessToken string, header http.Header) bool {

5555 params := url.Values{"access_token": {accessToken}}

5656 endpoint = endpoint + "?" + params.Encode()

5757 }

58− resp, err := api.RequestUnparsedResponse(endpoint, header)

58+ resp, err := requests.RequestUnparsedResponse(endpoint, header)

5959 if err != nil {

6060 logger.Printf("GET %s", stripToken(endpoint))

6161 logger.Printf("token validation request failed: %s", err)

providers/linkedin.go+2−2

@@ -6,8 +6,8 @@ import (

66 "net/http"

77 "net/url"

9− "github.com/pusher/oauth2_proxy/api"

109 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"

10+ "github.com/pusher/oauth2_proxy/pkg/requests"

1111)

1212

1313// LinkedInProvider represents an LinkedIn based Identity Provider

@@ -61,7 +61,7 @@ func (p *LinkedInProvider) GetEmailAddress(s *sessions.SessionState) (string, er

6161 }

6262 req.Header = getLinkedInHeader(s.AccessToken)

6363

64− json, err := api.Request(req)

64+ json, err := requests.Request(req)

6565 if err != nil {

6666 return "", err

6767 }