Merge pull request #70 from cli/69-v110-panics-when-hostname-is-used-rather-than-host-in-the-oauth-flow

Fix panic when Hostname is used

Author: williammartin

oauth_device.go

@@ -32,11 +32,11 @@ func (oa *Flow) DeviceFlow() (*api.AccessToken, error) {
 
 	host := oa.Host
 	if host == nil {
-		host, err := NewGitHubHost("https://" + oa.Hostname)
+		parsedHost, err := NewGitHubHost("https://" + oa.Hostname)
 		if err != nil {
-			return nil, fmt.Errorf("error parsing the hostname '%s': %w", host, err)
+			return nil, fmt.Errorf("error parsing the hostname '%s': %w", oa.Hostname, err)
 		}
-		oa.Host = host
+		host = parsedHost
 	}
 
 	code, err := device.RequestCode(httpClient, host.DeviceCodeURL, oa.ClientID, oa.Scopes)

oauth_webapp.go

@@ -16,11 +16,11 @@ func (oa *Flow) WebAppFlow() (*api.AccessToken, error) {
 	host := oa.Host
 
 	if host == nil {
-		host, err := NewGitHubHost("https://" + oa.Hostname)
+		parsedHost, err := NewGitHubHost("https://" + oa.Hostname)
 		if err != nil {
-			return nil, fmt.Errorf("error parsing the hostname '%s': %w", host, err)
+			return nil, fmt.Errorf("error parsing the hostname '%s': %w", oa.Hostname, err)
 		}
-		oa.Host = host
+		host = parsedHost
 	}
 
 	flow, err := webapp.InitFlow()