🚀 新增Redis方式集成OAuth2时客户端存储方式选择性配置

Author: hengboy

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java

@@ -17,6 +17,7 @@
 
 package org.minbox.framework.api.boot.autoconfigure.oauth;
 
+import org.minbox.framework.api.boot.common.exception.ApiBootException;
 import org.minbox.framework.oauth.AuthorizationServerConfiguration;
 import org.minbox.framework.oauth.grant.OAuth2TokenGranter;
 import org.slf4j.Logger;
@@ -37,6 +38,7 @@
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
 
+import javax.sql.DataSource;
 import java.util.List;
 
 import static org.minbox.framework.api.boot.autoconfigure.oauth.ApiBootOauthProperties.API_BOOT_OAUTH_PREFIX;
@@ -62,17 +64,15 @@ public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAut
      * redis connection factory
      */
     private RedisConnectionFactory redisConnectionFactory;
+    private DataSource dataSource;
 
-    /**
-     * constructor instance redis connection factory
-     *
-     * @param objectProvider         ApiBoot Token Granter
-     * @param apiBootOauthProperties ApiBoot Oauth Properties
-     * @param redisConnectionFactory Redis Connection Factory
-     */
-    public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) {
+    public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider,
+                                                            ApiBootOauthProperties apiBootOauthProperties,
+                                                            ObjectProvider<RedisConnectionFactory> connectionFactoryProvider,
+                                                            ObjectProvider<DataSource> dataSourceProvider) {
         super(objectProvider, apiBootOauthProperties);
-        this.redisConnectionFactory = redisConnectionFactory;
+        this.redisConnectionFactory = connectionFactoryProvider.getIfAvailable();
+        this.dataSource = dataSourceProvider.getIfAvailable();
         logger.info("ApiBoot Oauth2 initialize using redis.");
     }
 
@@ -84,14 +84,24 @@ public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<OAut
      */
     @Override
     public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
-        InMemoryClientDetailsServiceBuilder inMemoryClientDetailsServiceBuilder = clients.inMemory();
-        apiBootOauthProperties.getClients().stream().forEach(client -> inMemoryClientDetailsServiceBuilder.withClient(client.getClientId())
-            .secret(passwordEncoder().encode(client.getClientSecret()))
-            .authorizedGrantTypes(client.getGrantTypes())
-            .scopes(client.getScopes())
-            .resourceIds(client.getResourceId())
-            .accessTokenValiditySeconds(client.getAccessTokenValiditySeconds())
-            .refreshTokenValiditySeconds(client.getRefreshTokenValiditySeconds()));
+        if (OAuthClientStorageAway.jdbc == apiBootOauthProperties.getClientStorageAway() && dataSource == null) {
+            throw new ApiBootException("If you use jdbc to store the client, please instantiate the datasource.");
+        }
+        switch (apiBootOauthProperties.getClientStorageAway()) {
+            case memory:
+                InMemoryClientDetailsServiceBuilder inMemoryClientDetailsServiceBuilder = clients.inMemory();
+                apiBootOauthProperties.getClients().stream().forEach(client -> inMemoryClientDetailsServiceBuilder.withClient(client.getClientId())
+                    .secret(passwordEncoder().encode(client.getClientSecret()))
+                    .authorizedGrantTypes(client.getGrantTypes())
+                    .scopes(client.getScopes())
+                    .resourceIds(client.getResourceId())
+                    .accessTokenValiditySeconds(client.getAccessTokenValiditySeconds())
+                    .refreshTokenValiditySeconds(client.getRefreshTokenValiditySeconds()));
+                break;
+            case jdbc:
+                clients.jdbc(dataSource);
+                break;
+        }
     }
 
     /**

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootOauthProperties.java

@@ -45,7 +45,12 @@ public class ApiBootOauthProperties {
      *
      * @see OAuthAway
      */
+    @Deprecated
     private OAuthAway away = OAuthAway.memory;
+    /**
+     * 配置OAuth2客户端列表存储方式
+     */
+    private OAuthClientStorageAway clientStorageAway = OAuthClientStorageAway.memory;
     /**
      * Whether to generate a new token every time the "/oauth/token" interface is called
      * <p>

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/OAuthClientStorageAway.java

@@ -0,0 +1,18 @@
+package org.minbox.framework.api.boot.autoconfigure.oauth;
+
+/**
+ * OAuth2的客户端存储方式
+ *
+ * @author 恒宇少年
+ * @version 2.3.7
+ */
+public enum OAuthClientStorageAway {
+    /**
+     * Store client's config in memory
+     */
+    memory,
+    /**
+     * Store client's config in jdbc
+     */
+    jdbc,
+}

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.minbox.framework</groupId>
         <artifactId>minbox-parent</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
         <relativePath/>
     </parent>
     <packaging>pom</packaging>