Fix url test pb

jcheron · jcheron · commit e9a2beba2746 · 2020-05-02T04:42:19.000+02:00
diff --git a/src/Ubiquity/client/oauth/OAuthAdmin.php b/src/Ubiquity/client/oauth/OAuthAdmin.php
@@ -195,7 +195,7 @@ public static function getEnabledProviders() {
 		$actualProviders = self::loadProvidersConfig();
 		foreach ($actualProviders as $name => $config) {
 			if (isset($config['enabled']) && $config['enabled'] === true) {
-				$result[] = $name;
+				$result[strtolower($name)] = $name;
 			}
 		}
 		return $result;
diff --git a/src/Ubiquity/controllers/auth/AbstractOAuthController.php b/src/Ubiquity/controllers/auth/AbstractOAuthController.php
@@ -22,7 +22,8 @@ abstract class AbstractOAuthController extends Controller {
 	protected $provider;
 
 	public function _oauth(string $name) {
-		$link = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . "://{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";
+		$requestURI = trim(strtok($_SERVER["REQUEST_URI"], '?'), '/');
+		$link = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . "://{$_SERVER['HTTP_HOST']}/{$requestURI}";
 		$this->provider = OAuthManager::startAdapter($name, $link);
 		$this->onConnect($name, $this->provider);
 	}

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public static function getEnabledProviders() {`
`195`	`195`	`$actualProviders = self::loadProvidersConfig();`
`196`	`196`	`foreach ($actualProviders as $name => $config) {`
`197`	`197`	`if (isset($config['enabled']) && $config['enabled'] === true) {`
`198`		`- $result[] = $name;`
	`198`	`+ $result[strtolower($name)] = $name;`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ abstract class AbstractOAuthController extends Controller {`
`22`	`22`	`protected $provider;`
`23`	`23`
`24`	`24`	`public function _oauth(string $name) {`
`25`		`- $link = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . "://{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}";`
	`25`	`+ $requestURI = trim(strtok($_SERVER["REQUEST_URI"], '?'), '/');`
	`26`	`+ $link = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . "://{$_SERVER['HTTP_HOST']}/{$requestURI}";`
`26`	`27`	`$this->provider = OAuthManager::startAdapter($name, $link);`
`27`	`28`	`$this->onConnect($name, $this->provider);`
`28`	`29`	`}`