Merge pull request #13176 from MrPetovan/bug/warnings

[friendica.git] / src / Module / Api / Mastodon / Apps.php

diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index a86d5cc9938974e86aa5175bbfdfe9159a0d9005..40314a1149370ae3c2f3a5bd90485c6b6bea8a5a 100644 (file)
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,44 +25,76 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
+use Friendica\Module\Special\HTTPException;
+use Friendica\Util\Network;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Apps class to register new OAuth clients
+ * @see https://docs.joinmastodon.org/methods/apps/#create
  */
 class Apps extends BaseApi
 {
+       public function run(HTTPException $httpException, array $request = [], bool $scopecheck = true): ResponseInterface
+       {
+               return parent::run($httpException, $request, false);
+       }
+
        /**
-        * @param array $parameters
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
-               $name     = !isset($_REQUEST['client_name']) ? '' : $_REQUEST['client_name'];
-               $redirect = !isset($_REQUEST['redirect_uris']) ? '' : $_REQUEST['redirect_uris'];
-               $scopes   = !isset($_REQUEST['scopes']) ? '' : $_REQUEST['scopes'];
-               $website  = !isset($_REQUEST['website']) ? '' : $_REQUEST['website'];
+               if (!empty($request['redirect_uris']) && is_array($request['redirect_uris'])) {
+                       $request['redirect_uris'] = $request['redirect_uris'][0];
+               }
+
+               $request = $this->getRequest([
+                       'client_name'   => '',
+                       'redirect_uris' => '',
+                       'scopes'        => 'read',
+                       'website'       => '',
+               ], $request);
 
-               if (empty($name) || empty($redirect)) {
-                       DI::mstdnError()->RecordNotFound();
+               // Workaround for AndStatus, see issue https://github.com/andstatus/andstatus/issues/538
+               $postdata = Network::postdata();
+               if (!empty($postdata)) {
+                       $postrequest = json_decode($postdata, true);
+                       if (!empty($postrequest) && is_array($postrequest)) {
+                               $request = array_merge($request, $postrequest);
+                       }
+
+                       if (!empty($request['redirect_uris']) && is_array($request['redirect_uris'])) {
+                               $request['redirect_uris'] = $request['redirect_uris'][0];
+                       }       
+               }
+
+               if (empty($request['client_name']) || empty($request['redirect_uris'])) {
+                       DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Missing parameters'));
                }
 
-               $client_id     = base64_encode(openssl_random_pseudo_bytes(32));
+               $client_id     = bin2hex(random_bytes(32));
                $client_secret = bin2hex(random_bytes(32));
 
-               $fields = ['client_id' => $client_id, 'client_secret' => $client_secret, 'name' => $name, 'redirect_uri' => $redirect];
+               $fields = ['client_id' => $client_id, 'client_secret' => $client_secret, 'name' => $request['client_name'], 'redirect_uri' => $request['redirect_uris']];
 
-               if (!empty($scopes)) {
-                       $fields['scopes'] = $scopes;
+               if (!empty($request['scopes'])) {
+                       $fields['scopes'] = $request['scopes'];
                }
 
-               if (!empty($website)) {
-                       $fields['website'] = $website;
+               $fields['read']   = (stripos($request['scopes'], self::SCOPE_READ) !== false);
+               $fields['write']  = (stripos($request['scopes'], self::SCOPE_WRITE) !== false);
+               $fields['follow'] = (stripos($request['scopes'], self::SCOPE_FOLLOW) !== false);
+               $fields['push']   = (stripos($request['scopes'], self::SCOPE_PUSH) !== false);
+
+               if (!empty($request['website'])) {
+                       $fields['website'] = $request['website'];
                }
 
                if (!DBA::insert('application', $fields)) {
-                       DI::mstdnError()->RecordNotFound();
+                       DI::mstdnError()->InternalError();
                }
 
-               System::jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId()));
+               System::jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray());
        }
 }