Merge branch 'master' into fix-371

ory · Jun 5, 2017 · 4eee0b0 · 4eee0b0
2 parents ee1c5ac + a9f500b
commit 4eee0b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/oauth2/handler.go b/oauth2/handler.go
@@ -226,6 +226,7 @@ func (h *Handler) IntrospectHandler(w http.ResponseWriter, r *http.Request, _ ht
 		Username:  resp.GetAccessRequester().GetSession().GetUsername(),
 		Extra:     resp.GetAccessRequester().GetSession().(*Session).Extra,
 		Audience:  resp.GetAccessRequester().GetClient().GetID(),
+		Issuer:    h.Issuer,
 	})
 	if err != nil {
 		pkg.LogError(err, h.L)

diff --git a/oauth2/introspector_test.go b/oauth2/introspector_test.go
@@ -47,6 +47,7 @@ func init() {
 			compose.OAuth2TokenIntrospectionFactory,
 		),
 		H: herodot.NewJSONWriter(nil),
+		Issuer: "foobariss",
 	}
 	serv.SetRoutes(r)
 	ts = httptest.NewServer(r)
@@ -125,6 +126,7 @@ func TestIntrospect(t *testing.T) {
 					//assert.Equal(t, "tests", c.Issuer)
 					assert.Equal(t, now.Add(time.Hour).Unix(), c.ExpiresAt, "expires at")
 					assert.Equal(t, now.Unix(), c.IssuedAt, "issued at")
+					assert.Equal(t, "foobariss", c.Issuer, "issuer")
 					assert.Equal(t, map[string]interface{}{"foo": "bar"}, c.Extra)
 				},
 			},