Merge pull request #158 from Sachintechjoomla/Bug#213483

Bug #213483 Fixed: JT App: All event API not working

Author: ankush-maherwal

code/site/libraries/authentication.php

@@ -189,12 +189,14 @@ public static function getCom_apiVersion()
 	 */
 	private static function getAuthMethod()
 	{
+		$app = Factory::getApplication();
+		$key = $app->input->get('key');
 
 		if (isset($_SERVER['HTTP_X_AUTH']) && $_SERVER['HTTP_X_AUTH'])
 		{
 			$authMethod = $_SERVER['HTTP_X_AUTH'];
 		}
-		elseif (self::getBearerToken())
+		elseif ($key || self::getBearerToken())
 		{
 			$authMethod = 'key';
 		}

code/site/libraries/authentication/key.php

@@ -33,6 +33,13 @@ class ApiAuthenticationKey extends ApiAuthentication
 	public function authenticate()
 	{		 
 		$header_token = $this->getBearerToken(); 
+
+		if (!$header_token)
+		{
+			$app = Factory::getApplication();
+			$header_token = $app->input->get('key');
+		}
+
 		$token        = $this->loadTokenByHash($header_token);
 
 		if (isset($token->state) && $token->state == 1)