github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clientId and authenticationHolderId now being set properly on tokens.

pull/650/head
arielak 2014-07-29 14:36:44 -04:00
parent 99c8e1c285
commit 7d66b15a0f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
View File

@ -533,8 +533,8 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} else if (name.equals(REFRESHTOKENS)) { } else if (name.equals(REFRESHTOKENS)) {
readRefreshTokens(reader); readRefreshTokens(reader);
} else if (name.equals(SYSTEMSCOPES)) { } else if (name.equals(SYSTEMSCOPES)) {
readSystemScopes(reader); //readSystemScopes(reader);
//reader.skipValue(); reader.skipValue();
} else { } else {
// unknown token, skip it // unknown token, skip it
reader.skipValue(); reader.skipValue();
@ -542,10 +542,11 @@ public class MITREidDataService_1_0 implements MITREidDataService {
break; break;
case END_OBJECT: case END_OBJECT:
// the object ended, we're done here // the object ended, we're done here
fixObjectReferences(); reader.endObject();
return; continue;
} }
} }
fixObjectReferences();
} }
private Map<Long, String> refreshTokenToClientRefs = new HashMap<Long, String>(); private Map<Long, String> refreshTokenToClientRefs = new HashMap<Long, String>();
@ -669,8 +670,12 @@ public class MITREidDataService_1_0 implements MITREidDataService {
Long newId = tokenRepository.saveAccessToken(token).getId(); Long newId = tokenRepository.saveAccessToken(token).getId();
accessTokenToClientRefs.put(currentId, clientId); accessTokenToClientRefs.put(currentId, clientId);
accessTokenToAuthHolderRefs.put(currentId, authHolderId); accessTokenToAuthHolderRefs.put(currentId, authHolderId);
accessTokenToRefreshTokenRefs.put(currentId, refreshTokenId); if(refreshTokenId != null) {
accessTokenToIdTokenRefs.put(currentId, idTokenId); accessTokenToRefreshTokenRefs.put(currentId, refreshTokenId);
}
if(idTokenId != null) {
accessTokenToIdTokenRefs.put(currentId, idTokenId);
}
accessTokenOldToNewIdMap.put(currentId, newId); accessTokenOldToNewIdMap.put(currentId, newId);
logger.debug("Read access token {}", currentId); logger.debug("Read access token {}", currentId);
} catch (ParseException ex) { } catch (ParseException ex) {