Merge pull request #1 from kolotaev/IDM-197

 IDM-197 Implement JWT bearer token flow in Hydra

README.md

@@ -265,6 +265,16 @@ Then run it with in-memory database:
 DATABASE_URL=memory go run main.go host
 ```
 
+If you want to add mocks for the interfaces you are being testing, refer to [generator script](generate-mocks.sh).
+* Add needed mocks generation to this script.
+* Then run
+```bash
+go get github.com/golang/mock/gomock # if you don't have it
+go get github.com/golang/mock/mockgen # if you don't have it
+go get golang.org/x/tools/cmd/goimports # if you don't have it
+./generate-mocks.sh
+```
+
 **Notes**
 
 * We changed organization name from `ory-am` to `ory`. In order to keep backwards compatibility, we did not rename Go packages.

cmd/server/handler_oauth2_factory.go

@@ -56,7 +56,11 @@ func injectFositeStore(c *config.Config, clients client.Manager) {
 
 func newOAuth2Provider(c *config.Config, km jwk.Manager) fosite.OAuth2Provider {
 	var ctx = c.Context()
-	var store = ctx.FositeStore
+	var store = oauth2.CommonStore{
+		FositeStorer: ctx.FositeStore,
+		KeyManager:   km,
+		ClusterURL:   c.ClusterURL,
+	}
 
 	createRS256KeysIfNotExist(c, oauth2.OpenIDConnectKeyName, "private", "sig")
 	keys, err := km.GetKey(oauth2.OpenIDConnectKeyName, "private")
@@ -80,6 +84,7 @@ func newOAuth2Provider(c *config.Config, km jwk.Manager) fosite.OAuth2Provider {
 		IDTokenLifespan:       c.GetIDTokenLifespan(),
 		HashCost:              c.BCryptWorkFactor,
 	}
+
 	return compose.Compose(
 		fc,
 		store,
@@ -91,6 +96,7 @@ func newOAuth2Provider(c *config.Config, km jwk.Manager) fosite.OAuth2Provider {
 		compose.OAuth2AuthorizeExplicitFactory,
 		compose.OAuth2AuthorizeImplicitFactory,
 		compose.OAuth2ClientCredentialsGrantFactory,
+		oauth2.JWTBearerGrantFactory,
 		compose.OAuth2RefreshTokenGrantFactory,
 		compose.OpenIDConnectExplicitFactory,
 		compose.OpenIDConnectHybridFactory,

generate-mocks.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+PROJECT_ROOT=github.com/ory/hydra
+MOCKS_DIR=internal/mocks
+
+mockgen -package internal -destination $MOCKS_DIR/fosite_access_token_strategy.go github.com/ory/fosite/handler/oauth2 AccessTokenStrategy
+mockgen -package internal -destination $MOCKS_DIR/fosite_access_token_storage.go github.com/ory/fosite/handler/oauth2 AccessTokenStorage
+mockgen -package internal -destination $MOCKS_DIR/fosite_access_request.go github.com/ory/fosite AccessRequester
+mockgen -package internal -destination $MOCKS_DIR/fosite_client.go github.com/ory/fosite Client
+mockgen -package internal -destination $MOCKS_DIR/hydra_key_manager.go github.com/ory/hydra/jwk Manager
+
+# See https://github.com/golang/mock/issues/30
+find $MOCKS_DIR -type f -exec sed -i.bak "s,$PROJECT_ROOT/vendor/,,g" {} \;
+rm -rf $MOCKS_DIR/*.bak
+
+goimports -w $MOCKS_DIR/

glide.yaml

@@ -67,6 +67,10 @@ import:
   - clientcredentials
 - package: gopkg.in/yaml.v2
 - package: github.com/mohae/deepcopy
+- package: github.com/golang/mock
+  version: ^1.0.0
+  subpackages:
+  - gomock
 testImport:
 - package: github.com/bmizerany/assert
 - package: github.com/ory/dockertest