Skip to content

Polish JdbcOneTimeTokenService #15997

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

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Polish JdbcOneTimeTokenService #15997

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...rc/main/java/org/springframework/security/authentication/ott/JdbcOneTimeTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public final class JdbcOneTimeTokenService implements OneTimeTokenService, Dispo
// @formatter:on

// @formatter:off
private static final String SAVE_AUTHORIZED_CLIENT_SQL = "INSERT INTO " + TABLE_NAME
private static final String SAVE_ONE_TIME_TOKEN_SQL = "INSERT INTO " + TABLE_NAME
+ " (" + COLUMN_NAMES + ") VALUES (?, ?, ?)";
// @formatter:on

Expand All @@ -97,7 +97,7 @@ public final class JdbcOneTimeTokenService implements OneTimeTokenService, Dispo
// @formatter:on

// @formatter:off
private static final String DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY = "DELETE FROM "
private static final String DELETE_ONE_TIME_TOKENS_BY_EXPIRY_TIME_QUERY = "DELETE FROM "
+ TABLE_NAME
+ " WHERE expires_at < ?";
// @formatter:on
Expand All @@ -113,7 +113,7 @@ public JdbcOneTimeTokenService(JdbcOperations jdbcOperations) {
}

/**
* Sets the chron expression used for cleaning up expired sessions. The default is to
* Sets the chron expression used for cleaning up expired tokens. The default is to
* run hourly.
*
* For more advanced use cases the cleanupCron may be set to null which will disable
Expand Down Expand Up @@ -141,7 +141,7 @@ public OneTimeToken generate(GenerateOneTimeTokenRequest request) {
private void insertOneTimeToken(OneTimeToken oneTimeToken) {
List<SqlParameterValue> parameters = this.oneTimeTokenParametersMapper.apply(oneTimeToken);
PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters.toArray());
this.jdbcOperations.update(SAVE_AUTHORIZED_CLIENT_SQL, pss);
this.jdbcOperations.update(SAVE_ONE_TIME_TOKEN_SQL, pss);
}

@Override
Expand Down Expand Up @@ -192,7 +192,7 @@ private ThreadPoolTaskScheduler createTaskScheduler(String cleanupCron) {
public void cleanupExpiredTokens() {
List<SqlParameterValue> parameters = List.of(new SqlParameterValue(Types.TIMESTAMP, Instant.now()));
PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters.toArray());
int deletedCount = this.jdbcOperations.update(DELETE_SESSIONS_BY_EXPIRY_TIME_QUERY, pss);
int deletedCount = this.jdbcOperations.update(DELETE_ONE_TIME_TOKENS_BY_EXPIRY_TIME_QUERY, pss);
if (this.logger.isDebugEnabled()) {
this.logger.debug("Cleaned up " + deletedCount + " expired tokens");
}
Expand Down