From 63cf621f2fd86097ed09eef80423fabc64c963da Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
Date: Wed, 7 Aug 2013 10:59:55 -0400
Subject: [PATCH] Had to hand-merge some things; git got confused
Conflicts:
openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
---
.../org/mitre/openid/connect/token/ConnectTokenEnhancer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
index 9c97d5f90..19e702817 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
@@ -26,7 +26,6 @@ import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.oauth2.model.OAuth2AccessTokenEntity;
import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean;
-import org.mitre.openid.connect.service.ApprovedSiteService;
import org.mitre.openid.connect.util.JWSUtils;
import org.mitre.openid.connect.web.AuthenticationTimeStamper;
import org.slf4j.Logger;
@@ -148,7 +147,7 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
Set<String> responseTypes = OAuth2Utils.parseParameterList(responseType);
if (responseTypes.contains("token")) {
// calculate the token hash
- Base64URL at_hash = JWSUtils.getAccessTokenHash(signingAlg, token.getJwt().serialize().getBytes());
+ Base64URL at_hash = JWSUtils.getAccessTokenHash(signingAlg, token);
//TODO: What should happen if the hash cannot be calculated?
idClaims.setClaim("at_hash", at_hash);
}