Merge branch 'annuh-master'

hybridauth · Oct 29, 2016 · 0cffedb · 0cffedb
2 parents 337aff8 + 67f6d22
commit 0cffedb
Show file tree

Hide file tree

Showing 7 changed files with 295 additions and 6,126 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
     },
     "require": {
         "php": ">=5.2.0",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "facebook/graph-sdk": "^5.4"
     },
     "autoload": {
         "psr-0": {

diff --git a/hybridauth/Hybrid/Provider_Adapter.php b/hybridauth/Hybrid/Provider_Adapter.php
@@ -168,7 +168,12 @@ function login() {
 		if ($this->id=="Live") { 
 			$this->params["login_done"] = $HYBRID_AUTH_URL_BASE."live.php"; 
 		}
-
+
+		# Workaround to fix broken callback urls for the Facebook OAuth client
+		if ($this->adapter->useSafeUrls) {
+				$this->params['login_done'] = str_replace('hauth.done', 'hauth_done', $this->params['login_done']);
+		}
+
 		if (isset($this->params["hauth_return_to"])) {
 			Hybrid_Auth::storage()->set("hauth_session.{$this->id}.hauth_return_to", $this->params["hauth_return_to"]);
 		}

diff --git a/hybridauth/Hybrid/Provider_Model.php b/hybridauth/Hybrid/Provider_Model.php
@@ -64,6 +64,9 @@ abstract class Hybrid_Provider_Model {
    */
   public $compressed = false;
 
+    /** @var bool $useSafeUrls Enable this to replace '.' with '_' characters in the callback urls */
+    public $useSafeUrls = false;
+
   /**
    * Common providers adapter constructor
    *