fix urls

markbates · Oct 11, 2019 · 6036867 · 6036867
1 parent e51c3c9
commit 6036867
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/examples/main.go b/examples/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/markbates/goth/providers/apple"
 	"html/template"
 	"net/http"
 	"os"
@@ -124,6 +125,7 @@ func main() {
 		nextcloud.NewCustomisedDNS(os.Getenv("NEXTCLOUD_KEY"), os.Getenv("NEXTCLOUD_SECRET"), "http://localhost:3000/auth/nextcloud/callback", os.Getenv("NEXTCLOUD_URL")),
 		gitea.New(os.Getenv("GITEA_KEY"), os.Getenv("GITEA_SECRET"), "http://localhost:3000/auth/gitea/callback"),
 		shopify.New(os.Getenv("SHOPIFY_KEY"), os.Getenv("SHOPIFY_SECRET"), "http://localhost:3000/auth/shopify/callback", shopify.ScopeReadCustomers, shopify.ScopeReadOrders),
+		apple.New(os.Getenv("APPLE_KEY"), os.Getenv("APPLE_SECRET"), "http://localhost:3000/auth/apple/callback", nil),
 	)
 
 	// OpenID Connect is based on OpenID Connect Auto Discovery URL (https://openid.net/specs/openid-connect-discovery-1_0-17.html)
@@ -184,6 +186,7 @@ func main() {
 	m["naver"] = "Naver"
 	m["yandex"] = "Yandex"
 	m["nextcloud"] = "NextCloud"
+	m["apple"] = "Apple"
 
 	var keys []string
 	for k := range m {

diff --git a/providers/apple/apple.go b/providers/apple/apple.go
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	publicKeyFetchURL            = "https://appleid.apple.com/auth/keys"
-	generateAndValidateTokensURL = "https://appleid.apple.com/auth/token"
+	authEndpoint  = "https://appleid.apple.com/auth/authorize"
+	tokenEndpoint = "https://appleid.apple.com/auth/token"
 )
 
 type Provider struct {
@@ -101,8 +101,8 @@ func newConfig(provider *Provider, scopes []string) *oauth2.Config {
 		ClientSecret: provider.secret,
 		RedirectURL:  provider.redirectURL,
 		Endpoint: oauth2.Endpoint{
-			AuthURL:  generateAndValidateTokensURL,
-			TokenURL: publicKeyFetchURL,
+			AuthURL:  authEndpoint,
+			TokenURL: tokenEndpoint,
 		},
 		Scopes: make([]string, 0, len(scopes)),
 	}

diff --git a/providers/apple/apple_test.go b/providers/apple/apple_test.go
@@ -31,19 +31,19 @@ func Test_BeginAuth(t *testing.T) {
 	session, err := p.BeginAuth("test_state")
 	s := session.(*Session)
 	a.NoError(err)
-	a.Contains(s.AuthURL, "appleid.apple.com/auth/token")
+	a.Contains(s.AuthURL, "appleid.apple.com/auth/authorize")
 }
 
 func Test_SessionFromJSON(t *testing.T) {
 	t.Parallel()
 	a := assert.New(t)
 
 	p := provider()
-	session, err := p.UnmarshalSession(`{"AuthURL":"https://appleid.apple.com/auth/token","AccessToken":"1234567890"}`)
+	session, err := p.UnmarshalSession(`{"AuthURL":"https://appleid.apple.com/auth/authorize","AccessToken":"1234567890"}`)
 	a.NoError(err)
 
 	s := session.(*Session)
-	a.Equal(s.AuthURL, "https://appleid.apple.com/auth/token")
+	a.Equal(s.AuthURL, "https://appleid.apple.com/auth/authorize")
 	a.Equal(s.AccessToken, "1234567890")
 }