Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CXF-7264: NPE on OAuth RO/CC flows using JPA #242

Closed
wants to merge 1 commit into from
Closed

CXF-7264: NPE on OAuth RO/CC flows using JPA #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java
View file
Open in desktop
Expand Up @@ -263,12 +263,14 @@ public Void execute(EntityManager em) {
}
serverToken.setScopes(perms);

UserSubject sub = em.find(UserSubject.class, serverToken.getSubject().getLogin());
if (sub == null) {
em.persist(serverToken.getSubject());
} else {
sub = em.merge(serverToken.getSubject());
serverToken.setSubject(sub);
if (serverToken.getSubject() != null) {
UserSubject sub = em.find(UserSubject.class, serverToken.getSubject().getLogin());
if (sub == null) {
em.persist(serverToken.getSubject());
} else {
sub = serverToken.getSubject();
serverToken.setSubject(sub);
}
}
// ensure we have a managed association
// (needed for OpenJPA : InvalidStateException: Encountered unmanaged object)
Expand Down
21 changes: 21 additions & 0 deletions ...h2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
View file
Open in desktop
Expand Up @@ -176,6 +176,27 @@ public void testAddGetDeleteAccessToken2() {
assertEquals(0, tokens.size());
}

@Test
public void testAddGetDeleteAccessTokenWithNullSubject() {
Client c = addClient("102", "bob");

AccessTokenRegistration atr = new AccessTokenRegistration();
atr.setClient(c);
atr.setApprovedScope(Collections.singletonList("a"));
atr.setSubject(null);

getProvider().createAccessToken(atr);
List<ServerAccessToken> tokens = getProvider().getAccessTokens(c, null);
assertNotNull(tokens);
assertEquals(1, tokens.size());

getProvider().removeClient(c.getClientId());

tokens = getProvider().getAccessTokens(c, null);
assertNotNull(tokens);
assertEquals(0, tokens.size());
}

@Test
public void testAddGetDeleteRefreshToken() {
Client c = addClient("101", "bob");
Expand Down