Skip to content

fix(persistence): replace in-memory stores with JDBC-backed repositories #4

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
stupidly-logical merged 2 commits into from
Apr 4, 2026
Merged

fix(persistence): replace in-memory stores with JDBC-backed repositories #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b5d7a
fix(persistence): replace in-memory stores with JDBC-backed repositories
stupidly-logical Apr 3, 2026
207399f
fix: move JDBC seeding to ApplicationRunner to avoid schema-not-ready…
stupidly-logical Apr 4, 2026
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
21 changes: 18 additions & 3 deletions src/main/java/com/example/config/AuthorizationServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.server.authorization.JdbcOAuth2AuthorizationConsentService;
import org.springframework.security.oauth2.server.authorization.JdbcOAuth2AuthorizationService;
import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationConsentService;
import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer;
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
Expand Down Expand Up @@ -56,6 +62,18 @@ public SecurityFilterChain authServerSecurityFilterChain(HttpSecurity http) thro
return http.build();
}

@Bean
public OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,
RegisteredClientRepository registeredClientRepository) {
return new JdbcOAuth2AuthorizationService(jdbcOperations, registeredClientRepository);
}

@Bean
public OAuth2AuthorizationConsentService authorizationConsentService(JdbcOperations jdbcOperations,
RegisteredClientRepository registeredClientRepository) {
return new JdbcOAuth2AuthorizationConsentService(jdbcOperations, registeredClientRepository);
}

