Fix imports

provider.go

@@ -60,3 +60,11 @@ func ContextForClient(h *http.Client) context.Context {
 	}
 	return context.WithValue(oauth2.NoContext, oauth2.HTTPClient, h)
 }
+
+// HTTPClientWithFallBack to be used in all fetch operations.
+func HTTPClientWithFallBack(h *http.Client) *http.Client {
+	if h != nil {
+		return h
+	}
+	return http.DefaultClient
+}

providers/amazon/amazon.go

@@ -5,12 +5,13 @@ package amazon
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/amazon/session.go

@@ -3,9 +3,10 @@ package amazon
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Box.

providers/bitbucket/bitbucket.go

@@ -4,12 +4,13 @@ package bitbucket
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/bitbucket/session.go

@@ -3,9 +3,10 @@ package bitbucket
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Bitbucket.

providers/box/box.go

@@ -4,10 +4,11 @@ package box
 
 import (
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"net/http"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/box/session.go

@@ -3,10 +3,10 @@ package box
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Box.

providers/cloudfoundry/cf.go

@@ -5,13 +5,14 @@ package cloudfoundry
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/net/context"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
+
+	"github.com/markbates/goth"
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
 )
 
 // Provider is the implementation of `goth.Provider` for accessing Cloud Foundry.

providers/cloudfoundry/session.go

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
+	"time"
+
 	"github.com/markbates/goth"
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
-	"strings"
-	"time"
 )
 
 // Session stores data during the auth process with Box.

providers/digitalocean/digitalocean.go

@@ -3,11 +3,12 @@ package digitalocean
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/digitalocean/session.go

@@ -3,10 +3,10 @@ package digitalocean
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with DigitalOcean.

providers/dropbox/dropbox.go

@@ -4,11 +4,12 @@ package dropbox
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"net/http"
 	"strings"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/facebook/facebook.go

@@ -6,12 +6,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/facebook/session.go

@@ -3,9 +3,10 @@ package facebook
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Facebook.

providers/faux/faux.go

@@ -4,9 +4,10 @@ package faux
 
 import (
 	"encoding/json"
+	"strings"
+
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
-	"strings"
 )
 
 // Provider is used only for testing.

providers/github/github.go

@@ -6,13 +6,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 // These vars define the Authentication, Token, and API URLS for GitHub. If

providers/github/session.go

@@ -3,9 +3,9 @@ package github
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Github.

providers/gitlab/gitlab.go

@@ -5,13 +5,14 @@ package gitlab
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/gitlab/session.go

@@ -3,10 +3,10 @@ package gitlab
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Box.

providers/gplus/session.go

@@ -3,10 +3,10 @@ package gplus
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Facebook.

providers/heroku/heroku.go

@@ -4,10 +4,11 @@ package heroku
 
 import (
 	"encoding/json"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"net/http"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (

providers/heroku/session.go

@@ -3,10 +3,10 @@ package heroku
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Box.

providers/influxcloud/session.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 )
 
 // Session stores data during the auth process with Github.

providers/instagram/instagram.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 var (
@@ -144,6 +145,7 @@ func newConfig(p *Provider, scopes []string) *oauth2.Config {
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	return nil, errors.New("Refresh token is not provided by instagram")
 }
+
 //RefreshTokenAvailable refresh token is not provided by instagram
 func (p *Provider) RefreshTokenAvailable() bool {
 	return false

providers/instagram/session.go

@@ -3,9 +3,9 @@ package instagram
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Instagram

providers/lastfm/lastfm.go

@@ -8,12 +8,13 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"sort"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 var (

providers/lastfm/session.go

@@ -3,8 +3,9 @@ package lastfm
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
 	"strings"
+
+	"github.com/markbates/goth"
 )
 
 // Session stores data during the auth process with Lastfm.

providers/linkedin/linkedin.go

@@ -4,11 +4,12 @@ package linkedin
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 //more details about linkedin fields: https://developer.linkedin.com/documents/profile-fields