Skip to content

Move "api-boot-plugin-oauth"、"api-boot-plugin-security" to "api-boot" #28

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
Jul 18, 2020
Merged

Move "api-boot-plugin-oauth"、"api-boot-plugin-security" to "api-boot" #28

Show file tree
Hide file tree
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
14 changes: 0 additions & 14 deletions api-boot-project/api-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,6 @@
<optional>true</optional>
</dependency>

<!--ApiBoot Security Plugin-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api-boot-plugin-security</artifactId>
<optional>true</optional>
</dependency>

<!--ApiBoot Oauth Plugin-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>api-boot-plugin-oauth</artifactId>
<optional>true</optional>
</dependency>

<!--ApiBoot Quartz Plugin-->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
12 changes: 10 additions & 2 deletions ...ework/api/boot/autoconfigure/oauth/ApiBootAuthorizationMemoryServerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

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

import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down Expand Up @@ -46,8 +48,14 @@
@EnableAuthorizationServer
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
public class ApiBootAuthorizationMemoryServerAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
/**
* logger instance
*/
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationMemoryServerAutoConfiguration.class);

public ApiBootAuthorizationMemoryServerAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties) {
super(objectProvider, apiBootOauthProperties);
logger.info("ApiBoot Oauth2 initialize using memory.");
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...x/framework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

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

import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
Expand Down
11 changes: 9 additions & 2 deletions ...amework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerJdbcAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

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

import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
Expand Down Expand Up @@ -51,11 +53,16 @@
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "jdbc")
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
public class ApiBootAuthorizationServerJdbcAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
/**
* logger instance
*/
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerJdbcAutoConfiguration.class);
private DataSource dataSource;

public ApiBootAuthorizationServerJdbcAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, DataSource dataSource) {
super(objectProvider, apiBootOauthProperties);
this.dataSource = dataSource;
logger.info("ApiBoot Oauth2 initialize using jdbc.");
}

@Override
Expand Down
16 changes: 9 additions & 7 deletions ...mework/api/boot/autoconfigure/oauth/ApiBootAuthorizationServerRedisAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,26 @@

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

import org.minbox.framework.api.boot.plugin.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.plugin.oauth.grant.ApiBootOauthTokenGranter;
import org.minbox.framework.api.boot.oauth.ApiBootAuthorizationServerConfiguration;
import org.minbox.framework.api.boot.oauth.grant.ApiBootOauthTokenGranter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.oauth2.config.annotation.builders.InMemoryClientDetailsServiceBuilder;
import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
import org.springframework.security.oauth2.provider.token.TokenStore;
import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;
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;
Expand All @@ -57,6 +54,10 @@
@ConditionalOnProperty(prefix = API_BOOT_OAUTH_PREFIX, name = "away", havingValue = "redis")
@AutoConfigureAfter(RedisAutoConfiguration.class)
public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAuthorizationServerAutoConfiguration {
/**
* logger instance
*/
static Logger logger = LoggerFactory.getLogger(ApiBootAuthorizationServerRedisAutoConfiguration.class);
/**
* redis connection factory
*/
Expand All @@ -72,6 +73,7 @@ public class ApiBootAuthorizationServerRedisAutoConfiguration extends ApiBootAut
public ApiBootAuthorizationServerRedisAutoConfiguration(ObjectProvider<List<ApiBootOauthTokenGranter>> objectProvider, ApiBootOauthProperties apiBootOauthProperties, RedisConnectionFactory redisConnectionFactory) {
super(objectProvider, apiBootOauthProperties);
this.redisConnectionFactory = redisConnectionFactory;
logger.info("ApiBoot Oauth2 initialize using redis.");
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...minbox/framework/api/boot/autoconfigure/oauth/ApiBootResourceServerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.minbox.framework.api.boot.autoconfigure.oauth;

import org.minbox.framework.api.boot.autoconfigure.security.ApiBootSecurityProperties;
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
import org.minbox.framework.api.boot.secuirty.SecurityUser;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/minbox/framework/api/boot/autoconfigure/security/ApiBootSecurityProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
package org.minbox.framework.api.boot.autoconfigure.security;

import lombok.Data;
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
import org.minbox.framework.api.boot.secuirty.SecurityUser;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;

import java.util.ArrayList;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions ...minbox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package org.minbox.framework.api.boot.autoconfigure.security;

import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.plugin.security.handler.ApiBootDefaultAccessDeniedHandler;
import org.minbox.framework.api.boot.plugin.security.point.ApiBootDefaultAuthenticationEntryPoint;
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.secuirty.handler.ApiBootDefaultAccessDeniedHandler;
import org.minbox.framework.api.boot.secuirty.point.ApiBootDefaultAuthenticationEntryPoint;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.util.ObjectUtils;
Expand Down
15 changes: 11 additions & 4 deletions ...ox/framework/api/boot/autoconfigure/security/ApiBootWebSecurityJdbcAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

package org.minbox.framework.api.boot.autoconfigure.security;

import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootDefaultStoreDelegate;
import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
import org.minbox.framework.api.boot.plugin.security.userdetails.ApiBootUserDetailsService;
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootDefaultStoreDelegate;
import org.minbox.framework.api.boot.secuirty.delegate.ApiBootStoreDelegate;
import org.minbox.framework.api.boot.secuirty.userdetails.ApiBootUserDetailsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
Expand Down Expand Up @@ -53,9 +55,14 @@
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "jdbc")
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
public class ApiBootWebSecurityJdbcAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
/**
* logger instance
*/
static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityJdbcAutoConfiguration.class);

public ApiBootWebSecurityJdbcAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider<AccessDeniedHandler> accessDeniedHandler, ObjectProvider<AuthenticationEntryPoint> authenticationEntryPoint) {
super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable());
logger.info("ApiBoot Security initialize using jdbc.");
}

@Override
Expand Down
25 changes: 15 additions & 10 deletions .../framework/api/boot/autoconfigure/security/ApiBootWebSecurityMemoryAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

package org.minbox.framework.api.boot.autoconfigure.security;

import org.minbox.framework.api.boot.plugin.security.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.plugin.security.SecurityUser;
import org.minbox.framework.api.boot.secuirty.ApiBootWebSecurityConfiguration;
import org.minbox.framework.api.boot.secuirty.SecurityUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down Expand Up @@ -50,28 +52,31 @@
@ConditionalOnClass(ApiBootWebSecurityConfiguration.class)
@ConditionalOnProperty(prefix = API_BOOT_SECURITY_PREFIX, name = "away", havingValue = "memory", matchIfMissing = true)
public class ApiBootWebSecurityMemoryAutoConfiguration extends ApiBootWebSecurityAutoConfiguration {
/**
* logger instance
*/
static Logger logger = LoggerFactory.getLogger(ApiBootWebSecurityMemoryAutoConfiguration.class);

public ApiBootWebSecurityMemoryAutoConfiguration(ApiBootSecurityProperties apiBootSecurityProperties, ObjectProvider<AccessDeniedHandler> accessDeniedHandler, ObjectProvider<AuthenticationEntryPoint> authenticationEntryPoint) {
super(apiBootSecurityProperties, accessDeniedHandler.getIfAvailable(), authenticationEntryPoint.getIfAvailable());
logger.info("ApiBoot Security initialize using memory.");
}

@Override
@Bean
protected UserDetailsService userDetailsService() {
InMemoryUserDetailsManager memoryUserDetails = new InMemoryUserDetailsManager();
InMemoryUserDetailsManager memoryUserDetailsManager = new InMemoryUserDetailsManager();
List<SecurityUser> users = apiBootSecurityProperties.getUsers();
if (!ObjectUtils.isEmpty(users)) {
return memoryUserDetails;
}
for (SecurityUser securityUser : users) {
users.forEach(securityUser -> {
String encoderPassword = passwordEncoder().encode(securityUser.getPassword());
UserDetails userDetails =
User.builder()
.username(securityUser.getUsername())
.password(encoderPassword)
.roles(securityUser.getRoles())
.build();
memoryUserDetails.createUser(userDetails);
}
return memoryUserDetails;
memoryUserDetailsManager.createUser(userDetails);
});
return memoryUserDetailsManager;
}
}
10 changes: 0 additions & 10 deletions api-boot-project/api-boot-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,6 @@
<artifactId>spring-security-jwt</artifactId>
<version>${spring.security.jwt.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-starter-security-oauth-jwt</artifactId>
Expand Down
38 changes: 0 additions & 38 deletions api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions api-boot-project/api-boot-plugins/api-boot-plugin-security/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions api-boot-project/api-boot-plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
</properties>
<modules>
<module>api-boot-plugin</module>
<module>api-boot-plugin-security</module>
<module>api-boot-plugin-oauth</module>
<module>api-boot-plugin-resource-load</module>
<module>api-boot-plugin-sequence</module>
</modules>
Expand Down
10 changes: 2 additions & 8 deletions api-boot-project/api-boot-starters/api-boot-starter-security-oauth-jwt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,9 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<!--ApiBoot Security Plugin-->
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-security</artifactId>
</dependency>
<!--ApiBoot Oauth Plugin-->
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-plugin-oauth</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>

Expand Down
Loading