root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve JdbcOAuth2AuthorizedClientService saveAuthorizedClient 

Closes gh-16726

Signed-off-by: Max Batischev <mblancer@mail.ru>
This commit is contained in:
Max Batischev 2025-03-12 13:23:56 +03:00 committed by Josh Cummings
parent cd9d6ce5c9
commit 6c24a1e717
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/JdbcOAuth2AuthorizedClientService.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,7 +30,6 @@ import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
import org.springframework.dao.DataRetrievalFailureException; import org.springframework.dao.DataRetrievalFailureException;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.jdbc.core.ArgumentPreparedStatementSetter; import org.springframework.jdbc.core.ArgumentPreparedStatementSetter;
import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.PreparedStatementSetter; import org.springframework.jdbc.core.PreparedStatementSetter;
@ -166,22 +165,13 @@ public class JdbcOAuth2AuthorizedClientService implements OAuth2AuthorizedClient
public void saveAuthorizedClient(OAuth2AuthorizedClient authorizedClient, Authentication principal) { public void saveAuthorizedClient(OAuth2AuthorizedClient authorizedClient, Authentication principal) {
Assert.notNull(authorizedClient, "authorizedClient cannot be null"); Assert.notNull(authorizedClient, "authorizedClient cannot be null");
Assert.notNull(principal, "principal cannot be null"); Assert.notNull(principal, "principal cannot be null");
boolean existsAuthorizedClient = null != this int rows = updateAuthorizedClient(authorizedClient, principal);
.loadAuthorizedClient(authorizedClient.getClientRegistration().getRegistrationId(), principal.getName()); if (rows == 0) {
if (existsAuthorizedClient) {
updateAuthorizedClient(authorizedClient, principal);
}
else {
try {
insertAuthorizedClient(authorizedClient, principal); insertAuthorizedClient(authorizedClient, principal);
} }
catch (DuplicateKeyException ex) {
updateAuthorizedClient(authorizedClient, principal);
}
}
} }
private void updateAuthorizedClient(OAuth2AuthorizedClient authorizedClient, Authentication principal) { private int updateAuthorizedClient(OAuth2AuthorizedClient authorizedClient, Authentication principal) {
List<SqlParameterValue> parameters = this.authorizedClientParametersMapper List<SqlParameterValue> parameters = this.authorizedClientParametersMapper
.apply(new OAuth2AuthorizedClientHolder(authorizedClient, principal)); .apply(new OAuth2AuthorizedClientHolder(authorizedClient, principal));
SqlParameterValue clientRegistrationIdParameter = parameters.remove(0); SqlParameterValue clientRegistrationIdParameter = parameters.remove(0);
@ -191,7 +181,7 @@ public class JdbcOAuth2AuthorizedClientService implements OAuth2AuthorizedClient
try (LobCreator lobCreator = this.lobHandler.getLobCreator()) { try (LobCreator lobCreator = this.lobHandler.getLobCreator()) {
PreparedStatementSetter pss = new LobCreatorArgumentPreparedStatementSetter(lobCreator, PreparedStatementSetter pss = new LobCreatorArgumentPreparedStatementSetter(lobCreator,
parameters.toArray()); parameters.toArray());
this.jdbcOperations.update(UPDATE_AUTHORIZED_CLIENT_SQL, pss); return this.jdbcOperations.update(UPDATE_AUTHORIZED_CLIENT_SQL, pss);
} }
} }

3
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/JdbcOAuth2AuthorizedClientServiceTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -306,7 +306,6 @@ public class JdbcOAuth2AuthorizedClientServiceTests {
this.authorizedClientService.loadAuthorizedClient(this.clientRegistration.getRegistrationId(), this.authorizedClientService.loadAuthorizedClient(this.clientRegistration.getRegistrationId(),
principal.getName()); principal.getName());
verify(authorizedClientRowMapper).mapRow(any(), anyInt()); verify(authorizedClientRowMapper).mapRow(any(), anyInt());
verify(authorizedClientParametersMapper).apply(any());
} }
@Test @Test