fix: fix merge issue.

al45tair · al45tair · commit 9e04fea30f35 · 2021-03-18T16:09:37.000Z
ClaimTokHash doesn't exist any more because that isn't how things work now.

Signed-off-by: Alastair Houghton &lt;alastair@alastairs-place.net&gt;
diff --git a/server/oauth2.go b/server/oauth2.go
@@ -342,7 +342,7 @@ func (s *Server) newIDToken(clientID string, claims storage.Claims, scopes []str
 			s.logger.Errorf("error computing c_hash: %v", err)
 			return "", expiry, fmt.Errorf("error computing c_hash: #{err}")
 		}
-		tok.CodeHash = cHash
+		tok[claimCodeHash] = cHash
 	}
 
 	for _, scope := range scopes {

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ func (s *Server) newIDToken(clientID string, claims storage.Claims, scopes []str`
`342`	`342`	`s.logger.Errorf("error computing c_hash: %v", err)`
`343`	`343`	`return "", expiry, fmt.Errorf("error computing c_hash: #{err}")`
`344`	`344`	`}`
`345`		`- tok.CodeHash = cHash`
	`345`	`+ tok[claimCodeHash] = cHash`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`for _, scope := range scopes {`