Rename BaseApi->logErrorAndJsonExit to logAndJsonError to better match the functionality

[friendica.git] / src / Module / OAuth / Token.php

diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index 07f9bb8c6355321f3fa9a9205b1162eff3df0428..7e22a88dabff6c588533c7a504d2309caa71e96e 100644 (file)
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -25,10 +25,12 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\User;
 use Friendica\Module\BaseApi;
 use Friendica\Module\Special\HTTPException;
 use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
+use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -71,38 +73,43 @@ class Token extends BaseApi
                        }
                }
 
-               // "client_secret" is required for "client_credentials": https://www.oauth.com/oauth2-servers/access-tokens/client-credentials/
-               if (empty($request['client_id']) || (($request['grant_type'] == 'client_credentials') && empty($request['client_secret']))) {
-                       Logger::warning('Incomplete request data', ['request' => $request]);
-                       DI::mstdnError()->Unauthorized('invalid_client', DI::l10n()->t('Incomplete request data'));
+               if (empty($request['client_id']) || empty($request['client_secret'])) {
+                       $this->logger->warning('Incomplete request data', ['request' => $request]);
+                       $this->logAndJsonError(401, $this->errorFactory->Unauthorized('invalid_client', $this->t('Incomplete request data')));;
                }
 
                $application = OAuth::getApplication($request['client_id'], $request['client_secret'], $request['redirect_uri']);
                if (empty($application)) {
-                       DI::mstdnError()->Unauthorized('invalid_client', DI::l10n()->t('Invalid data or unknown client'));
+                       $this->logAndJsonError(401, $this->errorFactory->Unauthorized('invalid_client', $this->t('Invalid data or unknown client')));
                }
 
                if ($request['grant_type'] == 'client_credentials') {
                        // the "client_credentials" are used as a token for the application itself.
                        // see https://aaronparecki.com/oauth-2-simplified/#client-credentials
                        $token = OAuth::createTokenForUser($application, 0, '');
+                       $me = null;
                } elseif ($request['grant_type'] == 'authorization_code') {
                        // For security reasons only allow freshly created tokens
-                       $condition = ["`redirect_uri` = ? AND `id` = ? AND `code` = ? AND `created_at` > ?",
-                               $request['redirect_uri'], $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')];
+                       $uri = new Uri($request['redirect_uri']);
+                       $condition = [
+                               "`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?",
+                               '%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')
+                       ];
 
-                       $token = DBA::selectFirst('application-view', ['access_token', 'created_at'], $condition);
+                       $token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition);
                        if (!DBA::isResult($token)) {
-                               Logger::notice('Token not found or outdated', $condition);
-                               DI::mstdnError()->Unauthorized();
+                               $this->logger->notice('Token not found or outdated', $condition);
+                               $this->logAndJsonError(401, $this->errorFactory->Unauthorized());
                        }
+                       $owner = User::getOwnerDataById($token['uid']);
+                       $me = $owner['url'];
                } else {
                        Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]);
-                       DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Unsupported or missing grant type'));
+                       $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity($this->t('Unsupported or missing grant type')));
                }
 
-               $object = new \Friendica\Object\Api\Mastodon\Token($token['access_token'], 'Bearer', $application['scopes'], $token['created_at']);
+               $object = new \Friendica\Object\Api\Mastodon\Token($token['access_token'], 'Bearer', $application['scopes'], $token['created_at'], $me);
 
-               System::jsonExit($object->toArray());
+               $this->jsonExit($object->toArray());
        }
 }