Merge pull request #1206 from MrPetovan/task/deprecated

[windowsphonepush] Simplify authentication structure
pull/1208/head
Michael Vogel 2021-11-07 16:52:48 +01:00 committed by GitHub
commit fb77e3c5ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions

View File

@ -442,20 +442,13 @@ function windowsphonepush_login(App $a)
try { try {
$user_id = User::getIdFromPasswordAuthentication($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW'])); $user_id = User::getIdFromPasswordAuthentication($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
if ($user_id) {
$record = DBA::selectFirst('user', [], ['uid' => $user_id]); $record = DBA::selectFirst('user', [], ['uid' => $user_id]);
} DI::auth()->setForUser($a, $record);
DI::session()->set('allow_api', true);
Hook::callAll('logged_in', $record);
} catch (Exception $ex) { } catch (Exception $ex) {
$record = [];
}
if (empty($record)) {
Logger::info('API_login failure: ' . print_r($_SERVER, true)); Logger::info('API_login failure: ' . print_r($_SERVER, true));
header('WWW-Authenticate: Basic realm="Friendica"'); header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException('This api requires login'); throw new UnauthorizedException('This api requires login');
} }
DI::auth()->setForUser($a, $record);
DI::session()->set('allow_api', true);
Hook::callAll('logged_in', $record);
} }