From a9f500b75a3acd6ef00f1dda97d06ce78ab38187 Mon Sep 17 00:00:00 2001
From: "Aeneas Rekkas (arekkas)" <aeneas@ory.am>
Date: Mon, 5 Jun 2017 11:13:54 +0200
Subject: [PATCH] oauth2/introspect: send issuer in introspection

Closes #399
---
 oauth2/handler.go           | 1 +
 oauth2/introspector_test.go | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/oauth2/handler.go b/oauth2/handler.go
index df7007bee4..de200d90a6 100644
--- 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
index dbb150d540..9287b835ea 100644
--- 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)
 				},
 			},