clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace duplicated authentication code in FKOAuth1 with Session::setAuthenticatedForUser

Browse Source
This commit is contained in:
Hypolite Petovan
2019-10-06 11:17:30 -04:00
parent 7959b9bbed
commit cb4950a3be
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/api.php
View File

@@ -162,6 +162,7 @@ function api_register_func($path, $func, $auth = false, $method = API_METHOD_ANY
* @brief Login API user
*
* @param App $a App
* @throws ForbiddenException
* @throws InternalServerErrorException
* @throws UnauthorizedException
* @hook 'authenticate'
@@ -170,8 +171,6 @@ function api_register_func($path, $func, $auth = false, $method = API_METHOD_ANY
* 'password' => password from login form
* 'authenticated' => return status,
* 'user_record' => return authenticated user record
* @hook 'logged_in'
* array $user logged user record
*/
function api_login(App $a)
{
@@ -182,7 +181,7 @@ function api_login(App $a)
list($consumer, $token) = $oauth1->verify_request($request);
if (!is_null($token)) {
$oauth1->loginUser($token->uid);
Hook::callAll('logged_in', $a->user);
Session::set('allow_api', true);
return;
}
echo __FILE__.__LINE__.__FUNCTION__ . "<pre>";