Spaces:

sarvenyanik
/

artandscience-gateway-test

Running

App Files Files Community

sarvenyanik commited on Jul 13

Commit

c024db0

2 Parent(s): 8af18fa f79798d

Merged in feature/sarvendev (pull request #28)

Browse files

Files changed (6) hide show

src/main/java/com/artandscience/gateway/gateway/api/GatewayRootController.java +22 -8
src/main/java/com/artandscience/gateway/gateway/common/helper/SecurityHelper.java +4 -12
src/main/java/com/artandscience/gateway/gateway/constant/HeaderConstant.java +4 -1
src/main/java/com/artandscience/gateway/gateway/filter/AuthFilter.java +11 -7
src/main/java/com/artandscience/gateway/gateway/model/GetUserResponse.java +2 -1
src/main/resources/url-config/url-config.yml +4 -0

src/main/java/com/artandscience/gateway/gateway/api/GatewayRootController.java CHANGED Viewed

@@ -1,21 +1,35 @@
 package com.artandscience.gateway.gateway.api;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
-import java.util.Map;
 @RestController
 public class GatewayRootController {
-    @GetMapping("/")
-    public Mono<ResponseEntity<Map<String, String>>> root() {
-        return Mono.just(ResponseEntity.ok(Map.of(
-                "service", "artandscience-gateway",
-                "status", "UP"
-        )));
     }
     @GetMapping("/favicon.ico")

 package com.artandscience.gateway.gateway.api;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
 @RestController
 public class GatewayRootController {
+    @GetMapping(value = "/", produces = MediaType.TEXT_HTML_VALUE)
+    public Mono<ResponseEntity<String>> root() {
+        String html = """
+                <html>
+                    <body>
+                        <h3>Artandscience Gateway is running</h3>
+                        <p>Status: UP</p>
+                    </body>
+                </html>
+                """;
+        return Mono.just(ResponseEntity.ok()
+                .contentType(MediaType.TEXT_HTML)
+                .body(html));
+    }
+    @GetMapping(value = "/ping", produces = MediaType.TEXT_PLAIN_VALUE)
+    public Mono<ResponseEntity<String>> ping() {
+        return Mono.just(ResponseEntity.ok()
+                .contentType(MediaType.TEXT_PLAIN)
+                .body("gateway is running"));
     }
     @GetMapping("/favicon.ico")

src/main/java/com/artandscience/gateway/gateway/common/helper/SecurityHelper.java CHANGED Viewed

@@ -3,30 +3,19 @@ package com.artandscience.gateway.gateway.common.helper;
 import com.artandscience.gateway.gateway.constant.HeaderConstant;
 import com.artandscience.gateway.gateway.model.GetUserResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpCookie;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
-import static com.artandscience.gateway.gateway.constant.Constants.ART_SCIENCE_SESSION_ID;
 import static com.artandscience.gateway.gateway.constant.Constants.BEARER;
 @Component
 @Slf4j
 public class SecurityHelper {
-    public static String getSessionId(ServerWebExchange exchange) {
-        return Optional.ofNullable(exchange.getRequest()
-                        .getCookies()
-                        .getFirst(ART_SCIENCE_SESSION_ID))
-                .map(HttpCookie::getValue)
-                .orElse(null);
-    }
     public static ServerHttpRequest getMutatedRequest(ServerWebExchange exchange,
                                                       String token,
                                                       String role,
@@ -37,15 +26,18 @@ public class SecurityHelper {
                 .header(HeaderConstant.HEADER_AUTHORIZATION, BEARER + token)
                 .header(HeaderConstant.HEADER_USER_ROLE, role != null ? role : "")
                 .header(HeaderConstant.HEADER_SESSION_ID, sessionId)
-                .header(HeaderConstant.HEADER_CUSTOMER_NAME, getUserResponse.getCustomerNumber())
                 .header(HeaderConstant.HEADER_CUSTOMER_SURNAME, getUserResponse.getSurname())
                 .header(HeaderConstant.HEADER_CUSTOMER_NUMBER, getUserResponse.getCustomerNumber())
                 .header(HeaderConstant.HEADER_PHONE_NUMBER, getUserResponse.getPhoneNumber())
                 .header(HeaderConstant.HEADER_EMAIL, getUserResponse.getEmail())
                 .header(HeaderConstant.HEADER_PERMISSIONS, !Objects.isNull(getUserResponse.getPermissions()) ?
                         getUserResponse.getPermissions().stream()
                                 .collect(Collectors.joining(",", "[", "]")) : "[]")
                 .header(HeaderConstant.HEADER_REQUEST_FLOW_ID, requestFlowId)
                 .build();
     }

 import com.artandscience.gateway.gateway.constant.HeaderConstant;
 import com.artandscience.gateway.gateway.model.GetUserResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import static com.artandscience.gateway.gateway.constant.Constants.BEARER;
 @Component
 @Slf4j
 public class SecurityHelper {
     public static ServerHttpRequest getMutatedRequest(ServerWebExchange exchange,
                                                       String token,
                                                       String role,
                 .header(HeaderConstant.HEADER_AUTHORIZATION, BEARER + token)
                 .header(HeaderConstant.HEADER_USER_ROLE, role != null ? role : "")
                 .header(HeaderConstant.HEADER_SESSION_ID, sessionId)
+                .header(HeaderConstant.HEADER_CUSTOMER_NAME, getUserResponse.getName())
                 .header(HeaderConstant.HEADER_CUSTOMER_SURNAME, getUserResponse.getSurname())
                 .header(HeaderConstant.HEADER_CUSTOMER_NUMBER, getUserResponse.getCustomerNumber())
                 .header(HeaderConstant.HEADER_PHONE_NUMBER, getUserResponse.getPhoneNumber())
                 .header(HeaderConstant.HEADER_EMAIL, getUserResponse.getEmail())
+                .header(HeaderConstant.HEADER_BIRTHDATE, getUserResponse.getBirthday())
+                .header(HeaderConstant.HEADER_FIRST_LOGIN, getUserResponse.getIsFirstLogin())
                 .header(HeaderConstant.HEADER_PERMISSIONS, !Objects.isNull(getUserResponse.getPermissions()) ?
                         getUserResponse.getPermissions().stream()
                                 .collect(Collectors.joining(",", "[", "]")) : "[]")
                 .header(HeaderConstant.HEADER_REQUEST_FLOW_ID, requestFlowId)
+                .header(HeaderConstant.HEADER_IS_ONLINE, "1")
                 .build();
     }

src/main/java/com/artandscience/gateway/gateway/constant/HeaderConstant.java CHANGED Viewed

@@ -7,7 +7,7 @@ public class HeaderConstant {
     public static String HEADER_LANGUAGE = "x-language";
     public static String HEADER_DEVICE_APP_NAME = "x-device-app-name";
     public static String HEADER_DEVICE_APP_VERSION = "x-device-app-version";
-    public static String HEADER_DEVICE_APP_ID = "x-device-app-id";
     public static String HEADER_SESSION_ID = "x-b3-session-id";
     public static String HEADER_USER_ROLE = "x-user-role";
     public static String HEADER_CORRELATION_ID = "x-correlation-id";
@@ -19,5 +19,8 @@ public class HeaderConstant {
     public static String HEADER_AUTHORIZATION = "Authorization";
     public static String HEADER_PERMISSIONS = "x-customer-permissions";
     public static String HEADER_REQUEST_FLOW_ID = "x-request-flow-id";
 }

     public static String HEADER_LANGUAGE = "x-language";
     public static String HEADER_DEVICE_APP_NAME = "x-device-app-name";
     public static String HEADER_DEVICE_APP_VERSION = "x-device-app-version";
+    public static String HEADER_DEVICE_ID = "x-device-id";
     public static String HEADER_SESSION_ID = "x-b3-session-id";
     public static String HEADER_USER_ROLE = "x-user-role";
     public static String HEADER_CORRELATION_ID = "x-correlation-id";
     public static String HEADER_AUTHORIZATION = "Authorization";
     public static String HEADER_PERMISSIONS = "x-customer-permissions";
     public static String HEADER_REQUEST_FLOW_ID = "x-request-flow-id";
+    public static String HEADER_BIRTHDATE = "x-customer-birthdate";
+    public static String HEADER_FIRST_LOGIN = "x-customer-first-login";
+    public static String HEADER_IS_ONLINE = "x-customer-is-online";
 }

src/main/java/com/artandscience/gateway/gateway/filter/AuthFilter.java CHANGED Viewed

@@ -13,11 +13,15 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 import static com.artandscience.gateway.gateway.constant.Constants.URL_ATTR;
 @Component
@@ -30,17 +34,21 @@ public class AuthFilter implements GlobalFilter, Ordered {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         UrlMapping url = exchange.getAttribute(URL_ATTR);
         if (!url.isTokenRequired()) {
             String requestFlowId = providerFilter.filter(url, sessionService);
             ServerHttpRequest mutatedRequest = exchange.getRequest()
                     .mutate()
                     .header(HeaderConstant.HEADER_REQUEST_FLOW_ID, requestFlowId)
                     .build();
             return chain.filter(exchange.mutate().request(mutatedRequest).build());
         }
-        String sessionId = SecurityHelper.getSessionId(exchange);
         String jsonSession = sessionService.getSession(sessionId, String.class,true);
@@ -58,9 +66,9 @@ public class AuthFilter implements GlobalFilter, Ordered {
             String role = (String) decodedToken.getClaims().get("role");
             var user = loginSession.getGetUserResponse();
-            String requestFlowId = providerFilter.filter(url, sessionService);
-            ServerHttpRequest mutatedRequest = SecurityHelper.getMutatedRequest(exchange,token,role,sessionId, user, requestFlowId);
             return chain.filter(exchange.mutate().request(mutatedRequest).build());
         } catch (FirebaseAuthException e) {
             exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -69,10 +77,6 @@ public class AuthFilter implements GlobalFilter, Ordered {
     }
-    private String getHeader(ServerHttpRequest request, String key) {
-        return request.getHeaders().getFirst(key);
-    }
     @Override
     public int getOrder() {
         return -1;

 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
+import java.util.Objects;
 import static com.artandscience.gateway.gateway.constant.Constants.URL_ATTR;
 @Component
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         UrlMapping url = exchange.getAttribute(URL_ATTR);
+        String deviceId = exchange.getRequest().getHeaders().getFirst(HeaderConstant.HEADER_DEVICE_ID);
         if (!url.isTokenRequired()) {
+            String sessionId = sessionService.getSession(deviceId,String.class,true);
             String requestFlowId = providerFilter.filter(url, sessionService);
             ServerHttpRequest mutatedRequest = exchange.getRequest()
                     .mutate()
+                    .header(HeaderConstant.HEADER_IS_ONLINE, Objects.isNull(sessionId) ? "0" : "1")
                     .header(HeaderConstant.HEADER_REQUEST_FLOW_ID, requestFlowId)
                     .build();
             return chain.filter(exchange.mutate().request(mutatedRequest).build());
         }
+        String sessionId = sessionService.getSession(deviceId,String.class,true);
         String jsonSession = sessionService.getSession(sessionId, String.class,true);
             String role = (String) decodedToken.getClaims().get("role");
             var user = loginSession.getGetUserResponse();
+            //String requestFlowId = providerFilter.filter(url, sessionService);
+            ServerHttpRequest mutatedRequest = SecurityHelper.getMutatedRequest(exchange,token,role,sessionId, user, "");
             return chain.filter(exchange.mutate().request(mutatedRequest).build());
         } catch (FirebaseAuthException e) {
             exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
     }
     @Override
     public int getOrder() {
         return -1;

src/main/java/com/artandscience/gateway/gateway/model/GetUserResponse.java CHANGED Viewed

@@ -24,5 +24,6 @@ public class GetUserResponse implements Serializable {
     private String email;
     private String customerNumber;
     private List<String> permissions;
 }

     private String email;
     private String customerNumber;
     private List<String> permissions;
+    private String birthday;
+    private String isFirstLogin;
 }

src/main/resources/url-config/url-config.yml CHANGED Viewed

@@ -33,6 +33,10 @@ services:
       tokenRequired: true
       scopes: diamond
   utility-service:
     - path: /utility-service/api/v1/menu/getMenuByRole
       method: POST
       tokenRequired: true

       tokenRequired: true
       scopes: diamond
   utility-service:
+    - path: /utility-service/api/v1/main/lead-message-campaign
+      method: POST
+      tokenRequired: true
+      scopes: user,admin
     - path: /utility-service/api/v1/menu/getMenuByRole
       method: POST
       tokenRequired: true