diff --git a/config-repo/course-composite.yml b/config-repo/course-composite.yml index 64b9ea6..0d6e585 100644 --- a/config-repo/course-composite.yml +++ b/config-repo/course-composite.yml @@ -9,14 +9,14 @@ springdoc: cache: disabled: true swagger-ui: - oauth2-redirect-url: https://localhost:8443/webjars/swagger-ui/oauth2-redirect.html + oauth2-redirect-url: http://localhost:8443/webjars/swagger-ui/oauth2-redirect.html oauth: clientId: writer clientSecret: secret useBasicAuthenticationWithAccessCodeGrant: true oAuthFlow: - authorizationUrl: https://localhost:8443/oauth2/authorize - tokenUrl: https://localhost:8443/oauth2/token + authorizationUrl: http://localhost:8443/oauth2/authorize + tokenUrl: http://localhost:8443/oauth2/token server.forward-headers-strategy: framework diff --git a/images/build.png b/images/build.png new file mode 100644 index 0000000..ad2fe18 Binary files /dev/null and b/images/build.png differ diff --git a/images/docker-compose.png b/images/docker-compose.png new file mode 100644 index 0000000..bbcd9a2 Binary files /dev/null and b/images/docker-compose.png differ diff --git a/images/docker-ps.png b/images/docker-ps.png new file mode 100644 index 0000000..085d28c Binary files /dev/null and b/images/docker-ps.png differ diff --git a/images/eureka.png b/images/eureka.png new file mode 100644 index 0000000..3290f86 Binary files /dev/null and b/images/eureka.png differ diff --git a/images/gateway-routes.png b/images/gateway-routes.png new file mode 100644 index 0000000..a333b0c Binary files /dev/null and b/images/gateway-routes.png differ diff --git a/images/jwt-io.png b/images/jwt-io.png new file mode 100644 index 0000000..a51ea4f Binary files /dev/null and b/images/jwt-io.png differ diff --git a/images/oauth-endpoint.png b/images/oauth-endpoint.png new file mode 100644 index 0000000..79ea653 Binary files /dev/null and b/images/oauth-endpoint.png differ diff --git a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/configuration/SecurityConfig.java b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/configuration/SecurityConfig.java index 72fcd1a..9ffdf0f 100644 --- a/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/configuration/SecurityConfig.java +++ b/microservices/course-composite-service/src/main/java/io/javatab/microservices/composite/course/configuration/SecurityConfig.java @@ -1,12 +1,14 @@ package io.javatab.microservices.composite.course.configuration; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; import static org.springframework.http.HttpMethod.*; +@Configuration @EnableWebFluxSecurity public class SecurityConfig { diff --git a/spring-cloud/authorization-server/src/main/java/io/javatab/springcloud/auth/configuration/AuthorizationServerConfig.java b/spring-cloud/authorization-server/src/main/java/io/javatab/springcloud/auth/configuration/AuthorizationServerConfig.java index 25d76a1..9b61801 100644 --- a/spring-cloud/authorization-server/src/main/java/io/javatab/springcloud/auth/configuration/AuthorizationServerConfig.java +++ b/spring-cloud/authorization-server/src/main/java/io/javatab/springcloud/auth/configuration/AuthorizationServerConfig.java @@ -115,8 +115,8 @@ public RegisteredClientRepository registeredClientRepository() { .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) .authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN) .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) - .redirectUri("https://my.redirect.uri") - .redirectUri("https://localhost:8443/openapi/webjars/swagger-ui/oauth2-redirect.html") + .redirectUri("http://my.redirect.uri") + .redirectUri("http://localhost:8443/openapi/webjars/swagger-ui/oauth2-redirect.html") .scope(OidcScopes.OPENID) .scope("course:read") .scope("course:write") @@ -131,8 +131,8 @@ public RegisteredClientRepository registeredClientRepository() { .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) .authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN) .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) - .redirectUri("https://my.redirect.uri") - .redirectUri("https://localhost:8443/openapi/webjars/swagger-ui/oauth2-redirect.html") + .redirectUri("http://my.redirect.uri") + .redirectUri("http://localhost:8443/openapi/webjars/swagger-ui/oauth2-redirect.html") .scope(OidcScopes.OPENID) .scope("course:read") .clientSettings(ClientSettings.builder().requireAuthorizationConsent(true).build()) @@ -157,7 +157,7 @@ public JwtDecoder jwtDecoder(JWKSource jwkSource) { @Bean public AuthorizationServerSettings authorizationServerSettings() { - return AuthorizationServerSettings.builder().issuer("http://auth-server").build(); + return AuthorizationServerSettings.builder().issuer("http://auth-server:9999").build(); } private Consumer> configureAuthenticationValidator() {