From f37cd79cdeac5f79f6b28e29edc5a4d8e53a172c Mon Sep 17 00:00:00 2001
From: bum12ark <bum12ark@gmail.com>
Date: Thu, 17 Mar 2022 19:03:39 +0900
Subject: [PATCH] =?UTF-8?q?fix(owner-api-gateway,=20owner-vue):=20?=
 =?UTF-8?q?=EA=B3=A0=EA=B0=9D=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=99=80=20?=
 =?UTF-8?q?=EC=A0=90=EC=A3=BC=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=8F=99?=
 =?UTF-8?q?=EC=9D=BC=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EC=BF=A0=ED=82=A4=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=94=BD=EC=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 포트가 다르더라도 도메인이 동일할 경우 같은 쿠키를 사용하여 점주 서비스의 도메인을 변경
변경 도메인 :
admin.just-pickup.com
---
 .../filter/AuthorizationHeaderFilter.java                 | 2 --
 .../src/main/resources/application.yml                    | 2 +-
 owner-vue/.env                                            | 8 ++++----
 owner-vue/vue.config.js                                   | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/owner-apigateway-service/src/main/java/com/justpickup/ownerapigatewayservice/filter/AuthorizationHeaderFilter.java b/owner-apigateway-service/src/main/java/com/justpickup/ownerapigatewayservice/filter/AuthorizationHeaderFilter.java
index 42a9778..5192415 100644
--- a/owner-apigateway-service/src/main/java/com/justpickup/ownerapigatewayservice/filter/AuthorizationHeaderFilter.java
+++ b/owner-apigateway-service/src/main/java/com/justpickup/ownerapigatewayservice/filter/AuthorizationHeaderFilter.java
@@ -49,8 +49,6 @@ public class AuthorizationHeaderFilter extends AbstractGatewayFilterFactory<Auth
 
             String subject = jwtTokenProvider.getUserId(token);
 
-            if (subject.equals("feign")) return chain.filter(exchange);
-
             if (false == jwtTokenProvider.getRoles(token).contains("StoreOwner")) {
                 return onError(exchange, "권한 없음", HttpStatus.UNAUTHORIZED);
             }
diff --git a/owner-apigateway-service/src/main/resources/application.yml b/owner-apigateway-service/src/main/resources/application.yml
index c7fbc31..8a3b563 100644
--- a/owner-apigateway-service/src/main/resources/application.yml
+++ b/owner-apigateway-service/src/main/resources/application.yml
@@ -31,7 +31,7 @@ spring:
       globalcors:
         cors-configurations:
           '[/**]':
-            allowedOrigins: "http://just-pickup.com:8081"
+            allowedOrigins: "http://admin.just-pickup.com:8081"
             allowedMethods:
               - GET
               - POST
diff --git a/owner-vue/.env b/owner-vue/.env
index 2596d51..d1d2cc9 100644
--- a/owner-vue/.env
+++ b/owner-vue/.env
@@ -1,5 +1,5 @@
-VUE_APP_OWNER_SERVICE_BASEURL=http://just-pickup.com:8001
-VUE_APP_USER_URL=http://just-pickup.com:8001/user-service
+VUE_APP_OWNER_SERVICE_BASEURL=http://admin.just-pickup.com:8001
+VUE_APP_USER_URL=http://admin.just-pickup.com:8001/user-service
 
-VUE_APP_USER_AUTH_URL=http://just-pickup.com:8001/user-service/auth
-VUE_APP_API_URL=http://just-pickup.com:8001/order-service/api/owner
\ No newline at end of file
+VUE_APP_USER_AUTH_URL=http://admin.just-pickup.com:8001/user-service/auth
+VUE_APP_API_URL=http://admin.just-pickup.com:8001/order-service/api/owner
\ No newline at end of file
diff --git a/owner-vue/vue.config.js b/owner-vue/vue.config.js
index 8e73031..7ffe15e 100644
--- a/owner-vue/vue.config.js
+++ b/owner-vue/vue.config.js
@@ -3,6 +3,6 @@ module.exports = {
     'vuetify'
   ],
   devServer:{
-    allowedHosts: ['just-pickup.com'],
+    allowedHosts: ['admin.just-pickup.com'],
   }
 }