Merge pull request markbates#112 from rgeronimi/revert-67-master

Revert "Fixed http exotic connection leak"

Author: markbates

providers/box/box.go

@@ -68,9 +68,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Set("Authorization", "Bearer "+s.AccessToken)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/digitalocean/digitalocean.go

@@ -77,9 +77,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 
 	resp, err := client.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/dropbox/dropbox.go

@@ -73,9 +73,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Set("Authorization", "Bearer "+s.Token)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/lastfm/lastfm.go

@@ -143,9 +143,6 @@ func (p *Provider) request(sign bool, params map[string]string, result interface
 
 	res, err := client.Do(req)
 	if err != nil {
-		if res != nil {
-			res.Body.Close()
-		}
 		return err
 	}
 

providers/linkedin/linkedin.go

@@ -84,9 +84,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Add("x-li-format", "json") //request json response
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/salesforce/salesforce.go

@@ -72,9 +72,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Set("Authorization", "Bearer "+s.AccessToken)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/spotify/spotify.go

@@ -101,9 +101,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Set("Authorization", "Bearer "+s.AccessToken)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/twitch/twitch.go

@@ -111,9 +111,6 @@ func (p *Provider) FetchUser(session goth.Session) (goth.User, error) {
 	req.Header.Set("Authorization", "OAuth "+s.AccessToken)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if resp != nil {
-			resp.Body.Close()
-		}
 		return user, err
 	}
 	defer resp.Body.Close()

providers/yammer/session.go

@@ -74,9 +74,6 @@ func retrieveAuthData(ClientID, ClientSecret, TokenURL string, v url.Values) (ma
 
 	r, err := http.DefaultClient.Do(req)
 	if err != nil {
-		if r != nil {
-			r.Body.Close()
-		}
 		return nil, err
 	}
 	defer r.Body.Close()