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 5811e3873348861693e8c8fba257f12baa59379e..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,19 +25,31 @@ 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);
+       }
+
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
-               $request = self::getRequest([
+               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',
@@ -51,8 +63,12 @@ class Apps extends BaseApi
                        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'));
                }