dont client id for aud

Signed-off-by: Christopher Brown <ccbrown112@gmail.com>
ory · Jan 22, 2017 · 8e4543b · 8e4543b
1 parent 6ada567
commit 8e4543b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/handler/oauth2/introspector_jwt_test.go b/handler/oauth2/introspector_jwt_test.go
@@ -96,7 +96,6 @@ func TestIntrospectJWT(t *testing.T) {
 		assert.True(t, errors.Cause(err) == c.expectErr, "(%d) %s\n%s\n%s", k, c.description, err, c.expectErr)
 
 		if err == nil {
-			assert.Equal(t, "group0", areq.GetClient().GetID())
 			assert.Equal(t, "peter", areq.Session.GetSubject())
 		}
 

diff --git a/handler/oauth2/strategy_jwt.go b/handler/oauth2/strategy_jwt.go
@@ -48,9 +48,7 @@ func (h *RS256JWTStrategy) ValidateJWT(tokenType fosite.TokenType, token string)
 	claims.FromMapClaims(t.Claims.(jwtx.MapClaims))
 
 	requester = &fosite.Request{
-		Client: &fosite.DefaultClient{
-			ID: claims.Audience,
-		},
+		Client:      &fosite.DefaultClient{},
 		RequestedAt: claims.IssuedAt,
 		Session: &JWTSession{
 			JWTClaims: &claims,
@@ -155,10 +153,6 @@ func (h *RS256JWTStrategy) generate(tokenType fosite.TokenType, requester fosite
 			claims.Issuer = h.Issuer
 		}
 
-		if claims.Audience == "" {
-			claims.Audience = requester.GetClient().GetID()
-		}
-
 		claims.Scope = requester.GetGrantedScopes()
 
 		return h.RS256JWTStrategy.Generate(claims.ToMapClaims(), jwtSession.GetJWTHeader())

diff --git a/handler/oauth2/strategy_jwt_test.go b/handler/oauth2/strategy_jwt_test.go
@@ -23,7 +23,6 @@ var j = &RS256JWTStrategy{
 var jwtValidCase = func(tokenType fosite.TokenType) *fosite.Request {
 	return &fosite.Request{
 		Client: &fosite.DefaultClient{
-			ID:     "group0",
 			Secret: []byte("foobarfoobarfoobarfoobar"),
 		},
 		Session: &JWTSession{
@@ -51,7 +50,6 @@ var jwtValidCase = func(tokenType fosite.TokenType) *fosite.Request {
 var jwtExpiredCase = func(tokenType fosite.TokenType) *fosite.Request {
 	return &fosite.Request{
 		Client: &fosite.DefaultClient{
-			ID:     "group0",
 			Secret: []byte("foobarfoobarfoobarfoobar"),
 		},
 		Session: &JWTSession{

diff --git a/integration/introspect_token_test.go b/integration/introspect_token_test.go
@@ -110,7 +110,6 @@ func runIntrospectTokenTest(t *testing.T, strategy oauth2.AccessTokenStrategy, i
 		assert.Len(t, errs, 0)
 		assert.Equal(t, c.isActive, res.Active)
 		if c.isActive {
-			assert.Equal(t, "my-client", res.ClientId)
 			assert.Equal(t, "fosite", res.Scope)
 			assert.True(t, res.ExpiresAt > 0)
 			assert.True(t, res.IssuedAt > 0)