diff --git a/compose/compose.go b/compose/compose.go index 563cc6561..8a2f48caa 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -3,7 +3,6 @@ package compose import ( "crypto/rsa" - "github.com/Sirupsen/logrus" "github.com/ory-am/fosite" ) @@ -37,7 +36,6 @@ func Compose(config *Config, storage interface{}, strategy interface{}, handlers TokenIntrospectionHandlers: fosite.TokenIntrospectionHandlers{}, RevocationHandlers: fosite.RevocationHandlers{}, Hasher: &fosite.BCrypt{WorkFactor: config.GetHashCost()}, - Logger: &logrus.Logger{}, ScopeStrategy: fosite.HierarchicScopeStrategy, } diff --git a/fosite.go b/fosite.go index e0c372576..f01f8e5f3 100644 --- a/fosite.go +++ b/fosite.go @@ -2,8 +2,6 @@ package fosite import ( "reflect" - - "github.com/Sirupsen/logrus" ) // AuthorizeEndpointHandlers is a list of AuthorizeEndpointHandler @@ -70,6 +68,5 @@ type Fosite struct { TokenIntrospectionHandlers TokenIntrospectionHandlers RevocationHandlers RevocationHandlers Hasher Hasher - Logger logrus.StdLogger ScopeStrategy ScopeStrategy } diff --git a/glide.lock b/glide.lock index 51c5603df..d204c4da1 100644 --- a/glide.lock +++ b/glide.lock @@ -1,16 +1,38 @@ -hash: 0ac686d5fd98f966adf0df5a617514913bdfe9f3c081919434d29395ded25c2f -updated: 2016-08-22T11:10:29.823423512+02:00 +hash: 765b5e035d3037868b068d86ba286c974ce9d29b38ba4a69194bac62d32898cf +updated: 2016-10-14T11:38:29.5300255+02:00 imports: - name: github.com/asaskevich/govalidator - version: 7664702784775e51966f0885f5cd27435916517b + version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877 - name: github.com/dgrijalva/jwt-go version: d2709f9f1f31ebcda9651b03077758c1f3a0018c -- name: github.com/go-errors/errors - version: a41850380601eeb43f4350f7d17c6bbd8944aaf8 - name: github.com/golang/mock version: bd3c8e81be01eef76d4b503f5e687d2d1354d2d9 subpackages: - gomock +- name: github.com/pborman/uuid + version: a97ce2ca70fa5a848076093f05e639a89ca34d06 +- name: github.com/pkg/errors + version: 645ef00459ed84a119197bfb8d8205042c6df63d +- name: github.com/square/go-jose + version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d + subpackages: + - json +- name: golang.org/x/crypto + version: e0d166c33c321d0ff863f459a5882096e334f508 + subpackages: + - bcrypt + - blowfish +- name: golang.org/x/net + version: 075e191f18186a8ff2becaf64478e30f4545cdad + subpackages: + - context +testImports: +- name: github.com/davecgh/go-spew + version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 + subpackages: + - spew +- name: github.com/go-errors/errors + version: a41850380601eeb43f4350f7d17c6bbd8944aaf8 - name: github.com/golang/protobuf version: c3cefd437628a0b7d31b34fe44b3a7a540e98527 subpackages: @@ -19,32 +41,23 @@ imports: version: 1ea25387ff6f684839d82767c1733ff4d4d15d0a - name: github.com/gorilla/mux version: 0eeaf8392f5b04950925b8a69fe70f110fa7cbfc -- name: github.com/moul/http2curl - version: b1479103caacaa39319f75e7f57fc545287fca0d - name: github.com/oleiade/reflections version: ec27669d960a245738b87ffa688dac28fa288c33 - name: github.com/ory-am/common version: d93c852f2d09c219fd058756caf67bbdf8cf4be4 subpackages: - pkg -- name: github.com/parnurzeal/gorequest - version: b64673b971a1742b8ba91f228f1c029632d4b686 -- name: github.com/pborman/uuid - version: a97ce2ca70fa5a848076093f05e639a89ca34d06 -- name: github.com/pkg/errors - version: 01fa4104b9c248c8945d14d9f128454d5b28d595 +- name: github.com/pmezard/go-difflib + version: d8ed2627bdf02c080bf22230dbb337003b7aba2d + subpackages: + - difflib - name: github.com/Sirupsen/logrus version: 4b6ea7319e214d98c938f12692336f7ca9348d6b -- name: golang.org/x/crypto - version: e0d166c33c321d0ff863f459a5882096e334f508 - subpackages: - - bcrypt - - blowfish -- name: golang.org/x/net - version: 075e191f18186a8ff2becaf64478e30f4545cdad +- name: github.com/stretchr/testify + version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 subpackages: - - context - - publicsuffix + - assert + - require - name: golang.org/x/oauth2 version: 04e1573abc896e70388bd387a69753c378d46466 subpackages: @@ -64,27 +77,3 @@ imports: - internal/remote_api - internal/urlfetch - urlfetch -testImports: -- name: github.com/davecgh/go-spew - version: 2df174808ee097f90d259e432cc04442cf60be21 - subpackages: - - spew -- name: github.com/elazarl/goproxy - version: 0a5b8bdb09049ae4ae68e75437ded0b7a2e324e3 -- name: github.com/onsi/ginkgo - version: 462326b1628e124b23f42e87a8f2750e3c4e2d24 -- name: github.com/onsi/gomega - version: a78ae492d53aad5a7a232d0d0462c14c400e3ee7 -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/stretchr/testify - version: f390dcf405f7b83c997eac1b06768bb9f44dec18 - subpackages: - - assert - - require -- name: gopkg.in/airbrake/gobrake.v2 - version: 31c8ff1fb8b79a6947e6565e9a6df535f98a6b94 -- name: gopkg.in/gemnasium/logrus-airbrake-hook.v2 - version: 31e6fd4bd5a98d8ee7673d24bc54ec73c31810dd diff --git a/glide.yaml b/glide.yaml index 3d85571f5..a426edbb5 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,50 +1,37 @@ package: github.com/ory-am/fosite import: -- package: github.com/Sirupsen/logrus - version: ~0.10.0 - package: github.com/asaskevich/govalidator - version: ~4.0.0 + version: ~5.0.0 - package: github.com/dgrijalva/jwt-go version: ~3.0.0 - package: github.com/golang/mock subpackages: - gomock -- package: github.com/parnurzeal/gorequest - version: ~0.2.13 - package: github.com/pborman/uuid version: ~1.0.0 - package: github.com/pkg/errors - version: ~0.7.0 + version: ~0.8.0 +- package: github.com/square/go-jose + version: ~1.1.0 + subpackages: + - json - package: golang.org/x/crypto subpackages: - bcrypt - package: golang.org/x/net subpackages: - context -- package: golang.org/x/oauth2 - subpackages: - - clientcredentials +testImport: - package: github.com/gorilla/mux version: ~1.1.0 -- package: github.com/gorilla/context - version: ~1.1.0 -- package: github.com/go-errors/errors -- package: github.com/oleiade/reflections - version: ~0.1.2 - package: github.com/ory-am/common -testImport: + subpackages: + - pkg - package: github.com/stretchr/testify - version: ~1.1.3 + version: ~1.1.4 subpackages: - assert - require -- package: gopkg.in/gemnasium/logrus-airbrake-hook.v2 - version: ^2.0.0 -- package: gopkg.in/airbrake/gobrake.v2 - version: ^2.0.6 -- package: github.com/onsi/ginkgo - version: ^1.2.0 -- package: github.com/elazarl/goproxy - version: ^1.0.0 -- package: github.com/onsi/gomega - version: ^1.0.0 +- package: golang.org/x/oauth2 + subpackages: + - clientcredentials