vendor: update to latest versions

client/manager_http.go

@@ -4,10 +4,11 @@ import (
 	"net/http"
 	"net/url"
 
+	"context"
+
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/pkg"
 	"github.com/pkg/errors"
-	"context"
 )
 
 type HTTPManager struct {

client/manager_memory.go

@@ -3,12 +3,13 @@ package client
 import (
 	"sync"
 
+	"context"
+
 	"github.com/imdario/mergo"
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/pkg"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
-	"context"
 )
 
 type MemoryManager struct {

client/manager_sql.go

@@ -5,14 +5,15 @@ import (
 	"fmt"
 	"strings"
 
+	"context"
+
 	"github.com/imdario/mergo"
 	"github.com/jmoiron/sqlx"
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/pkg"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 	"github.com/rubenv/sql-migrate"
-	"context"
 )
 
 var migrations = &migrate.MemoryMigrationSource{

cmd/server/handler.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/gorilla/context"
 	"github.com/julienschmidt/httprouter"
 	"github.com/meatballhat/negroni-logrus"
 	"github.com/ory/graceful"
@@ -21,7 +22,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/urfave/negroni"
-	"github.com/gorilla/context"
 )
 
 func RunHost(c *config.Config) func(cmd *cobra.Command, args []string) {

cmd/server/handler_oauth2_factory.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/url"
 
+	"os"
+
 	"github.com/gorilla/sessions"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory/fosite"
@@ -15,7 +17,6 @@ import (
 	"github.com/ory/hydra/oauth2"
 	"github.com/ory/hydra/pkg"
 	"github.com/pkg/errors"
-	"os"
 )
 
 func injectFositeStore(c *config.Config, clients client.Manager) {
@@ -61,7 +62,7 @@ func newOAuth2Provider(c *config.Config, km jwk.Manager) fosite.OAuth2Provider {
 		c.GetLogger().Infoln("Keypair generated.")
 		c.GetLogger().Warnln("WARNING: Automated key creation causes low entropy. Replace the keys as soon as possible.")
 	} else if err != nil {
-		fmt.Fprintf(os.Stderr, `Could not fetch signing key for OpenID Connect - did you forget to run "hydra migrate sql" or forget to set the SYSTEM_SECRET? Got error: %s` + "\n", err.Error())
+		fmt.Fprintf(os.Stderr, `Could not fetch signing key for OpenID Connect - did you forget to run "hydra migrate sql" or forget to set the SYSTEM_SECRET? Got error: %s`+"\n", err.Error())
 		os.Exit(1)
 	}
 

config/backend_connections_test.go

@@ -2,17 +2,18 @@ package config
 
 import (
 	"fmt"
-	"github.com/Sirupsen/logrus"
-	"github.com/bmizerany/assert"
-	"github.com/jmoiron/sqlx"
-	"github.com/ory/dockertest"
-	"github.com/stretchr/testify/require"
 	"log"
 	"net/url"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/Sirupsen/logrus"
+	"github.com/bmizerany/assert"
+	"github.com/jmoiron/sqlx"
+	"github.com/ory/dockertest"
+	"github.com/stretchr/testify/require"
 )
 
 var (

config/context.go

@@ -1,4 +1,4 @@
- package config
+package config
 
 import (
 	"github.com/ory/fosite"

oauth2/handler.go

@@ -58,17 +58,17 @@ type WellKnown struct {
 	// by WebFinger. This also MUST be identical to the iss Claim value in ID Tokens issued from this Issuer.
 	//
 	// required: true
-	Issuer        string   `json:"issuer"`
+	Issuer string `json:"issuer"`
 
 	// URL of the OP's OAuth 2.0 Authorization Endpoint
 	//
 	// required: true
-	AuthURL       string   `json:"authorization_endpoint"`
+	AuthURL string `json:"authorization_endpoint"`
 
 	// URL of the OP's OAuth 2.0 Token Endpoint
 	//
 	// required: true
-	TokenURL      string   `json:"token_endpoint"`
+	TokenURL string `json:"token_endpoint"`
 
 	// URL of the OP's JSON Web Key Set [JWK] document. This contains the signing key(s) the RP uses to validate
 	// signatures from the OP. The JWK Set MAY also contain the Server's encryption key(s), which are used by RPs
@@ -79,21 +79,21 @@ type WellKnown struct {
 	// keys provided. When used, the bare key values MUST still be present and MUST match those in the certificate.
 	//
 	// required: true
-	JWKsURI       string   `json:"jwks_uri"`
+	JWKsURI string `json:"jwks_uri"`
 
 	// JSON array containing a list of the Subject Identifier types that this OP supports. Valid types include
 	// pairwise and public.
 	//
 	// required: true
-	SubjectTypes  []string `json:"subject_types_supported"`
+	SubjectTypes []string `json:"subject_types_supported"`
 
 	// JSON array containing a list of the JWS signing algorithms (alg values) supported by the OP for the ID Token
 	// to encode the Claims in a JWT [JWT]. The algorithm RS256 MUST be included. The value none MAY be supported,
 	// but MUST NOT be used unless the Response Type used returns no ID Token from the Authorization Endpoint
 	// (such as when using the Authorization Code Flow).
 	//
 	// required: true
-	SigningAlgs   []string `json:"id_token_signing_alg_values_supported"`
+	SigningAlgs []string `json:"id_token_signing_alg_values_supported"`
 
 	// JSON array containing a list of the OAuth 2.0 response_type values that this OP supports. Dynamic OpenID
 	// Providers MUST support the code, id_token, and the token id_token Response Type values.