Merge pull request #183 from skni-kod/issue-182

Eureka, auto service registry, commons library

.env.example

@@ -17,3 +17,6 @@ RABBITMQ_PASSWORD=rabbitmq
 ELASTICSEARCH_HOSTS=["http://localhost:9200"]
 ELASTICSEARCH_USERNAME=opensearch
 ELASTICSEARCH_PASSWORD=opensearch
+
+# Eureka
+EUREKA_URL=http://localhost:8761/eureka

README.md

@@ -26,10 +26,11 @@ Before you can run the project, you will need the following applications:
    docker-compose up -d
    ```
 
-4. Go to local database ([localhost:5432](http://localhost:5432)) with the following credentials and execute the SQL command:
+4. Go to local database ([localhost:5432](http://localhost:5432)) with the following credentials and execute the SQL
+   command:
 
-   - **Username:** postgres
-   - **Password:** postgres
+    - **Username:** postgres
+    - **Password:** postgres
 
    ```sql
    CREATE SCHEMA IF NOT EXISTS "kodemy-auth";
@@ -39,11 +40,11 @@ Before you can run the project, you will need the following applications:
 
 5. Run individual services in IntelliJ with the following settings for `Active profiles`:
 
-   - `KodemyAuthApplication`: `local`
-   - `KodemyBackendApplication`: `local`
-   - `KodemyGatewayApplication`: `local`
-   - ~~`KodemyNotificationApplication`: `local`~~
-   - `KodemySearchApplication`: `local`
+    - `KodemyAuthApplication`: `local`
+    - `KodemyBackendApplication`: `local`
+    - `KodemyGatewayApplication`: `local`
+    - ~~`KodemyNotificationApplication`: `local`~~
+    - `KodemySearchApplication`: `local`
 
 6. Once the project is running, you can access the API documentation (OpenAPI v3) for almost all microservices:
 
@@ -54,7 +55,8 @@ Before you can run the project, you will need the following applications:
 
 ### RabbitMQ
 
