all: Rearrange commits with goreturns

Signed-off-by: aeneasr <[email protected]>

access_error_test.go

@@ -23,17 +23,17 @@ package fosite_test
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
-	"fmt"
-
 	"github.com/golang/mock/gomock"
-	. "github.com/ory/fosite"
-	. "github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 )
 
 func TestWriteAccessError(t *testing.T) {

access_request_handler_test.go

@@ -22,20 +22,20 @@
 package fosite_test
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
 
-	"context"
-
 	"github.com/golang/mock/gomock"
-	. "github.com/ory/fosite"
-	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 )
 
 func TestNewAccessRequest(t *testing.T) {

access_response_test.go

@@ -24,8 +24,9 @@ package fosite_test
 import (
 	"testing"
 
-	. "github.com/ory/fosite"
 	"github.com/stretchr/testify/assert"
+
+	. "github.com/ory/fosite"
 )
 
 func TestAccessResponse(t *testing.T) {

access_response_writer_test.go

@@ -22,18 +22,17 @@
 package fosite_test
 
 import (
-	"testing"
-
 	"context"
-
 	"fmt"
+	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory/fosite"
-	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 )
 
 func TestNewAccessResponse(t *testing.T) {

access_write_test.go

@@ -22,14 +22,14 @@
 package fosite_test
 
 import (
-	"testing"
-
 	"net/http"
+	"testing"
 
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	. "github.com/ory/fosite"
 	. "github.com/ory/fosite/internal"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestWriteAccessResponse(t *testing.T) {

authorize_error_test.go

@@ -22,16 +22,16 @@
 package fosite_test
 
 import (
+	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
 
-	"fmt"
-
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	. "github.com/ory/fosite"
 	. "github.com/ory/fosite/internal"
-	"github.com/stretchr/testify/assert"
 )
 
 // Test for

authorize_request_handler.go

@@ -22,14 +22,11 @@
 package fosite
 
 import (
-	"net/http"
-	"strings"
-
 	"context"
-
 	"fmt"
-
 	"io/ioutil"
+	"net/http"
+	"strings"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/ory/go-convenience/stringslice"

authorize_request_handler_test.go

@@ -22,20 +22,19 @@
 package fosite_test
 
 import (
+	"context"
+	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
 
-	"context"
-
-	"fmt"
-
 	"github.com/golang/mock/gomock"
-	. "github.com/ory/fosite"
-	. "github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 )
 
 // Should pass

authorize_response_writer.go

@@ -22,11 +22,10 @@
 package fosite
 
 import (
+	"context"
 	"net/http"
 	"net/url"
 
-	"context"
-
 	"github.com/pkg/errors"
 )
 

authorize_response_writer_test.go

@@ -22,15 +22,15 @@
 package fosite_test
 
 import (
-	"testing"
-
 	"context"
+	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory/fosite"
-	. "github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
+
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 )
 
 func TestNewAuthorizeResponse(t *testing.T) {

authorize_write_test.go

@@ -27,9 +27,10 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	. "github.com/ory/fosite"
 	. "github.com/ory/fosite/internal"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestWriteAuthorizeResponse(t *testing.T) {

client_authentication_jwks_strategy_test.go

@@ -27,11 +27,12 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	. "github.com/ory/fosite"
-	"github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/square/go-jose.v2"
+
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 )
 
 func TestDefaultJWKSFetcherStrategy(t *testing.T) {

client_authentication_test.go

@@ -22,6 +22,7 @@
 package fosite_test
 
 import (
+	"context"
 	"crypto/rsa"
 	"encoding/base64"
 	"encoding/json"
@@ -32,16 +33,15 @@ import (
 	"testing"
 	"time"
 
-	"context"
-
 	"github.com/dgrijalva/jwt-go"
-	. "github.com/ory/fosite"
-	"github.com/ory/fosite/internal"
-	"github.com/ory/fosite/storage"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/square/go-jose.v2"
+
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
+	"github.com/ory/fosite/storage"
 )
 
 func mustGenerateAssertion(t *testing.T, claims jwt.MapClaims, key *rsa.PrivateKey, kid string) string {

compose/compose.go

@@ -58,7 +58,7 @@ func Compose(config *Config, storage interface{}, strategy interface{}, hasher f
 	}
 
 	f := &fosite.Fosite{
-		Store: storage.(fosite.Storage),
+		Store:                      storage.(fosite.Storage),
 		AuthorizeEndpointHandlers:  fosite.AuthorizeEndpointHandlers{},
 		TokenEndpointHandlers:      fosite.TokenEndpointHandlers{},
 		TokenIntrospectionHandlers: fosite.TokenIntrospectionHandlers{},

compose/compose_pkce.go

@@ -29,9 +29,9 @@ import (
 // OAuth2PKCEFactory creates a PKCE handler.
 func OAuth2PKCEFactory(config *Config, storage interface{}, strategy interface{}) interface{} {
 	return &pkce.Handler{
-		AuthorizeCodeStrategy: strategy.(oauth2.AuthorizeCodeStrategy),
-		Storage:               storage.(pkce.PKCERequestStorage),
-		Force:                 config.EnforcePKCE,
+		AuthorizeCodeStrategy:      strategy.(oauth2.AuthorizeCodeStrategy),
+		Storage:                    storage.(pkce.PKCERequestStorage),
+		Force:                      config.EnforcePKCE,
 		EnablePlainChallengeMethod: config.EnablePKCEPlainChallengeMethod,
 	}
 }

fosite_test.go

@@ -24,10 +24,11 @@ package fosite_test
 import (
 	"testing"
 
-	. "github.com/ory/fosite"
-	"github.com/ory/fosite/handler/oauth2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/handler/oauth2"
 )
 
 func TestAuthorizeEndpointHandlers(t *testing.T) {

handler/oauth2/flow_authorize_code_auth.go

@@ -22,13 +22,13 @@
 package oauth2
 
 import (
+	"context"
 	"strings"
 	"time"
 
-	"context"
+	"github.com/pkg/errors"
 
 	"github.com/ory/fosite"
-	"github.com/pkg/errors"
 )
 
 // AuthorizeExplicitGrantTypeHandler is a response handler for the Authorize Code grant using the explicit grant type

handler/oauth2/flow_authorize_code_auth_test.go

@@ -25,14 +25,14 @@ import (
 	"net/url"
 	"strings"
 	"testing"
-
 	"time"
 
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/storage"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/storage"
 )
 
 func parseUrl(uu string) *url.URL {

handler/oauth2/flow_authorize_code_token.go

@@ -25,8 +25,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/ory/fosite"
 	"github.com/pkg/errors"
+
+	"github.com/ory/fosite"
 )
 
 // HandleTokenEndpointRequest implements

handler/oauth2/flow_authorize_code_token_test.go

@@ -22,20 +22,14 @@
 package oauth2
 
 import (
+	"context"
+	"fmt"
 	"net/url"
-	"testing"
-
-	//"time"
-
+	"testing" //"time"
 	//"github.com/golang/mock/gomock"
-	"github.com/ory/fosite"
-	//"github.com/ory/fosite/internal"
 	"time"
 
-	"context"
-
-	"fmt"
-
+	"github.com/ory/fosite" //"github.com/ory/fosite/internal"
 	"github.com/ory/fosite/storage"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"

handler/oauth2/flow_authorize_implicit.go

@@ -22,14 +22,14 @@
 package oauth2
 
 import (
+	"context"
+	"strconv"
 	"strings"
 	"time"
 
-	"context"
-	"strconv"
+	"github.com/pkg/errors"
 
 	"github.com/ory/fosite"
-	"github.com/pkg/errors"
 )
 
 // AuthorizeImplicitGrantTypeHandler is a response handler for the Authorize Code grant using the implicit grant type

handler/oauth2/flow_authorize_implicit_test.go

@@ -22,16 +22,16 @@
 package oauth2
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
-	"fmt"
-
 	"github.com/golang/mock/gomock"
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 )
 
 func TestAuthorizeImplicit_EndpointHandler(t *testing.T) {