From 723e485755d15862c15a9baeee130a8daf48edbc Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 16 Nov 2017 11:27:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=85=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/social/Hybrid/Providers/Facebook.php | 4 ++++ plugin/social/Hybrid/Providers/Naver.php | 5 +++++ plugin/social/Hybrid/Providers/Payco.php | 4 ++++ plugin/social/includes/functions.php | 7 ++++++- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/plugin/social/Hybrid/Providers/Facebook.php b/plugin/social/Hybrid/Providers/Facebook.php index e373476e0..8fd9149a1 100644 --- a/plugin/social/Hybrid/Providers/Facebook.php +++ b/plugin/social/Hybrid/Providers/Facebook.php @@ -35,6 +35,10 @@ class Hybrid_Providers_Facebook extends Hybrid_Provider_Model_OAuth2 { throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4); } + // redirect uri mismatches when authenticating with Facebook. + if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) { + $this->api->redirect_uri = $this->config['redirect_uri']; + } } /** * {@inheritdoc} diff --git a/plugin/social/Hybrid/Providers/Naver.php b/plugin/social/Hybrid/Providers/Naver.php index ac485c0fa..431425b43 100644 --- a/plugin/social/Hybrid/Providers/Naver.php +++ b/plugin/social/Hybrid/Providers/Naver.php @@ -29,6 +29,11 @@ class Hybrid_Providers_Naver extends Hybrid_Provider_Model_OAuth2 $this->api->api_base_url = "https://apis.naver.com/nidlogin/"; $this->api->authorize_url = "https://nid.naver.com/oauth2.0/authorize"; $this->api->token_url = "https://nid.naver.com/oauth2.0/token"; + + // redirect uri mismatches when authenticating with Naver. + if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) { + $this->api->redirect_uri = $this->config['redirect_uri']; + } } /** diff --git a/plugin/social/Hybrid/Providers/Payco.php b/plugin/social/Hybrid/Providers/Payco.php index 5eb5694f4..b23e71a26 100644 --- a/plugin/social/Hybrid/Providers/Payco.php +++ b/plugin/social/Hybrid/Providers/Payco.php @@ -34,6 +34,10 @@ class Hybrid_Providers_Payco extends Hybrid_Provider_Model_OAuth2 { throw new Exception("Your application id and secret are required in order to connect to {$this->providerId}.", 4); } + // redirect uri mismatches when authenticating with Payco. + if (isset($this->config['redirect_uri']) && !empty($this->config['redirect_uri'])) { + $this->api->redirect_uri = $this->config['redirect_uri']; + } } /** * {@inheritdoc} diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php index 34247dbf5..ab0223aea 100644 --- a/plugin/social/includes/functions.php +++ b/plugin/social/includes/functions.php @@ -292,7 +292,8 @@ function social_extends_get_keys($provider){ "enabled" => option_array_checked('naver', $config['cf_social_servicelist']) ? true : false, "keys" => array( "id" => $config['cf_naver_clientid'], - "secret" => $config['cf_naver_secret'] + "secret" => $config['cf_naver_secret'], + "redirect_uri" => get_social_callbackurl('naver'), ), ); @@ -300,6 +301,7 @@ function social_extends_get_keys($provider){ $r['Kakao'] = array( "enabled" => option_array_checked('kakao', $config['cf_social_servicelist']) ? true : false, "keys" => array("id" => $config['cf_kakao_rest_key'], "secret" => $config['cf_kakao_rest_key']), + "redirect_uri" => get_social_callbackurl('kakao') ); // Facebook @@ -307,6 +309,7 @@ function social_extends_get_keys($provider){ "enabled" => option_array_checked('facebook', $config['cf_social_servicelist']) ? true : false, "keys" => array("id" => $config['cf_facebook_appid'], "secret" => $config['cf_facebook_secret']), "display" => "popup", + "redirect_uri" => get_social_callbackurl('facebook'), "trustForwarded" => false ); @@ -324,6 +327,7 @@ function social_extends_get_keys($provider){ $r['Twitter'] = array( "enabled" => option_array_checked('twitter', $config['cf_social_servicelist']) ? true : false, "keys" => array("key" => $config['cf_twitter_key'], "secret" => $config['cf_twitter_secret']), + "redirect_uri" => get_social_callbackurl('twitter'), "trustForwarded" => false ); @@ -331,6 +335,7 @@ function social_extends_get_keys($provider){ $r['Payco'] = array( "enabled" => option_array_checked('payco', $config['cf_social_servicelist']) ? true : false, "keys" => array("id" => $config['cf_payco_clientid'], "secret" => $config['cf_payco_secret']), + "redirect_uri" => get_social_callbackurl('payco'), "trustForwarded" => false ); }