From 9c344a0a95c44ef9cebade7b8a65ac160d9eb900 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 11 Feb 2017 20:20:35 +0000 Subject: Revert "Remove the oauth_callback_url config option" --- server/auth/github/github_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/auth/github/github_test.go') diff --git a/server/auth/github/github_test.go b/server/auth/github/github_test.go index d9d5f00..8c51f4f 100644 --- a/server/auth/github/github_test.go +++ b/server/auth/github/github_test.go @@ -2,7 +2,6 @@ package github import ( "fmt" - "net/http" "testing" "github.com/nsheridan/cashier/server/config" @@ -23,11 +22,13 @@ func TestNew(t *testing.T) { p, _ := New(&config.Auth{ OauthClientID: oauthClientID, OauthClientSecret: oauthClientSecret, + OauthCallbackURL: oauthCallbackURL, ProviderOpts: map[string]string{"organization": organization}, UsersWhitelist: users, }) a.Equal(p.config.ClientID, oauthClientID) a.Equal(p.config.ClientSecret, oauthClientSecret) + a.Equal(p.config.RedirectURL, oauthCallbackURL) a.Equal(p.organization, organization) a.Equal(p.whitelist, map[string]bool{"user": true}) } @@ -36,6 +37,7 @@ func TestWhitelist(t *testing.T) { c := &config.Auth{ OauthClientID: oauthClientID, OauthClientSecret: oauthClientSecret, + OauthCallbackURL: oauthCallbackURL, ProviderOpts: map[string]string{"organization": ""}, UsersWhitelist: []string{}, } @@ -59,10 +61,7 @@ func TestStartSession(t *testing.T) { a := assert.New(t) p, _ := newGithub() - r := &http.Request{ - Host: oauthCallbackURL, - } - s := p.StartSession("test_state", r) + s := p.StartSession("test_state") a.Contains(s.AuthURL, "github.com/login/oauth/authorize") a.Contains(s.AuthURL, "state=test_state") a.Contains(s.AuthURL, fmt.Sprintf("client_id=%s", oauthClientID)) @@ -72,6 +71,7 @@ func newGithub() (*Config, error) { c := &config.Auth{ OauthClientID: oauthClientID, OauthClientSecret: oauthClientSecret, + OauthCallbackURL: oauthCallbackURL, ProviderOpts: map[string]string{"organization": organization}, } return New(c) -- cgit v1.2.3