GH-214: [feat] Change ports for easy testability and include actuator…

… endpoint in all services.
SOEN490-SportsApp · Feb 24, 2025 · fea6dc4 · fea6dc4
1 parent aa172ec
commit fea6dc4
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 12 deletions.
diff --git a/Microservices/email-service/build.gradle b/Microservices/email-service/build.gradle
@@ -29,6 +29,7 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'

diff --git a/...ervices/email-service/src/main/java/app/sportahub/emailservice/config/SecurityConfig.java b/...ervices/email-service/src/main/java/app/sportahub/emailservice/config/SecurityConfig.java
@@ -0,0 +1,40 @@
+package app.sportahub.emailservice.config;
+
+
+import lombok.SneakyThrows;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableWebSecurity
+@EnableMethodSecurity(prePostEnabled = true)
+public class SecurityConfig {
+
+    @Bean
+    public JwtAuthenticationConverter jwtAuthenticationConverter() {
+        return KeycloakJwtAuthenticationConverter.jwtAuthenticationConverter();
+    }
+
+    @SneakyThrows
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) {
+        return http
+                .authorizeHttpRequests(authorizeRequests -> authorizeRequests
+                        .requestMatchers(
+                                "/swagger-ui.html",
+                                "/api-docs",
+                                "/api-docs/**",
+                                "/swagger-ui/**",
+                                "/webjars/**",
+                                "/actuator/**")
+                        .permitAll()
+                        .anyRequest().authenticated())
+                .csrf(AbstractHttpConfigurer::disable)
+                .oauth2Login(Customizer.withDefaults())
+                .oauth2ResourceServer(oauth2 -> oauth2
+                        .jwt(jwt -> jwt
+                                .jwtAuthenticationConverter(
+                                        jwtAuthenticationConverter())))
+                .build();
+    }
+}
diff --git a/Microservices/email-service/src/main/resources/application.properties b/Microservices/email-service/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 spring.application.name=emailservice
 server.servlet.context-path=${SERVER_SERVLET_CONTEXT_PATH:/api/email-service}
+server.port=8081
 
 #Prometheus
 management.endpoints.web.exposure.include=health, info, metrics, prometheus

diff --git a/...ervices/event-service/src/main/java/app/sportahub/eventservice/config/SecurityConfig.java b/...ervices/event-service/src/main/java/app/sportahub/eventservice/config/SecurityConfig.java
@@ -33,7 +33,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
                                 "/api-docs",
                                 "/api-docs/**",
                                 "/swagger-ui/**",
-                                "/webjars/**")
+                                "/webjars/**",
+                                "/actuator/**")
                         .permitAll()
                         .anyRequest().authenticated())
                 .csrf(AbstractHttpConfigurer::disable)

diff --git a/Microservices/event-service/src/main/resources/application.properties b/Microservices/event-service/src/main/resources/application.properties
@@ -2,6 +2,7 @@ spring.application.name=${SPRING_APPLICATION_NAME:event-service}
 server.servlet.context-path=${SERVER_SERVLET_CONTEXT_PATH:/api/event-service}
 logging.level.app.sportahub=${LOGGING_LEVEL_APP_SPORTAHUB:info}
 logging.level.org.springframework.web=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB:debug}
+server.port=8082
 
 # OAuth2 Client Configuration
 spring.security.oauth2.client.registration.keycloak.client-id=${KEYCLOAK_CLIENT_ID}

diff --git a/Microservices/gateway/src/main/java/app/sportahub/gateway/config/SecurityConfig.java b/Microservices/gateway/src/main/java/app/sportahub/gateway/config/SecurityConfig.java
@@ -23,7 +23,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
                                 "/api/user-service/auth/register",
                                 "/api/user-service/auth/login",
                                 "/api/user-service/auth/refresh",
-                                "/api/user-service/auth/reset-password")
+                                "/api/user-service/auth/reset-password",
+                                "/actuator/**")
                         .permitAll()
                         .anyRequest().authenticated())
                 .csrf(AbstractHttpConfigurer::disable)

diff --git a/Microservices/gateway/src/main/resources/application.properties b/Microservices/gateway/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 spring.application.name=gateway
-
+server.port=8083
 
 # OAuth2 Client Configuration
 spring.security.oauth2.client.registration.keycloak.client-id=${KEYCLOAK_CLIENT_ID}
@@ -36,9 +36,3 @@ management.endpoints.web.exposure.include=health, info, metrics, prometheus
 management.metrics.distribution.percentiles-histogram.http.server.requests=true
 management.observations.key-values.application=gateway
 management.tracing.sampling.probability=1.0
-
-#Prometheus
-management.endpoints.web.exposure.include=health, info, metrics, prometheus
-management.metrics.distribution.percentiles-histogram.http.server.requests=true
-management.observations.key-values.application=gateway
-management.tracing.sampling.probability=1.0
diff --git a/...messaging-service/src/main/java/app/sportahub/messagingservice/config/SecurityConfig.java b/...messaging-service/src/main/java/app/sportahub/messagingservice/config/SecurityConfig.java
@@ -33,7 +33,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
                                 "/api-docs",
                                 "/api-docs/**",
                                 "/swagger-ui/**",
-                                "/webjars/**")
+                                "/webjars/**",
+                                "/actuator/**")
                         .permitAll()
                         .anyRequest().authenticated())
                 .csrf(AbstractHttpConfigurer::disable)

diff --git a/Microservices/messaging-service/src/main/resources/application.properties b/Microservices/messaging-service/src/main/resources/application.properties
@@ -3,6 +3,8 @@ server.servlet.context-path=${SERVER_SERVLET_CONTEXT_PATH:/api/messaging-service
 logging.level.app.sportahub=${LOGGING_LEVEL_APP_SPORTAHUB:info}
 logging.level.org.springframework.web=${LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB:debug}
 
+server.port=8084
+
 # OAuth2 Client Configuration
 spring.security.oauth2.client.registration.keycloak.client-id=${KEYCLOAK_CLIENT_ID}
 spring.security.oauth2.client.registration.keycloak.client-secret=${KEYCLOAK_CLIENT_SECRET}

diff --git a/...torage-service/src/main/java/app/sportahub/storageservice/config/auth/SecurityConfig.java b/...torage-service/src/main/java/app/sportahub/storageservice/config/auth/SecurityConfig.java
@@ -33,7 +33,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) {
                                 "/api-docs/**",
                                 "/swagger-ui/**",
                                 "/webjars/**",
-                                "/actuator/health/**")
+                                "/actuator/**")
                         .permitAll()
                         .anyRequest().authenticated())
                 .csrf(AbstractHttpConfigurer::disable)

diff --git a/Microservices/storage-service/src/main/resources/application.properties b/Microservices/storage-service/src/main/resources/application.properties
@@ -60,4 +60,6 @@ management.endpoints.web.exposure.include=health, info, metrics, prometheus
 management.endpoint.prometheus.access=unrestricted
 management.metrics.distribution.percentiles-histogram.http.server.requests=true
 management.observations.key-values.application=storage-service
-management.tracing.sampling.probability=1.0
+management.tracing.sampling.probability=1.0
+
+server.port=8085