small changes to oauth server

apssouza22 · apssouza22 · commit 85857452e5e9 · 2017-11-18T14:51:25.000Z
diff --git a/README.md b/README.md
@@ -129,6 +129,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"id":161,"caption":"Test c
 ```
 
 ## TODO
+* Deploy the project to Amazon ECS
 * Integrate turbine in the Admin dashboard
 * Add private maven repository Artifactory
 * Manager services integration through Spring Webflow
diff --git a/oauth-docker-compose.yml b/oauth-docker-compose.yml
@@ -0,0 +1,76 @@
+version: '2'
+
+services:
+  config:
+    image: todo/config-server
+    ports:
+      - 8888:8888
+    networks:
+      - net
+    hostname: config
+    container_name: config 
+    external_links:
+      - elk
+      - kafka
+    
+  oauth:
+    image: todo/oauth-server
+    ports:
+      - 8017:8017
+    networks:
+      - net
+    depends_on:
+      - user
+    hostname: oauth
+    container_name: oauth
+    command: ["./wait-for-it.sh","eureka:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    external_links:
+      - elk
+  
+  eureka:
+    image: todo/eureka-server
+    ports:
+      - 8010:8010
+    networks:
+      - net
+    depends_on:
+      - config
+    hostname: eureka
+    container_name: eureka  
+    command: ["./wait-for-it.sh","config:8888","--timeout=100","--","/usr/local/bin/start.sh"]
+    external_links:
+      - elk
+    
+  gateway:
+    image: todo/api-gateway
+    ports:
+      - 8018:8018
+    networks:
+      - net
+    hostname: gateway
+    command: ["./wait-for-it.sh","eureka:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    external_links:
+      - elk
+  
+  user:
+    image: todo/user-service
+    ports:
+      - 8016:8016
+    networks:
+      - net
+    hostname: user
+    container_name: user
+    command: ["./wait-for-it.sh","eureka:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    external_links:
+      - elk
+      - kafka
+
+volumes:
+  todo_data:
+    external: true
+  todo_elk:
+    external: true
+
+networks:
+  net:
+    driver: bridge
diff --git a/oauth-server/src/main/java/com/apssouza/auth/CustomTokenEnhancer.java b/oauth-server/src/main/java/com/apssouza/auth/CustomTokenEnhancer.java
@@ -1,4 +1,3 @@
-
 package com.apssouza.auth;
 
 import java.util.HashMap;
@@ -17,7 +16,8 @@ public class CustomTokenEnhancer implements TokenEnhancer {
     @Override
     public OAuth2AccessToken enhance(
             OAuth2AccessToken accessToken,
-            OAuth2Authentication authentication) {
+            OAuth2Authentication authentication
+    ) {
         Map<String, Object> additionalInfo = new HashMap<>();
         additionalInfo.put("name", authentication.getName());
         ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
diff --git a/oauth-server/src/main/java/com/apssouza/configuration/CORSFilterConfiguration.java b/oauth-server/src/main/java/com/apssouza/configuration/CORSFilterConfiguration.java
diff --git a/oauth-server/src/main/java/com/apssouza/configuration/JwtServerConfiguration.java b/oauth-server/src/main/java/com/apssouza/configuration/JwtServerConfiguration.java
@@ -15,6 +15,8 @@
  */
 @Configuration
 public class JwtServerConfiguration {
+    
+    private static final String ENC_PASSWORD = "58347105";
 
     @Bean
     public TokenStore tokenStore() {
@@ -23,7 +25,10 @@ public TokenStore tokenStore() {
 
     @Bean
     protected JwtAccessTokenConverter jwtTokenEnhancer() {
-        KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(new ClassPathResource("jwt.jks"), "58347105".toCharArray());
+        KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(
+                new ClassPathResource("jwt.jks"), 
+                ENC_PASSWORD.toCharArray()
+        );
         JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
         converter.setKeyPair(keyStoreKeyFactory.getKeyPair("jwt"));
         return converter;
diff --git a/oauth-server/src/main/java/com/apssouza/configuration/OAuth2ServerConfiguration.java b/oauth-server/src/main/java/com/apssouza/configuration/OAuth2ServerConfiguration.java
@@ -1,15 +1,19 @@
 package com.apssouza.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
+import org.springframework.core.Ordered;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
 
 /**
  * Oauth server configuration
@@ -49,4 +53,23 @@ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws E
                                 .authenticate(authentication)
                 );
     }
+
+    /**
+     * CORS Filter
+     *
+     * @return Filter
+     */
+    @Bean
+    public FilterRegistrationBean filterRegistrationBean() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+        source.registerCorsConfiguration("/**", config);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        return bean;
+    }
 }
