Merge pull request #17 from Nasruddin/feature/authorization-server-impl

cleaning oauth flow
Nasruddin · Mar 6, 2024 · 4bd88ef · 4bd88ef
2 parents 93ed233 + 11bb5e7
commit 4bd88ef
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 8 deletions.
diff --git 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
diff --git a/images/docker-compose.png b/images/docker-compose.png
diff --git a/images/docker-ps.png b/images/docker-ps.png
diff --git a/images/eureka.png b/images/eureka.png
diff --git a/images/gateway-routes.png b/images/gateway-routes.png
diff --git a/images/jwt-io.png b/images/jwt-io.png
diff --git a/images/oauth-endpoint.png b/images/oauth-endpoint.png
diff --git a/...src/main/java/io/javatab/microservices/composite/course/configuration/SecurityConfig.java b/...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/...er/src/main/java/io/javatab/springcloud/auth/configuration/AuthorizationServerConfig.java b/...er/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<SecurityContext> jwkSource) {
 
     @Bean
     public AuthorizationServerSettings authorizationServerSettings() {
-        return AuthorizationServerSettings.builder().issuer("http://auth-server").build();
+        return AuthorizationServerSettings.builder().issuer("http://auth-server:9999").build();
     }
 
     private Consumer<List<AuthenticationProvider>> configureAuthenticationValidator() {