@Bean
public JWKSource<SecurityContext> jwkSource() {
KeyPair keyPair = loadOrGenerateRsaKey();
Expand All @@ -78,19 +96,16 @@ public JwtDecoder jwtDecoder(JWKSource<SecurityContext> jwkSource) {
public OAuth2TokenCustomizer<JwtEncodingContext> jwtCustomizer() {
return context -> {
if (context.getTokenType().getValue().equals("access_token")) {
// Add custom claims to JWT
context.getClaims().claim("iss_custom", "OAuth2 Authorization Server");
context.getClaims().claim("server_version", "1.0.0");

// Add user authorities/roles to JWT if available
if (context.getPrincipal() != null && context.getPrincipal().getAuthorities() != null) {
context.getClaims().claim("authorities",
context.getPrincipal().getAuthorities().stream()
.map(authority -> authority.getAuthority())
.toList());
}

// Add client information
if (context.getRegisteredClient() != null) {
context.getClaims().claim("client_name", context.getRegisteredClient().getClientId());
}
Expand Down
41 changes: 26 additions & 15 deletions src/main/java/com/example/config/DefaultSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
package com.example.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.provisioning.JdbcUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -80,19 +81,29 @@ public CorsConfigurationSource corsConfigurationSource() {
}

@Bean
public UserDetailsService userDetailsService(PasswordEncoder passwordEncoder) {
UserDetails user = User.builder()
.username("user")
.password(passwordEncoder.encode("password"))
.roles("USER")
.build();

UserDetails admin = User.builder()
.username("admin")
.password(passwordEncoder.encode("admin"))
.roles("USER", "ADMIN")
.build();
public UserDetailsService userDetailsService(DataSource dataSource) {
return new JdbcUserDetailsManager(dataSource);
}

return new InMemoryUserDetailsManager(user, admin);
// Seeding runs via ApplicationRunner — after spring.sql.init schemas are applied
@Bean
public ApplicationRunner seedUsers(UserDetailsService userDetailsService, PasswordEncoder passwordEncoder) {
return args -> {
JdbcUserDetailsManager manager = (JdbcUserDetailsManager) userDetailsService;
if (!manager.userExists("user")) {
manager.createUser(User.builder()
.username("user")
.password(passwordEncoder.encode("password"))
.roles("USER")
.build());
}
if (!manager.userExists("admin")) {
manager.createUser(User.builder()
.username("admin")
.password(passwordEncoder.encode("admin"))
.roles("USER", "ADMIN")
.build());
}
};
}
}
76 changes: 45 additions & 31 deletions src/main/java/com/example/config/RegisteredClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.example.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
import org.springframework.security.oauth2.core.oidc.OidcScopes;
import org.springframework.security.oauth2.server.authorization.client.InMemoryRegisteredClientRepository;
import org.springframework.security.oauth2.server.authorization.client.JdbcRegisteredClientRepository;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
import org.springframework.security.oauth2.server.authorization.settings.ClientSettings;
Expand All @@ -26,35 +28,47 @@ public class RegisteredClientConfig {
private String extraRedirectUri;

@Bean
public RegisteredClientRepository registeredClientRepository(PasswordEncoder passwordEncoder) {
RegisteredClient.Builder builder = RegisteredClient.withId(UUID.randomUUID().toString())
.clientId("test-client")
.clientSecret(passwordEncoder.encode(clientSecret))
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_POST)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN)
.authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
.redirectUri("http://localhost:9000/login/oauth2/code/test-client")
.redirectUri("http://localhost:9000/authorized")
.scope(OidcScopes.OPENID)
.scope(OidcScopes.PROFILE)
.scope("read")
.scope("write")
.clientSettings(ClientSettings.builder()
.requireAuthorizationConsent(true)
.requireProofKey(true)
.build())
.tokenSettings(TokenSettings.builder()
.accessTokenTimeToLive(Duration.ofHours(1))
.refreshTokenTimeToLive(Duration.ofDays(30))
.reuseRefreshTokens(false)
.build());

if (extraRedirectUri != null && !extraRedirectUri.isBlank()) {
builder.redirectUri(extraRedirectUri);
}

return new InMemoryRegisteredClientRepository(builder.build());
public RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
return new JdbcRegisteredClientRepository(jdbcOperations);
}

// Seeding runs via ApplicationRunner — after spring.sql.init schemas are applied
@Bean
public ApplicationRunner seedClients(RegisteredClientRepository registeredClientRepository,
PasswordEncoder passwordEncoder) {
return args -> {
JdbcRegisteredClientRepository repository = (JdbcRegisteredClientRepository) registeredClientRepository;
if (repository.findByClientId("test-client") == null) {
RegisteredClient.Builder builder = RegisteredClient.withId(UUID.randomUUID().toString())
.clientId("test-client")
.clientSecret(passwordEncoder.encode(clientSecret))
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_POST)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN)
.authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
.redirectUri("http://localhost:9000/login/oauth2/code/test-client")
.redirectUri("http://localhost:9000/authorized")
.scope(OidcScopes.OPENID)
.scope(OidcScopes.PROFILE)
.scope("read")
.scope("write")
.clientSettings(ClientSettings.builder()
.requireAuthorizationConsent(true)
.requireProofKey(true)
.build())
.tokenSettings(TokenSettings.builder()
.accessTokenTimeToLive(Duration.ofHours(1))
.refreshTokenTimeToLive(Duration.ofDays(30))
.reuseRefreshTokens(false)
.build());

if (extraRedirectUri != null && !extraRedirectUri.isBlank()) {
builder.redirectUri(extraRedirectUri);
}

repository.save(builder.build());
}
};
}
}
9 changes: 9 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ spring.h2.console.settings.web-allow-others=${H2_CONSOLE_WEB_ALLOW_OTHERS:false}
# JPA/Hibernate Configuration
# =============================================================================

# Initialize Spring Security JDBC schemas before Hibernate processes entities
spring.jpa.defer-datasource-initialization=true
spring.sql.init.mode=always
spring.sql.init.schema-locations=\
classpath:org/springframework/security/core/userdetails/jdbc/users.ddl,\
classpath:org/springframework/security/oauth2/server/authorization/client/oauth2-registered-client-schema.sql,\
classpath:org/springframework/security/oauth2/server/authorization/oauth2-authorization-schema.sql,\
classpath:org/springframework/security/oauth2/server/authorization/oauth2-authorization-consent-schema.sql

spring.jpa.show-sql=${JPA_SHOW_SQL:false}
spring.jpa.hibernate.ddl-auto=${JPA_DDL_AUTO:create-drop}
spring.jpa.database-platform=${JPA_DATABASE_PLATFORM:org.hibernate.dialect.H2Dialect}
Expand Down
Loading