-To access the RabbitMQ management UI, go to [http://localhost:15672](http://localhost:15672) with the following credentials:
+To access the RabbitMQ management UI, go to [http://localhost:15672](http://localhost:15672) with the following
+credentials:
 
 - **Username:** rabbitmq
 - **Password:** rabbitmq

kodemy-commons/build.gradle → commons/build.gradle

@@ -55,4 +55,8 @@ dependencies {
 
 tasks.named('test') {
     useJUnitPlatform()
+}
+
+bootJar {
+    enabled = false
 }

commons/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'commons'

kodemy-commons/src/main/java/pl/sknikod/kodemycommons/exception/content/ExceptionUtil.java → commons/src/main/java/pl/sknikod/kodemycommons/exception/content/ExceptionUtil.java

@@ -12,7 +12,7 @@ public static RuntimeException throwIfFailure(Throwable throwable) {
         return getRuntimeOrDefault(throwable, new InternalError500Exception());
     }
 
-    public static RuntimeException throwIfFailure(Throwable throwable, String pattern, Object ...args) {
+    public static RuntimeException throwIfFailure(Throwable throwable, String pattern, Object... args) {
         return getRuntimeOrDefault(throwable, new InternalError500Exception(pattern, args));
     }
 }

kodemy-commons/src/main/java/pl/sknikod/kodemycommons/security/AuthFacade.java → commons/src/main/java/pl/sknikod/kodemycommons/security/AuthFacade.java

@@ -10,13 +10,12 @@
 
 import java.security.Principal;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class AuthFacade {
-    private static SecurityContext getContext(){
+    private static SecurityContext getContext() {
         return SecurityContextHolder.getContext();
     }
 
@@ -60,7 +59,7 @@ public static Authentication setAuthentication(Authentication authentication) {
         return setAuthentication(authentication, false);
     }
 
-    public static boolean hasAnyAuthority(String... authorities){
+    public static boolean hasAnyAuthority(String... authorities) {
         List<String> authorityList = Arrays.asList(authorities);
         return getAuthentication()
                 .map(Authentication::getAuthorities)
@@ -70,7 +69,7 @@ public static boolean hasAnyAuthority(String... authorities){
                 .isPresent();
     }
 
-    public static boolean hasAuthority(String authority){
+    public static boolean hasAuthority(String authority) {
         return hasAnyAuthority(authority);
     }
 }

config/opensearch-security/config.yml

@@ -75,7 +75,7 @@ config:
         #internalProxies: '.*' # trust all internal proxies, regex pattern
         #remoteIpHeader:  'x-forwarded-for'
     authc:
-      basic_internal_auth_domain:  # <- Settings for Basic authentication
+      basic_internal_auth_domain: # <- Settings for Basic authentication
         description: "Authenticate via HTTP Basic against internal users database"
         http_enabled: true
         transport_enabled: true

config/opensearch.yml

@@ -5,7 +5,7 @@ cluster.name: kodemy-os-cluster
 node.name: kodemy-os-n1
 
 # Comma-separated list of hostnames or IP addresses of nodes in the cluster
-discovery.seed_hosts: ["kodemy-os-n1"]
+discovery.seed_hosts: [ "kodemy-os-n1" ]
 
 # Discovery type for single-node configuration
 discovery.type: single-node

kodemy-api-gateway/build.gradle

@@ -33,6 +33,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

kodemy-api-gateway/src/main/java/pl/sknikod/kodemygateway/KodemyGatewayApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
+@EnableDiscoveryClient
 public class KodemyGatewayApplication {
 
     public static void main(String[] args) {

kodemy-api-gateway/src/main/resources/application-local.yml

@@ -16,4 +16,9 @@ app:
   security:
     cors:
       allowed-origins:
-        - ${network.route.front}
+        - ${network.route.front}
+
+eureka:
+  client:
+    service-url:
+      defaultZone: ${EUREKA_URL}

kodemy-api-gateway/src/main/resources/application.yml

@@ -4,49 +4,26 @@ spring:
   cloud:
     gateway:
       routes:
+        - id: auth
+          uri: lb://kodemy-auth
+          predicates:
+            - Path=/api/auth/**,/api/users/**,/api/roles/**
+        - id: notification
+          uri: lb://kodemy-notification
+          predicates:
+            - Path=/api/notification/**
         - id: oauth2_auth
           uri: ${network.route.auth}
           predicates:
             - Path=/api/oauth2/**,/api/auth/**,/api/logout
-
-        - id: search-materials
-          uri: ${network.route.search}
+        - id: search
+          uri: lb://kodemy-search
           predicates:
             - Path=/api/materials
-            - Method=GET
-
-        - id: materials-get
-          uri: ${network.route.backend}
-          predicates:
-            - Path=/api/materials/{materialId}/**
-            - Method=GET
-
-        - id: materials-post
-          uri: ${network.route.backend}
-          predicates:
-            - Path=/api/materials
-            - Method=POST
-
-        - id: materials-grades
-          uri: ${network.route.backend}
-          predicates:
-            - Path=/api/materials/{materialId}/grades
-            - Method=POST
-
-        - id: users-materials
-          uri: ${network.route.auth}
-          predicates:
-            - Path=/api/users/{userId}/materials
-
-        - id: users_roles
-          uri: ${network.route.auth}
-          predicates:
-            - Path=/api/users/**,/api/roles
-
-        - id: tags_types_sections_categories_admin
-          uri: ${network.route.backend}
+        - id: backend
+          uri: lb://kodemy-backend
           predicates:
-            - Path=/api/tags,/api/types,/api/sections,/api/categories/{categoryId},/api/admin/**
+            - Path=/api/**
 
 management:
   endpoints:
@@ -66,7 +43,6 @@ management:
 
 network:
   route:
-    front: ${FRONTEND_PUBLIC_HOST}
     auth: http://kodemy-auth:8080
     backend: http://kodemy-backend:8080
     search: http://kodemy-search:8080

kodemy-auth/build.gradle

@@ -4,6 +4,10 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.5'
 }
 
+ext {
+    springCloudVersion = "2023.0.3"
+}
+
 group = 'pl.sknikod'
 
 java {
@@ -51,7 +55,8 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.12.6'
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
-    implementation 'pl.sknikod:kodemy-commons:1.1'
+    implementation("pl.sknikod:commons")
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
     annotationProcessor 'org.projectlombok:lombok'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
@@ -73,6 +78,12 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"
+    }
+}
+
 tasks.named('test') {
     useJUnitPlatform()
 }

kodemy-auth/settings.gradle

@@ -1 +1,2 @@
 rootProject.name = 'kodemy-auth'
+includeBuild("../commons")

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/KodemyAuthApplication.java

@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
 @OpenAPIDefinition(
@@ -28,6 +29,7 @@
                 bearerFormat = "JWT"
         )
 })
+@EnableDiscoveryClient
 public class KodemyAuthApplication {
 
     public static void main(String[] args) {

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/configuration/LogbookConfiguration.java

@@ -7,7 +7,7 @@
 @Configuration
 public class LogbookConfiguration {
     @Bean
-    public Logbook logbook(){
+    public Logbook logbook() {
         return Logbook.create();
     }
 }

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/configuration/WebConfiguration.java

@@ -2,20 +2,14 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Configuration
 @Slf4j
@@ -29,4 +23,10 @@ public static class LanNetworkProperties {
         private int connectTimeoutMs;
         private int readTimeoutMs;
     }
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/infrastructure/dao/RefreshTokenDao.java

@@ -6,8 +6,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import pl.sknikod.kodemyauth.infrastructure.database.RefreshToken;
-import pl.sknikod.kodemyauth.infrastructure.database.User;
 import pl.sknikod.kodemyauth.infrastructure.database.RefreshTokenRepository;
+import pl.sknikod.kodemyauth.infrastructure.database.User;
 import pl.sknikod.kodemyauth.infrastructure.database.UserRepository;
 import pl.sknikod.kodemycommons.exception.InternalError500Exception;
 import pl.sknikod.kodemycommons.exception.NotFound404Exception;

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/infrastructure/dao/UserDao.java

@@ -8,11 +8,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
 import pl.sknikod.kodemyauth.configuration.SecurityConfiguration;
-import pl.sknikod.kodemyauth.infrastructure.database.Provider;
-import pl.sknikod.kodemyauth.infrastructure.database.Role;
-import pl.sknikod.kodemyauth.infrastructure.database.User;
-import pl.sknikod.kodemyauth.infrastructure.database.RoleRepository;
-import pl.sknikod.kodemyauth.infrastructure.database.UserRepository;
+import pl.sknikod.kodemyauth.infrastructure.database.*;
 import pl.sknikod.kodemyauth.infrastructure.module.oauth2.provider.OAuth2Provider;
 import pl.sknikod.kodemycommons.exception.InternalError500Exception;
 import pl.sknikod.kodemycommons.exception.NotFound404Exception;

kodemy-auth/src/main/java/pl/sknikod/kodemyauth/infrastructure/database/PermissionRepository.java

@@ -3,4 +3,4 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PermissionRepository extends JpaRepository<Permission, Long> {
-  }
+}