Skip to content

Commit 51b580a

Browse files
author
Sauli Ketola
committed
Use 'userName' instead of 'sub' in naming
1 parent 3f27704 commit 51b580a

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

‎openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
@NamedQuery(name = OAuth2AccessTokenEntity.QUERY_BY_TOKEN_VALUE, query = "select a from OAuth2AccessTokenEntity a where a.jwt = :" + OAuth2AccessTokenEntity.PARAM_TOKEN_VALUE),
7373
@NamedQuery(name = OAuth2AccessTokenEntity.QUERY_BY_APPROVED_SITE, query = "select a from OAuth2AccessTokenEntity a where a.approvedSite = :" + OAuth2AccessTokenEntity.PARAM_APPROVED_SITE),
7474
@NamedQuery(name = OAuth2AccessTokenEntity.QUERY_BY_RESOURCE_SET, query = "select a from OAuth2AccessTokenEntity a join a.permissions p where p.resourceSet.id = :" + OAuth2AccessTokenEntity.PARAM_RESOURCE_SET_ID),
75-
@NamedQuery(name = OAuth2AccessTokenEntity.QUERY_BY_SUB, query = "select r from OAuth2AccessTokenEntity r where r.authenticationHolder.userAuth.name = :" + OAuth2AccessTokenEntity.PARAM_SUB)
75+
@NamedQuery(name = OAuth2AccessTokenEntity.QUERY_BY_NAME, query = "select r from OAuth2AccessTokenEntity r where r.authenticationHolder.userAuth.name = :" + OAuth2AccessTokenEntity.PARAM_NAME)
7676
})
7777
@org.codehaus.jackson.map.annotate.JsonSerialize(using = OAuth2AccessTokenJackson1Serializer.class)
7878
@org.codehaus.jackson.map.annotate.JsonDeserialize(using = OAuth2AccessTokenJackson1Deserializer.class)
@@ -87,15 +87,15 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
8787
public static final String QUERY_EXPIRED_BY_DATE = "OAuth2AccessTokenEntity.getAllExpiredByDate";
8888
public static final String QUERY_ALL = "OAuth2AccessTokenEntity.getAll";
8989
public static final String QUERY_BY_RESOURCE_SET = "OAuth2AccessTokenEntity.getByResourceSet";
90-
public static final String QUERY_BY_SUB = "OAuth2AccessTokenEntity.getBySub";
90+
public static final String QUERY_BY_NAME = "OAuth2AccessTokenEntity.getByName";
9191

9292
public static final String PARAM_TOKEN_VALUE = "tokenValue";
9393
public static final String PARAM_CLIENT = "client";
9494
public static final String PARAM_REFERSH_TOKEN = "refreshToken";
9595
public static final String PARAM_DATE = "date";
9696
public static final String PARAM_RESOURCE_SET_ID = "rsid";
9797
public static final String PARAM_APPROVED_SITE = "approvedSite";
98-
public static final String PARAM_SUB = "sub";
98+
public static final String PARAM_NAME = "name";
9999

100100
public static final String ID_TOKEN_FIELD_NAME = "id_token";
101101

