From 992796000b69a41338960dc281643acc9e92ea78 Mon Sep 17 00:00:00 2001
From: liquidjoo <liquidjoo@gmail.com>
Date: Mon, 27 May 2019 11:34:18 +0900
Subject: [PATCH] facebook login testing

---
 .../authorizationserver/config/WebMvcConfig.java   | 14 +++++++-------
 .../config/WebSecurityConfig.java                  |  4 +++-
 .../controller/sso/SsoController.java              | 12 ++++++------
 .../src/main/resources/application.properties      |  8 ++++----
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebMvcConfig.java b/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebMvcConfig.java
index ca973e3..a658dd6 100644
--- a/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebMvcConfig.java
+++ b/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebMvcConfig.java
@@ -16,13 +16,13 @@ import java.util.List;
 @EnableWebSecurity
 public class WebMvcConfig implements WebMvcConfigurer {
 
-//    @Autowired
-//    private UserArgumentResolver userArgumentResolver;
-//
-//    @Override
-//    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-//        resolvers.add(userArgumentResolver);
-//    }
+    @Autowired
+    private UserArgumentResolver userArgumentResolver;
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(userArgumentResolver);
+    }
 
     @Bean
     FilterRegistrationBean forwardedHeaderFilter() {
diff --git a/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebSecurityConfig.java b/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebSecurityConfig.java
index b9695de..e49c83a 100644
--- a/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebSecurityConfig.java
+++ b/authorization-server/src/main/java/io/bluemoon/authorizationserver/config/WebSecurityConfig.java
@@ -79,7 +79,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .authorizeRequests().anyRequest().authenticated()
                 .and()
                 .oauth2Login()
-                .loginPage("/login").permitAll();
+                .loginPage("/login").defaultSuccessUrl("/mk-auth/login/success").permitAll();
+//                .and()
+//                .addFilterBefore(filter, CsrfFilter.class);
 
     }
 
diff --git a/authorization-server/src/main/java/io/bluemoon/authorizationserver/controller/sso/SsoController.java b/authorization-server/src/main/java/io/bluemoon/authorizationserver/controller/sso/SsoController.java
index c326bb5..7b1a43e 100644
--- a/authorization-server/src/main/java/io/bluemoon/authorizationserver/controller/sso/SsoController.java
+++ b/authorization-server/src/main/java/io/bluemoon/authorizationserver/controller/sso/SsoController.java
@@ -81,18 +81,18 @@ public class SsoController {
         return user;
     }
 
-    @GetMapping(value = "/loginSuccess")
+    @GetMapping(value = "/login/success")
     @ResponseBody
     public String loginComplete(@SocialUser User user) {
         System.out.println(user);
         return "kkkkkkkkk";
     }
 
-    @GetMapping(value = "/login/success")
-    @ResponseBody
-    public String test2() {
-        return "kkk";
-    }
+//    @GetMapping(value = "/login/success")
+//    @ResponseBody
+//    public String test2() {
+//        return "kkk";
+//    }
 
 
 
diff --git a/gateway-zuul/src/main/resources/application.properties b/gateway-zuul/src/main/resources/application.properties
index a654138..ac7ad1f 100644
--- a/gateway-zuul/src/main/resources/application.properties
+++ b/gateway-zuul/src/main/resources/application.properties
@@ -7,7 +7,7 @@ zuul.routes.mk2-service.url=http://127.0.0.1:8082
 zuul.routes.mk2-service.sensitive-headers=
 
 zuul.routes.mk2-oauth.path=/mk-auth/**
-zuul.routes.mk2-oauth.url=https://6667b9ff.ngrok.io
+zuul.routes.mk2-oauth.url=https://59a7bc58.ngrok.io
 zuul.routes.mk2-oauth.sensitive-headers=
 #zuul.routes.mk2-oauth.path=/mk2auth/**
 
@@ -18,13 +18,13 @@ security.oauth2.sso.login-path=/login
 
 
 
-security.oauth2.client.access-token-uri=https://6667b9ff.ngrok.io/mk-auth/oauth/token
+security.oauth2.client.access-token-uri=https://59a7bc58.ngrok.io/mk-auth/oauth/token
 
 # /oauth/authorize 요청은 클라이언트가 리소스 서버의 api를 사용하기 위해 사용자(리소스 소유자)에게
 # 권한 위임 동의를 받기 위한 페이지를 출력하는 기능을 수행
-security.oauth2.client.user-authorization-uri=https://6667b9ff.ngrok.io/mk-auth/oauth/authorize
+security.oauth2.client.user-authorization-uri=https://59a7bc58.ngrok.io/mk-auth/oauth/authorize
 
-security.oauth2.resource.user-info-uri=https://6667b9ff.ngrok.io/mk-auth/user
+security.oauth2.resource.user-info-uri=https://59a7bc58.ngrok.io/mk-auth/user
 #security.oauth2.resource.prefer-token-info=false
 
 security.oauth2.client.client-id=system1