go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-06-29 01:01:36 +02:00
Code Issues Releases Activity

linkedidn: Update provider to v2 (#1315)

Browse Source 
* linkedin: Update provider to v2

* changelog: Add change
This commit is contained in:
David Emanuel Buchmann
2021-10-04 16:58:25 +02:00
committed by GitHub
parent 3957183fd5
commit fd5e23e1c5
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@
## Changes since v7.1.3 ## Changes since v7.1.3
- [#1315](https://github.com/oauth2-proxy/oauth2-proxy/pull/1315) linkedin: Update provider to v2 (@wuurrd)
- [#1348](https://github.com/oauth2-proxy/oauth2-proxy/pull/1348) Using the native httputil proxy code for websockets rather than yhat/wsutil to properly handle HTTP-level failures (@thetrime) - [#1348](https://github.com/oauth2-proxy/oauth2-proxy/pull/1348) Using the native httputil proxy code for websockets rather than yhat/wsutil to properly handle HTTP-level failures (@thetrime)
- [#1379](https://github.com/oauth2-proxy/oauth2-proxy/pull/1379) Fix the manual sign in with --htpasswd-user-group switch (@janrotter) - [#1379](https://github.com/oauth2-proxy/oauth2-proxy/pull/1379) Fix the manual sign in with --htpasswd-user-group switch (@janrotter)
- [#1337](https://github.com/oauth2-proxy/oauth2-proxy/pull/1337) Changing user field type to text when using htpasswd (@pburgisser) - [#1337](https://github.com/oauth2-proxy/oauth2-proxy/pull/1337) Changing user field type to text when using htpasswd (@pburgisser)

13
providers/linkedin.go
View File

@ -19,7 +19,7 @@ var _ Provider = (*LinkedInProvider)(nil)
const ( const (
linkedinProviderName = "LinkedIn" linkedinProviderName = "LinkedIn"
linkedinDefaultScope = "r_emailaddress r_basicprofile" linkedinDefaultScope = "r_emailaddress r_liteprofile"
) )
var ( var (
@ -28,7 +28,7 @@ var (
linkedinDefaultLoginURL = &url.URL{ linkedinDefaultLoginURL = &url.URL{
Scheme: "https", Scheme: "https",
Host: "www.linkedin.com", Host: "www.linkedin.com",
Path: "/uas/oauth2/authorization", Path: "/oauth/v2/authorization",
} }
// Default Redeem URL for LinkedIn. // Default Redeem URL for LinkedIn.
@ -43,8 +43,8 @@ var (
// Pre-parsed URL of https://www.linkedin.com/v1/people/~/email-address. // Pre-parsed URL of https://www.linkedin.com/v1/people/~/email-address.
linkedinDefaultProfileURL = &url.URL{ linkedinDefaultProfileURL = &url.URL{
Scheme: "https", Scheme: "https",
Host: "www.linkedin.com", Host: "api.linkedin.com",
Path: "/v1/people/~/email-address", Path: "/v2/emailAddress",
} }
) )
@ -76,7 +76,7 @@ func (p *LinkedInProvider) GetEmailAddress(ctx context.Context, s *sessions.Sess
return "", errors.New("missing access token") return "", errors.New("missing access token")
} }
requestURL := p.ProfileURL.String() + "?format=json" requestURL := p.ProfileURL.String() + "?q=members&projection=(elements*(handle~))"
json, err := requests.New(requestURL). json, err := requests.New(requestURL).
WithContext(ctx). WithContext(ctx).
WithHeaders(makeLinkedInHeader(s.AccessToken)). WithHeaders(makeLinkedInHeader(s.AccessToken)).
@ -85,8 +85,7 @@ func (p *LinkedInProvider) GetEmailAddress(ctx context.Context, s *sessions.Sess
if err != nil { if err != nil {
return "", err return "", err
} }
email, err := json.Get("elements").GetIndex(0).Get("handle~").Get("emailAddress").String()
email, err := json.String()
if err != nil { if err != nil {
return "", err return "", err
} }

12
providers/linkedin_test.go
View File

@ -30,7 +30,7 @@ func testLinkedInProvider(hostname string) *LinkedInProvider {
} }
func testLinkedInBackend(payload string) *httptest.Server { func testLinkedInBackend(payload string) *httptest.Server {
path := "/v1/people/~/email-address" path := "/v2/emailAddress"
return httptest.NewServer(http.HandlerFunc( return httptest.NewServer(http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) { func(w http.ResponseWriter, r *http.Request) {
@ -51,11 +51,11 @@ func TestNewLinkedInProvider(t *testing.T) {
// Test that defaults are set when calling for a new provider with nothing set // Test that defaults are set when calling for a new provider with nothing set
providerData := NewLinkedInProvider(&ProviderData{}).Data() providerData := NewLinkedInProvider(&ProviderData{}).Data()
g.Expect(providerData.ProviderName).To(Equal("LinkedIn")) g.Expect(providerData.ProviderName).To(Equal("LinkedIn"))
g.Expect(providerData.LoginURL.String()).To(Equal("https://www.linkedin.com/uas/oauth2/authorization")) g.Expect(providerData.LoginURL.String()).To(Equal("https://www.linkedin.com/oauth/v2/authorization"))
g.Expect(providerData.RedeemURL.String()).To(Equal("https://www.linkedin.com/uas/oauth2/accessToken")) g.Expect(providerData.RedeemURL.String()).To(Equal("https://www.linkedin.com/uas/oauth2/accessToken"))
g.Expect(providerData.ProfileURL.String()).To(Equal("https://www.linkedin.com/v1/people/~/email-address")) g.Expect(providerData.ProfileURL.String()).To(Equal("https://api.linkedin.com/v2/emailAddress"))
g.Expect(providerData.ValidateURL.String()).To(Equal("https://www.linkedin.com/v1/people/~/email-address")) g.Expect(providerData.ValidateURL.String()).To(Equal("https://api.linkedin.com/v2/emailAddress"))
g.Expect(providerData.Scope).To(Equal("r_emailaddress r_basicprofile")) g.Expect(providerData.Scope).To(Equal("r_emailaddress r_liteprofile"))
} }
func TestLinkedInProviderOverrides(t *testing.T) { func TestLinkedInProviderOverrides(t *testing.T) {
@ -92,7 +92,7 @@ func TestLinkedInProviderOverrides(t *testing.T) {
} }
func TestLinkedInProviderGetEmailAddress(t *testing.T) { func TestLinkedInProviderGetEmailAddress(t *testing.T) {
b := testLinkedInBackend(`"user@linkedin.com"`) b := testLinkedInBackend(`{"elements":[{"handle~":{"emailAddress": "user@linkedin.com"}}]}`)
defer b.Close() defer b.Close()
bURL, _ := url.Parse(b.URL) bURL, _ := url.Parse(b.URL)