fix: Merge request ID as well (#398)

Closes #386
ory · Mar 2, 2020 · 67c081c · 67c081c
1 parent 387cade
commit 67c081c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/request.go b/request.go
@@ -165,6 +165,7 @@ func (a *Request) Merge(request Requester) {
 		a.GrantAudience(aud)
 	}
 
+	a.ID = request.GetID()
 	a.RequestedAt = request.GetRequestedAt()
 	a.Client = request.GetClient()
 	a.Session = request.GetSession()

diff --git a/request_test.go b/request_test.go
@@ -53,6 +53,7 @@ func TestRequest(t *testing.T) {
 
 func TestMergeRequest(t *testing.T) {
 	a := &Request{
+		ID:                "123",
 		RequestedAt:       time.Now().UTC(),
 		Client:            &DefaultClient{ID: "123"},
 		RequestedScope:    Arguments{"scope-3", "scope-4"},
@@ -80,6 +81,7 @@ func TestMergeRequest(t *testing.T) {
 	assert.EqualValues(t, a.GrantedAudience, b.GrantedAudience)
 	assert.EqualValues(t, a.Form, b.Form)
 	assert.EqualValues(t, a.Session, b.Session)
+	assert.EqualValues(t, a.ID, b.ID)
 }
 
 func TestSanitizeRequest(t *testing.T) {