git.iko.soy/typeable/oauth2-proxy
on master help sign in
Move api to pkg/requests
8027cc4Joel Speed
api/api.go → pkg/requests/requests.gorenamed+1−1
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−package api
1+package requests
2
2
3import (
3import (
4 "encoding/json"
4 "encoding/json"
api/api_test.go → pkg/requests/requests_test.gorenamed+1−1
@@ -1,4 +1,4 @@
1−package api
1+package requests
2
2
3import (
3import (
4 "io/ioutil"
4 "io/ioutil"
providers/azure.go+2−2
@@ -7,9 +7,9 @@ import (
7 "net/url"
7 "net/url"
8
8
9 "github.com/bitly/go-simplejson"
9 "github.com/bitly/go-simplejson"
10− "github.com/pusher/oauth2_proxy/api"
11 "github.com/pusher/oauth2_proxy/logger"
10 "github.com/pusher/oauth2_proxy/logger"
12 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
11 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
12+ "github.com/pusher/oauth2_proxy/pkg/requests"
13)
13)
14
14
15// AzureProvider represents an Azure based Identity Provider
15// AzureProvider represents an Azure based Identity Provider
@@ -102,7 +102,7 @@ func (p *AzureProvider) GetEmailAddress(s *sessions.SessionState) (string, error
102 }
102 }
103 req.Header = getAzureHeader(s.AccessToken)
103 req.Header = getAzureHeader(s.AccessToken)
104
104
105− json, err := api.Request(req)
105+ json, err := requests.Request(req)
106
106
107 if err != nil {
107 if err != nil {
108 return "", err
108 return "", err
providers/facebook.go+2−2
@@ -6,8 +6,8 @@ import (
6 "net/http"
6 "net/http"
7 "net/url"
7 "net/url"
8
8
9− "github.com/pusher/oauth2_proxy/api"
10 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
9 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
10+ "github.com/pusher/oauth2_proxy/pkg/requests"
11)
11)
12
12
13// FacebookProvider represents an Facebook based Identity Provider
13// FacebookProvider represents an Facebook based Identity Provider
@@ -69,7 +69,7 @@ func (p *FacebookProvider) GetEmailAddress(s *sessions.SessionState) (string, er
69 Email string
69 Email string
70 }
70 }
71 var r result
71 var r result
72− err = api.RequestJSON(req, &r)
72+ err = requests.RequestJSON(req, &r)
73 if err != nil {
73 if err != nil {
74 return "", err
74 return "", err
75 }
75 }
providers/gitlab.go+2−2
@@ -4,9 +4,9 @@ import (
4 "net/http"
4 "net/http"
5 "net/url"
5 "net/url"
6
6
7− "github.com/pusher/oauth2_proxy/api"
8 "github.com/pusher/oauth2_proxy/logger"
7 "github.com/pusher/oauth2_proxy/logger"
9 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
8 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
9+ "github.com/pusher/oauth2_proxy/pkg/requests"
10)
10)
11
11
12// GitLabProvider represents an GitLab based Identity Provider
12// GitLabProvider represents an GitLab based Identity Provider
@@ -53,7 +53,7 @@ func (p *GitLabProvider) GetEmailAddress(s *sessions.SessionState) (string, erro
53 logger.Printf("failed building request %s", err)
53 logger.Printf("failed building request %s", err)
54 return "", err
54 return "", err
55 }
55 }
56− json, err := api.Request(req)
56+ json, err := requests.Request(req)
57 if err != nil {
57 if err != nil {
58 logger.Printf("failed making request %s", err)
58 logger.Printf("failed making request %s", err)
59 return "", err
59 return "", err
providers/internal_util.go+2−2
@@ -5,8 +5,8 @@ import (
5 "net/http"
5 "net/http"
6 "net/url"
6 "net/url"
7
7
8− "github.com/pusher/oauth2_proxy/api"
9 "github.com/pusher/oauth2_proxy/logger"
8 "github.com/pusher/oauth2_proxy/logger"
9+ "github.com/pusher/oauth2_proxy/pkg/requests"
10)
10)
11
11
12// stripToken is a helper function to obfuscate "access_token"
12// stripToken is a helper function to obfuscate "access_token"
@@ -55,7 +55,7 @@ func validateToken(p Provider, accessToken string, header http.Header) bool {
55 params := url.Values{"access_token": {accessToken}}
55 params := url.Values{"access_token": {accessToken}}
56 endpoint = endpoint + "?" + params.Encode()
56 endpoint = endpoint + "?" + params.Encode()
57 }
57 }
58− resp, err := api.RequestUnparsedResponse(endpoint, header)
58+ resp, err := requests.RequestUnparsedResponse(endpoint, header)
59 if err != nil {
59 if err != nil {
60 logger.Printf("GET %s", stripToken(endpoint))
60 logger.Printf("GET %s", stripToken(endpoint))
61 logger.Printf("token validation request failed: %s", err)
61 logger.Printf("token validation request failed: %s", err)
providers/linkedin.go+2−2
@@ -6,8 +6,8 @@ import (
6 "net/http"
6 "net/http"
7 "net/url"
7 "net/url"
8
8
9− "github.com/pusher/oauth2_proxy/api"
10 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
9 "github.com/pusher/oauth2_proxy/pkg/apis/sessions"
10+ "github.com/pusher/oauth2_proxy/pkg/requests"
11)
11)
12
12
13// LinkedInProvider represents an LinkedIn based Identity Provider
13// LinkedInProvider represents an LinkedIn based Identity Provider
@@ -61,7 +61,7 @@ func (p *LinkedInProvider) GetEmailAddress(s *sessions.SessionState) (string, er
61 }
61 }
62 req.Header = getLinkedInHeader(s.AccessToken)
62 req.Header = getLinkedInHeader(s.AccessToken)
63
63
64− json, err := api.Request(req)
64+ json, err := requests.Request(req)
65 if err != nil {
65 if err != nil {
66 return "", err
66 return "", err
67 }
67 }