]> git.mxchange.org Git - friendica.git/commitdiff
Replace Logger with $this->logger in Module OAuth classes
authorArt4 <art4@wlabs.de>
Mon, 13 Jan 2025 11:43:47 +0000 (11:43 +0000)
committerArt4 <art4@wlabs.de>
Mon, 13 Jan 2025 11:43:47 +0000 (11:43 +0000)
src/Module/OAuth/Authorize.php
src/Module/OAuth/Token.php

index 8179bfa886e9743e912182a835ca4ad130bc1dcc..db1ee3b703a1e55de4f1fe2349732d5ec91de352 100644 (file)
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\OAuth;
 
-use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
 use Friendica\Security\OAuth;
@@ -36,18 +35,18 @@ class Authorize extends BaseApi
                ], $request);
 
                if ($request['response_type'] != 'code') {
-                       Logger::warning('Unsupported or missing response type', ['request' => $request]);
+                       $this->logger->warning('Unsupported or missing response type', ['request' => $request]);
                        $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity($this->t('Unsupported or missing response type')));
                }
 
                if (empty($request['client_id']) || empty($request['redirect_uri'])) {
-                       Logger::warning('Incomplete request data', ['request' => $request]);
+                       $this->logger->warning('Incomplete request data', ['request' => $request]);
                        $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity($this->t('Incomplete request data')));
                }
 
                $application = OAuth::getApplication($request['client_id'], $request['client_secret'], $request['redirect_uri']);
                if (empty($application)) {
-                       Logger::warning('An application could not be fetched.', ['request' => $request]);
+                       $this->logger->warning('An application could not be fetched.', ['request' => $request]);
                        $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity());
                }
 
@@ -59,14 +58,14 @@ class Authorize extends BaseApi
 
                $uid = DI::userSession()->getLocalUserId();
                if (empty($uid)) {
-                       Logger::info('Redirect to login');
+                       $this->logger->info('Redirect to login');
                        DI::appHelper()->redirect('login?' . http_build_query(['return_authorize' => $redirect]));
                } else {
-                       Logger::info('Already logged in user', ['uid' => $uid]);
+                       $this->logger->info('Already logged in user', ['uid' => $uid]);
                }
 
                if (!OAuth::existsTokenForUser($application, $uid) && !DI::session()->get('oauth_acknowledge')) {
-                       Logger::info('Redirect to acknowledge');
+                       $this->logger->info('Redirect to acknowledge');
                        DI::appHelper()->redirect('oauth/acknowledge?' . http_build_query(['return_authorize' => $redirect, 'application' => $application['name']]));
                }
 
index 9ce760790bf3a82a4843b7889587db9e2460e30f..6d7f1a3507f04f8ee612f7a554855542ff66c8c1 100644 (file)
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\OAuth;
 
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\BaseApi;
@@ -69,7 +68,7 @@ class Token extends BaseApi
                $grant_type = (string) $request['grant_type'];
 
                if (!in_array($grant_type, ['client_credentials', 'authorization_code'])) {
-                       Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]);
+                       $this->logger->warning('Unsupported or missing grant type', ['request' => $_REQUEST]);
                        $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity($this->t('Unsupported or missing grant type')));
                }