Merge pull request #27 from ADPRO-C11/staging_new

Staging new

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - staging
+      - staging_new
 
 jobs:
   build:

.monitoring/prometheus/prometheus.yml

@@ -7,6 +7,6 @@ scrape_configs:
     metrics_path: '/actuator/prometheus'
     scrape_interval: 3s
     static_configs:
-      - targets: ['host.docker.internal:8080']
+      - targets: ['host.docker.internal:80']
         labels:
           application: 'snackscription_subscriptionbox'

.monitoring/docker-compose.yml → docker-compose.yml

@@ -14,7 +14,7 @@ services:
     ports:
       - "9090:9090"
     volumes:
-      - ./monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./.monitoring/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
 
   grafana:
     image: grafana/grafana:9.5.2
@@ -23,4 +23,4 @@ services:
       - "3000:3000"
     restart: unless-stopped
     volumes:
-      - ./monitoring/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./.monitoring/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources

src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/config/SecurityConfig.java

@@ -28,6 +28,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws
                         authorizeRequests
                                 .requestMatchers("/actuator/prometheus").permitAll() // Allow unauthenticated access
                                 .requestMatchers("/subscription-box/**", "/public/**").permitAll()
+                                .requestMatchers("/").permitAll()
                                 .anyRequest().authenticated())
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .addFilterBefore(new JWTAuthFilter(jwtUtils), UsernamePasswordAuthenticationFilter.class);