From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 7 Nov 2021 15:45:27 +0000 (-0500)
Subject: [windowsphonepush] Simplify authentication structure
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2bae6a41c39e0431f6dd65365918c8661fd32c6c;p=friendica-addons.git

[windowsphonepush] Simplify authentication structure
---

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index e5295cc3..d2529eea 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -442,20 +442,13 @@ function windowsphonepush_login(App $a)
 
 	try {
 		$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) {
-		$record = [];
-	}
-
-	if (empty($record)) {
 		Logger::info('API_login failure: ' . print_r($_SERVER, true));
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		throw new UnauthorizedException('This api requires login');
 	}
-
-	DI::auth()->setForUser($a, $record);
-	DI::session()->set('allow_api', true);
-	Hook::callAll('logged_in', $record);
 }