Remove deprecated RedirectURLHostname (#313)

Author: int128

e2e_test/e2e_test.go

@@ -89,77 +89,6 @@ func TestHappyPath(t *testing.T) {
 	wg.Wait()
 }
 
-func TestRedirectURLHostname(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.TODO(), 1*time.Second)
-	defer cancel()
-	openBrowserCh := make(chan string)
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		defer close(openBrowserCh)
-		// Start a local server and get a token.
-		testServer := httptest.NewServer(&authserver.Handler{
-			TestingT: t,
-			NewAuthorizationResponse: func(req authserver.AuthorizationRequest) string {
-				if want := "email profile"; req.Scope != want {
-					t.Errorf("scope wants %s but %s", want, req.Scope)
-					return fmt.Sprintf("%s?error=invalid_scope", req.RedirectURI)
-				}
-				if !assertRedirectURI(t, req.RedirectURI, "http", "127.0.0.1", "") {
-					return fmt.Sprintf("%s?error=invalid_redirect_uri", req.RedirectURI)
-				}
-				return fmt.Sprintf("%s?state=%s&code=%s", req.RedirectURI, req.State, "AUTH_CODE")
-			},
-			NewTokenResponse: func(req authserver.TokenRequest) (int, string) {
-				if want := "AUTH_CODE"; req.Code != want {
-					t.Errorf("code wants %s but %s", want, req.Code)
-					return 400, invalidGrantResponse
-				}
-				return 200, validTokenResponse
-			},
-		})
-		defer testServer.Close()
-		cfg := oauth2cli.Config{
-			OAuth2Config: oauth2.Config{
-				ClientID:     "YOUR_CLIENT_ID",
-				ClientSecret: "YOUR_CLIENT_SECRET",
-				Scopes:       []string{"email", "profile"},
-				Endpoint: oauth2.Endpoint{
-					AuthURL:  testServer.URL + "/auth",
-					TokenURL: testServer.URL + "/token",
-				},
-			},
-			RedirectURLHostname:   "127.0.0.1",
-			LocalServerReadyChan:  openBrowserCh,
-			LocalServerMiddleware: loggingMiddleware(t),
-			Logf:                  t.Logf,
-		}
-		token, err := oauth2cli.GetToken(ctx, cfg)
-		if err != nil {
-			t.Errorf("could not get a token: %s", err)
-			return
-		}
-		if token.AccessToken != "ACCESS_TOKEN" {
-			t.Errorf("AccessToken wants %s but %s", "ACCESS_TOKEN", token.AccessToken)
-		}
-		if token.RefreshToken != "REFRESH_TOKEN" {
-			t.Errorf("RefreshToken wants %s but %s", "REFRESH_TOKEN", token.RefreshToken)
-		}
-	}()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		toURL, ok := <-openBrowserCh
-		if !ok {
-			t.Errorf("server already closed")
-			return
-		}
-		client.GetAndVerify(t, toURL, 200, oauth2cli.DefaultLocalServerSuccessHTML)
-	}()
-	wg.Wait()
-}
-
 func TestSuccessRedirect(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.TODO(), 1*time.Second)
 	defer cancel()

oauth2cli.go

@@ -66,9 +66,6 @@ type Config struct {
 	// Default to a string of random 32 bytes.
 	State string
 
-	// DEPRECATED: Set OAuth2Config.RedirectURL instead.
-	RedirectURLHostname string
-
 	// Candidates of hostname and port which the local server binds to.
 	// You can set port number to 0 to allocate a free port.
 	// If multiple addresses are given, it will try the ports in order.

server.go

@@ -26,11 +26,7 @@ func receiveCodeViaLocalServer(ctx context.Context, cfg *Config) (string, error)
 
 	if cfg.OAuth2Config.RedirectURL == "" {
 		var localServerURL url.URL
-		localServerHostname := "localhost"
-		if cfg.RedirectURLHostname != "" {
-			localServerHostname = cfg.RedirectURLHostname
-		}
-		localServerURL.Host = fmt.Sprintf("%s:%d", localServerHostname, localServerListener.Addr().(*net.TCPAddr).Port)
+		localServerURL.Host = fmt.Sprintf("localhost:%d", localServerListener.Addr().(*net.TCPAddr).Port)
 		localServerURL.Scheme = "http"
 		if cfg.isLocalServerHTTPS() {
 			localServerURL.Scheme = "https"