[fix] 에러 처리 위치 바꿈

Mojacknong · Oct 27, 2023 · 4290f53 · 4290f53
1 parent 515d39f
commit 4290f53
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,7 +9,7 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "feature_4/에러-수정" ]
   pull_request:
     branches: [ "dev" ]
 

diff --git a/src/main/java/com/example/farmusgateway/filter/JwtAuthenticationGatewayFilterFactory.java b/src/main/java/com/example/farmusgateway/filter/JwtAuthenticationGatewayFilterFactory.java
@@ -41,6 +41,19 @@ public GatewayFilter apply(Config config) {
             String jwt = authorizationHeader.replace("Bearer ", "");
             log.info("jwt : {}", jwt);
 
+            if(!request.getHeaders().containsKey(HttpHeaders.AUTHORIZATION)) {
+                return onError(exchange, "no authorization header", HttpStatus.UNAUTHORIZED);
+            }
+
+            if(!isJwtValid(jwt, exchange)) {
+                return onError(exchange, "JWT token is not valid", HttpStatus.UNAUTHORIZED);
+            }
+
+            // 헤더 출력
+            request.getHeaders().forEach((k, v) -> {
+                log.info("{} : {}", k, v);
+            });
+
             String subject = decode(jwt);
             request.mutate()
                     .header("user", subject)
@@ -58,18 +71,7 @@ public GatewayFilter apply(Config config) {
                 return chain.filter(exchange);
             }
 
-            if(!request.getHeaders().containsKey(HttpHeaders.AUTHORIZATION)) {
-                return onError(exchange, "no authorization header", HttpStatus.UNAUTHORIZED);
-            }
-
-            if(!isJwtValid(jwt, exchange)) {
-                return onError(exchange, "JWT token is not valid", HttpStatus.UNAUTHORIZED);
-            }
 
-            // 헤더 출력
-            request.getHeaders().forEach((k, v) -> {
-                log.info("{} : {}", k, v);
-            });
 
             // Custom Post Filter
             return chain.filter(exchange);