Skip to content

Commit 0ad24c3

Browse files
hengboyhengboy
committed
Adapt "minbox-oauth" component
1 parent ba00015 commit 0ad24c3

File tree

22 files changed

+48
-659
lines changed

22 files changed

+48
-659
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@
144144
<dependency>
145145
<groupId>org.minbox.framework</groupId>
146146
<artifactId>minbox-sequence</artifactId>
147+
<optional>true</optional>
148+
</dependency>
149+
<dependency>
150+
<groupId>org.minbox.framework</groupId>
151+
<artifactId>minbox-oauth</artifactId>
152+
<optional>true</optional>
147153
</dependency>
148154

149155

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.oauth.AuthorizationServerConfiguration;
20+
import org.minbox.framework.oauth.grant.OAuth2TokenGranter;
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.beans.factory.ObjectProvider;
@@ -43,7 +43,7 @@
4343
* @author 恒宇少年
4444
*/
4545
@Configuration
46-
@ConditionalOnClass(ApiBootAuthorizationServerConfiguration.class)
46+
@ConditionalOnClass(AuthorizationServerConfiguration.class)
4747
@EnableConfigurationProperties(ApiBootOauthProperties.class)
4848
@EnableAuthorizationServer
4949
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
@@ -53,7 +53,7 @@ public class ApiBootAuthorizationMemoryServerAutoConfiguration extends ApiBootAu
5353
*/
5454
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationMemoryServerAutoConfiguration.class);
5555

56-
public ApiBootAuthorizationMemoryServerAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
56+
public ApiBootAuthorizationMemoryServerAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
5757
super(objectProvider, apiBootOauthProperties);
5858
logger.info("ApiBoot Oauth2 initialize using memory.");
5959
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.oauth.AuthorizationServerConfiguration;
20+
import org.minbox.framework.oauth.grant.OAuth2TokenGranter;
2121
import org.springframework.beans.factory.ObjectProvider;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2323
import org.springframework.context.annotation.Bean;
@@ -34,11 +34,11 @@
3434
*
3535
* @author 恒宇少年
3636
*/
37-
public class ApiBootAuthorizationServerAutoConfiguration extends ApiBootAuthorizationServerConfiguration {
37+
public class ApiBootAuthorizationServerAutoConfiguration extends AuthorizationServerConfiguration {
3838

3939
protected ApiBootOauthProperties apiBootOauthProperties;
4040

41-
public ApiBootAuthorizationServerAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
41+
public ApiBootAuthorizationServerAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
4242
super(objectProvider);
4343
this.apiBootOauthProperties = apiBootOauthProperties;
4444
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.minbox.framework.api.boot.autoconfigure.oauth;
1818

19-
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
20-
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
19+
import org.minbox.framework.oauth.AuthorizationServerConfiguration;
20+
import org.minbox.framework.oauth.grant.OAuth2TokenGranter;
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.beans.factory.ObjectProvider;
@@ -35,7 +35,6 @@
3535
import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;
3636

3737
import javax.sql.DataSource;
38-
3938
import java.util.List;
4039

4140
import static org.minbox.framework.api.boot.autoconfigure.oauth.ApiBootOauthProperties.API_BOOT_OAUTH_PREFIX;
@@ -49,7 +48,7 @@
4948
@EnableConfigurationProperties(ApiBootOauthProperties.class)
5049
@EnableAuthorizationServer
5150
@ConditionalOnBean(DataSource.class)
52-
@ConditionalOnClass(ApiBootAuthorizationServerConfiguration.class)
51+
@ConditionalOnClass(AuthorizationServerConfiguration.class)
5352
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "jdbc")
5453
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
5554
public class ApiBootAuthorizationServerJdbcAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
@@ -59,7 +58,7 @@ public class ApiBootAuthorizationServerJdbcAutoConfiguration extends ApiBootAuth
5958
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerJdbcAutoConfiguration.class);
6059
private DataSource dataSource;
6160

62-
public ApiBootAuthorizationServerJdbcAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, DataSource dataSource) {
61+
public ApiBootAuthorizationServerJdbcAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, DataSource dataSource) {
6362
super(objectProvider, apiBootOauthProperties);
6463
this.dataSource = dataSource;
6564
logger.info("ApiBoot Oauth2 initialize using jdbc.");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.minbox.framework.api.boot.autoconfigure.oauth;
1919

20-
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
21-
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
20+
import org.minbox.framework.oauth.AuthorizationServerConfiguration;
21+
import org.minbox.framework.oauth.grant.OAuth2TokenGranter;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424
import org.springframework.beans.factory.ObjectProvider;
@@ -50,7 +50,7 @@
5050
@EnableConfigurationProperties(ApiBootOauthProperties.class)
5151
@EnableAuthorizationServer
5252
@ConditionalOnBean(RedisConnectionFactory.class)
53-
@ConditionalOnClass({ApiBootAuthorizationServerConfiguration.class})
53+
@ConditionalOnClass({AuthorizationServerConfiguration.class})
5454
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "redis")
5555
@AutoConfigureAfter(RedisAutoConfiguration.class)
5656
public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
@@ -70,7 +70,7 @@ public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAut
7070
* @param apiBootOauthProperties ApiBoot Oauth Properties
7171
* @param redisConnectionFactory Redis Connection Factory
7272
*/
73-
public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) {
73+
public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<OAuth2TokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) {
7474
super(objectProvider, apiBootOauthProperties);
7575
this.redisConnectionFactory = redisConnectionFactory;
7676
logger.info("ApiBoot Oauth2 initialize using redis.");

‎api-boot-project/api-boot-dependencies/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<minbox-resource-load.version>1.0.0.RELEASE</minbox-resource-load.version>
3030
<minbox-datasource-switch.version>1.0.0.RELEASE</minbox-datasource-switch.version>
3131
<minbox-sequence.version>1.0.0.RELEASE</minbox-sequence.version>
32+
<minbox-oauth.version>1.0.0.RELEASE</minbox-oauth.version>
3233
<minbox-mongo-client-settings.version>1.0.0.RELEASE</minbox-mongo-client-settings.version>
3334
<code.builder.core.version>1.0.5.RELEASE</code.builder.core.version>
3435
<mybatis-enhance.version>1.1.3.RELEASE</mybatis-enhance.version>
@@ -188,6 +189,11 @@
188189
<artifactId>minbox-sequence</artifactId>
189190
<version>${minbox-sequence.version}</version>
190191
</dependency>
192+
<dependency>
193+
<groupId>org.minbox.framework</groupId>
194+
<artifactId>minbox-oauth</artifactId>
195+
<version>${minbox-oauth.version}</version>
196+
</dependency>
191197

192198

193199
<!--ApiBoot Dependencies-->

‎api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<groupId>com.fasterxml.jackson.core</groupId>
5555
<artifactId>jackson-databind</artifactId>
5656
</dependency>
57+
<dependency>
58+
<groupId>org.minbox.framework</groupId>
59+
<artifactId>minbox-oauth</artifactId>
60+
</dependency>
5761
</dependencies>
5862

5963
</project>

‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/ApiBootAuthorizationServerConfiguration.java‎

Lines changed: 0 additions & 201 deletions
This file was deleted.

‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oauth/exception/ApiBootOAuth2Exception.java‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)