‎openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@
5454
@NamedQuery(name = OAuth2RefreshTokenEntity.QUERY_EXPIRED_BY_DATE, query = "select r from OAuth2RefreshTokenEntity r where r.expiration <= :" + OAuth2RefreshTokenEntity.PARAM_DATE),
5555
@NamedQuery(name = OAuth2RefreshTokenEntity.QUERY_BY_CLIENT, query = "select r from OAuth2RefreshTokenEntity r where r.client = :" + OAuth2RefreshTokenEntity.PARAM_CLIENT),
5656
@NamedQuery(name = OAuth2RefreshTokenEntity.QUERY_BY_TOKEN_VALUE, query = "select r from OAuth2RefreshTokenEntity r where r.jwt = :" + OAuth2RefreshTokenEntity.PARAM_TOKEN_VALUE),
57-
@NamedQuery(name = OAuth2RefreshTokenEntity.QUERY_BY_SUB, query = "select r from OAuth2RefreshTokenEntity r where r.authenticationHolder.userAuth.name = :" + OAuth2RefreshTokenEntity.PARAM_SUB)
57+
@NamedQuery(name = OAuth2RefreshTokenEntity.QUERY_BY_NAME, query = "select r from OAuth2RefreshTokenEntity r where r.authenticationHolder.userAuth.name = :" + OAuth2RefreshTokenEntity.PARAM_NAME)
5858
})
5959
public class OAuth2RefreshTokenEntity implements OAuth2RefreshToken {
6060

6161
public static final String QUERY_BY_TOKEN_VALUE = "OAuth2RefreshTokenEntity.getByTokenValue";
6262
public static final String QUERY_BY_CLIENT = "OAuth2RefreshTokenEntity.getByClient";
6363
public static final String QUERY_EXPIRED_BY_DATE = "OAuth2RefreshTokenEntity.getAllExpiredByDate";
6464
public static final String QUERY_ALL = "OAuth2RefreshTokenEntity.getAll";
65-
public static final String QUERY_BY_SUB = "OAuth2RefreshTokenEntity.getBySub";
65+
public static final String QUERY_BY_NAME = "OAuth2RefreshTokenEntity.getByName";
6666

6767
public static final String PARAM_TOKEN_VALUE = "tokenValue";
6868
public static final String PARAM_CLIENT = "client";
6969
public static final String PARAM_DATE = "date";
70-
public static final String PARAM_SUB = "sub";
70+
public static final String PARAM_NAME = "name";
7171

7272
private Long id;
7373

‎openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public interface OAuth2TokenRepository {
5353

5454
public List<OAuth2RefreshTokenEntity> getRefreshTokensForClient(ClientDetailsEntity client);
5555

56-
public Set<OAuth2AccessTokenEntity> getAccessTokensBySub(String sub);
56+
public Set<OAuth2AccessTokenEntity> getAccessTokensByUserName(String name);
5757

58-
public Set<OAuth2RefreshTokenEntity> getRefreshTokensBySub(String sub);
58+
public Set<OAuth2RefreshTokenEntity> getRefreshTokensByUserName(String name);
5959

6060
public Set<OAuth2AccessTokenEntity> getAllAccessTokens();
6161

‎openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,17 @@ public List<OAuth2RefreshTokenEntity> getRefreshTokensForClient(ClientDetailsEnt
186186
}
187187

188188
@Override
189-
public Set<OAuth2AccessTokenEntity> getAccessTokensBySub(String sub) {
190-
TypedQuery<OAuth2AccessTokenEntity> query = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_BY_SUB, OAuth2AccessTokenEntity.class);
191-
query.setParameter(OAuth2AccessTokenEntity.PARAM_SUB, sub);
189+
public Set<OAuth2AccessTokenEntity> getAccessTokensByUserName(String name) {
190+
TypedQuery<OAuth2AccessTokenEntity> query = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_BY_NAME, OAuth2AccessTokenEntity.class);
191+
query.setParameter(OAuth2AccessTokenEntity.PARAM_NAME, name);
192192
List<OAuth2AccessTokenEntity> results = query.getResultList();
193193
return results != null ? new HashSet<>(query.getResultList()) : new HashSet<>();
194194
}
195195

196196
@Override
197-
public Set<OAuth2RefreshTokenEntity> getRefreshTokensBySub(String sub) {
198-
TypedQuery<OAuth2RefreshTokenEntity> query = manager.createNamedQuery(OAuth2RefreshTokenEntity.QUERY_BY_SUB, OAuth2RefreshTokenEntity.class);
199-
query.setParameter(OAuth2RefreshTokenEntity.PARAM_SUB, sub);
197+
public Set<OAuth2RefreshTokenEntity> getRefreshTokensByUserName(String name) {
198+
TypedQuery<OAuth2RefreshTokenEntity> query = manager.createNamedQuery(OAuth2RefreshTokenEntity.QUERY_BY_NAME, OAuth2RefreshTokenEntity.class);
199+
query.setParameter(OAuth2RefreshTokenEntity.PARAM_NAME, name);
200200
List<OAuth2RefreshTokenEntity> results = query.getResultList();
201201
return results != null ? new HashSet<>(query.getResultList()) : new HashSet<>();
202202
}

‎openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
102102
private ApprovedSiteService approvedSiteService;
103103

104104
@Override
105-
public Set<OAuth2AccessTokenEntity> getAllAccessTokensForUser(String sub) {
106-
return tokenRepository.getAccessTokensBySub(sub);
105+
public Set<OAuth2AccessTokenEntity> getAllAccessTokensForUser(String userName) {
106+
return tokenRepository.getAccessTokensByUserName(userName);
107107
}
108108

109109
@Override
110-
public Set<OAuth2RefreshTokenEntity> getAllRefreshTokensForUser(String sub) {
111-
return tokenRepository.getRefreshTokensBySub(sub);
110+
public Set<OAuth2RefreshTokenEntity> getAllRefreshTokensForUser(String userName) {
111+
return tokenRepository.getRefreshTokensByUserName(userName);
112112
}
113113

114114
@Override

‎openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.HashSet;
2222
import java.util.Set;
2323

24-
import org.junit.Assert;
2524
import org.junit.Before;
2625
import org.junit.Test;
2726
import org.junit.runner.RunWith;
@@ -63,7 +62,6 @@
6362
import static org.mockito.Mockito.never;
6463
import static org.mockito.Mockito.when;
6564
import static org.junit.Assert.assertEquals;
66-
import static org.junit.Assert.assertFalse;
6765
import static org.junit.Assert.assertThat;
6866
import static org.junit.Assert.assertTrue;
6967
import static org.junit.Assert.fail;
@@ -88,7 +86,7 @@ public class TestDefaultOAuth2ProviderTokenService {
8886
private OAuth2RefreshTokenEntity refreshToken;
8987
private OAuth2AccessTokenEntity accessToken;
9088
private String refreshTokenValue = "refresh_token_value";
91-
private String userSub = "6a50ac11786d402a9591d3e592ac770f";
89+
private String userName = "6a50ac11786d402a9591d3e592ac770f";
9290
private TokenRequest tokenRequest;
9391

9492
// for use when refreshing access tokens
@@ -552,18 +550,18 @@ public void refreshAccessToken_expiration() {
552550

553551
@Test
554552
public void getAllAccessTokensForUser(){
555-
Mockito.when(tokenRepository.getAccessTokensBySub(userSub)).thenReturn(newHashSet(accessToken));
553+
Mockito.when(tokenRepository.getAccessTokensByUserName(userName)).thenReturn(newHashSet(accessToken));
556554

557-
Set<OAuth2AccessTokenEntity> tokens = service.getAllAccessTokensForUser(userSub);
555+
Set<OAuth2AccessTokenEntity> tokens = service.getAllAccessTokensForUser(userName);
558556
assertEquals(1, tokens.size());
559557
assertTrue(tokens.contains(accessToken));
560558
}
561559

562560
@Test
563561
public void getAllRefreshTokensForUser(){
564-
Mockito.when(tokenRepository.getRefreshTokensBySub(userSub)).thenReturn(newHashSet(refreshToken));
562+
Mockito.when(tokenRepository.getRefreshTokensByUserName(userName)).thenReturn(newHashSet(refreshToken));
565563

566-
Set<OAuth2RefreshTokenEntity> tokens = service.getAllRefreshTokensForUser(userSub);
564+
Set<OAuth2RefreshTokenEntity> tokens = service.getAllRefreshTokensForUser(userName);
567565
assertEquals(1, tokens.size());
568566
assertTrue(tokens.contains(refreshToken));
569567
}

0 commit comments

Comments
 (0)