[BAEL-9245] Added classes needed to implement core services with redis

One of the things noticed is that we need to use RegisteredClients instead
of the client set in the properties file.

Author: bpstelios10

oauth-authorization-server-with-redis/redis-authorization-server/pom.xml

@@ -26,6 +26,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-authorization-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.codemonstur</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>1.4.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/OAuth2AuthorizationServerApplication.java

@@ -9,5 +9,4 @@ public class OAuth2AuthorizationServerApplication {
     public static void main(String[] args) {
         SpringApplication.run(OAuth2AuthorizationServerApplication.class, args);
     }
-
 }

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/config/RedisConfig.java

@@ -0,0 +1,104 @@
+package com.baeldung.config;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.convert.RedisCustomConversions;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
+
+import com.baeldung.convert.BytesToClaimsHolderConverter;
+import com.baeldung.convert.BytesToOAuth2AuthorizationRequestConverter;
+import com.baeldung.convert.BytesToUsernamePasswordAuthenticationTokenConverter;
+import com.baeldung.convert.ClaimsHolderToBytesConverter;
+import com.baeldung.convert.OAuth2AuthorizationRequestToBytesConverter;
+import com.baeldung.convert.UsernamePasswordAuthenticationTokenToBytesConverter;
+import com.baeldung.repository.OAuth2AuthorizationGrantAuthorizationRepository;
+import com.baeldung.repository.OAuth2RegisteredClientRepository;
+import com.baeldung.repository.OAuth2UserConsentRepository;
+import com.baeldung.service.RedisOAuth2AuthorizationConsentService;
+import com.baeldung.service.RedisOAuth2AuthorizationService;
+import com.baeldung.service.RedisRegisteredClientRepository;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import redis.embedded.RedisServer;
+
+@Configuration(proxyBeanMethods = false)
+@EnableRedisRepositories
+public class RedisConfig {
+
+    private final String redisHost;
+    private final int redisPort;
+    private final RedisServer redisServer;
+
+    public RedisConfig(@Value("${spring.data.redis.host}") String redisHost, @Value("${spring.data.redis.port}") int redisPort) throws IOException {
+        this.redisHost = redisHost;
+        this.redisPort = redisPort;
+        this.redisServer = new RedisServer(redisPort);
+    }
+
+    @PostConstruct
+    public void postConstruct() throws IOException {
+        redisServer.start();
+    }
+
+    @PreDestroy
+    public void preDestroy() throws IOException {
+        redisServer.stop();
+    }
+
+    @Bean
+    @Order(1)
+    public JedisConnectionFactory redisConnectionFactory() {
+        RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration(redisHost, redisPort);
+
+        return new JedisConnectionFactory(redisStandaloneConfiguration);
+    }
+
+    @Bean
+    @Order(2)
+    public RedisTemplate<?, ?> redisTemplate(JedisConnectionFactory connectionFactory) {
+        RedisTemplate<byte[], byte[]> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
+
+    @Bean
+    @Order(3)
+    public RedisCustomConversions redisCustomConversions() {
+        return new RedisCustomConversions(
+          Arrays.asList(new UsernamePasswordAuthenticationTokenToBytesConverter(), new BytesToUsernamePasswordAuthenticationTokenConverter(),
+            new OAuth2AuthorizationRequestToBytesConverter(), new BytesToOAuth2AuthorizationRequestConverter(), new ClaimsHolderToBytesConverter(),
+            new BytesToClaimsHolderConverter()));
+    }
+
+    @Bean
+    @Order(4)
+    public RedisRegisteredClientRepository registeredClientRepository(OAuth2RegisteredClientRepository registeredClientRepository) {
+        RedisRegisteredClientRepository redisRegisteredClientRepository = new RedisRegisteredClientRepository(registeredClientRepository);
+        redisRegisteredClientRepository.save(RegisteredClients.messagingClient());
+
+        return redisRegisteredClientRepository;
+    }
+
+    @Bean
+    @Order(5)
+    public RedisOAuth2AuthorizationService authorizationService(RegisteredClientRepository registeredClientRepository,
+      OAuth2AuthorizationGrantAuthorizationRepository authorizationGrantAuthorizationRepository) {
+        return new RedisOAuth2AuthorizationService(registeredClientRepository, authorizationGrantAuthorizationRepository);
+    }
+
+    @Bean
+    @Order(6)
+    public RedisOAuth2AuthorizationConsentService authorizationConsentService(OAuth2UserConsentRepository userConsentRepository) {
+        return new RedisOAuth2AuthorizationConsentService(userConsentRepository);
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/config/RegisteredClients.java

@@ -0,0 +1,29 @@
+package com.baeldung.config;
+
+import java.util.UUID;
+
+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.RegisteredClient;
+
+public class RegisteredClients {
+
+    public static RegisteredClient messagingClient() {
+        return RegisteredClient.withId(UUID.randomUUID()
+            .toString())
+          .clientId("articles-client")
+          .clientSecret("{noop}secret")
+          .clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
+          .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
+          .authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN)
+          .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
+          .authorizationGrantType(AuthorizationGrantType.DEVICE_CODE)
+          .redirectUri("http://127.0.0.1:8080/login/oauth2/code/articles-client-oidc")
+          .redirectUri("http://127.0.0.1:8080/authorized")
+          .postLogoutRedirectUri("http://127.0.0.1:9000/login")
+          .scope(OidcScopes.OPENID)
+          .scope("articles.read")
+          .build();
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/config/DefaultSecurityConfig.java renamed to oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/config/SecurityConfig.java

@@ -0,0 +1,29 @@
+package com.baeldung.convert;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.oauth2.server.authorization.jackson2.OAuth2AuthorizationServerJackson2Module;
+
+import com.baeldung.entity.OAuth2AuthorizationGrantAuthorization;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@ReadingConverter
+public class BytesToClaimsHolderConverter implements Converter<byte[], OAuth2AuthorizationGrantAuthorization.ClaimsHolder> {
+
+    private final Jackson2JsonRedisSerializer<OAuth2AuthorizationGrantAuthorization.ClaimsHolder> serializer;
+
+    public BytesToClaimsHolderConverter() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModules(SecurityJackson2Modules.getModules(BytesToClaimsHolderConverter.class.getClassLoader()));
+        objectMapper.registerModule(new OAuth2AuthorizationServerJackson2Module());
+        objectMapper.addMixIn(OAuth2AuthorizationGrantAuthorization.ClaimsHolder.class, ClaimsHolderMixin.class);
+        this.serializer = new Jackson2JsonRedisSerializer<>(objectMapper, OAuth2AuthorizationGrantAuthorization.ClaimsHolder.class);
+    }
+
+    @Override
+    public OAuth2AuthorizationGrantAuthorization.ClaimsHolder convert(byte[] value) {
+        return this.serializer.deserialize(value);
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/convert/BytesToClaimsHolderConverter.java

@@ -0,0 +1,28 @@
+package com.baeldung.convert;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+import org.springframework.security.oauth2.server.authorization.jackson2.OAuth2AuthorizationServerJackson2Module;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@ReadingConverter
+public class BytesToOAuth2AuthorizationRequestConverter implements Converter<byte[], OAuth2AuthorizationRequest> {
+
+    private final Jackson2JsonRedisSerializer<OAuth2AuthorizationRequest> serializer;
+
+    public BytesToOAuth2AuthorizationRequestConverter() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModules(SecurityJackson2Modules.getModules(BytesToOAuth2AuthorizationRequestConverter.class.getClassLoader()));
+        objectMapper.registerModule(new OAuth2AuthorizationServerJackson2Module());
+        this.serializer = new Jackson2JsonRedisSerializer<>(objectMapper, OAuth2AuthorizationRequest.class);
+    }
+
+    @Override
+    public OAuth2AuthorizationRequest convert(byte[] value) {
+        return this.serializer.deserialize(value);
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/convert/BytesToOAuth2AuthorizationRequestConverter.java

@@ -0,0 +1,26 @@
+package com.baeldung.convert;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@ReadingConverter
+public class BytesToUsernamePasswordAuthenticationTokenConverter implements Converter<byte[], UsernamePasswordAuthenticationToken> {
+
+    private final Jackson2JsonRedisSerializer<UsernamePasswordAuthenticationToken> serializer;
+
+    public BytesToUsernamePasswordAuthenticationTokenConverter() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModules(SecurityJackson2Modules.getModules(BytesToUsernamePasswordAuthenticationTokenConverter.class.getClassLoader()));
+        this.serializer = new Jackson2JsonRedisSerializer<>(objectMapper, UsernamePasswordAuthenticationToken.class);
+    }
+
+    @Override
+    public UsernamePasswordAuthenticationToken convert(byte[] value) {
+        return this.serializer.deserialize(value);
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/convert/BytesToUsernamePasswordAuthenticationTokenConverter.java

@@ -0,0 +1,19 @@
+package com.baeldung.convert;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
+@JsonIgnoreProperties(ignoreUnknown = true)
+abstract class ClaimsHolderMixin {
+
+    @JsonCreator
+    ClaimsHolderMixin(@JsonProperty("claims") Map<String, Object> claims) {
+    }
+}

oauth-authorization-server-with-redis/redis-authorization-server/src/main/java/com/baeldung/convert/ClaimsHolderMixin.java

@@ -0,0 +1,29 @@
+package com.baeldung.convert;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.oauth2.server.authorization.jackson2.OAuth2AuthorizationServerJackson2Module;
+
+import com.baeldung.entity.OAuth2AuthorizationGrantAuthorization;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@WritingConverter
+public class ClaimsHolderToBytesConverter implements Converter<OAuth2AuthorizationGrantAuthorization.ClaimsHolder, byte[]> {
+
+    private final Jackson2JsonRedisSerializer<OAuth2AuthorizationGrantAuthorization.ClaimsHolder> serializer;
+
+    public ClaimsHolderToBytesConverter() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModules(SecurityJackson2Modules.getModules(ClaimsHolderToBytesConverter.class.getClassLoader()));
+        objectMapper.registerModules(new OAuth2AuthorizationServerJackson2Module());
+        objectMapper.addMixIn(OAuth2AuthorizationGrantAuthorization.ClaimsHolder.class, ClaimsHolderMixin.class);
+        this.serializer = new Jackson2JsonRedisSerializer<>(objectMapper, OAuth2AuthorizationGrantAuthorization.ClaimsHolder.class);
+    }
+
+    @Override
+    public byte[] convert(OAuth2AuthorizationGrantAuthorization.ClaimsHolder value) {
+        return this.serializer.serialize(value);
+    }
+}