UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-20 13:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3330 from pixelfed/staging

Browse source 
Update ApiV1Controller, fix apps endpoint
This commit is contained in:
daniel 2022-03-23 17:01:48 -06:00 committed by GitHub
commit 75256acaff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -98,6 +98,7 @@
- Updated ApiV1Controller, fix context entities. ([b1ab41e0](https://github.com/pixelfed/pixelfed/commit/b1ab41e0))
- Updated ApiV1Controller, fix timeline default limit. ([a87f8301](https://github.com/pixelfed/pixelfed/commit/a87f8301))
- Updated ApiV1Controller, fix search v2 entities. ([9dac861e](https://github.com/pixelfed/pixelfed/commit/9dac861e))
- Updated ApiV1Controller, fix apps endpoint. ([50baae52](https://github.com/pixelfed/pixelfed/commit/50baae52))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

8
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -102,9 +102,7 @@ class ApiV1Controller extends Controller
$this->validate($request, [
'client_name' => 'required',
'redirect_uris' => 'required',
'scopes' => 'nullable',
'website' => 'nullable'
'redirect_uris' => 'required'
]);
$uris = implode(',', explode('\n', $request->redirect_uris));
@ -122,11 +120,11 @@ class ApiV1Controller extends Controller
$client->save();
$res = [
'id' => $client->id,
'id' => (string) $client->id,
'name' => $client->name,
'website' => null,
'redirect_uri' => $client->redirect,
'client_id' => $client->id,
'client_id' => (string) $client->id,
'client_secret' => $client->secret,
'vapid_key' => null
];