upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

feat(OCM-invites): Address review feedback

Browse source 
Codestyle and more ideomatic code

Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Micke Nordin <kano@sunet.se>
This commit is contained in:
Micke Nordin 2025-03-14 09:50:47 +01:00 committed by Micke Nordin
parent 668246d380
commit bf31fa9dc7
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
View file

@ -261,7 +261,9 @@ class RequestHandlerController extends Controller {
if (!$found_for_this_user) {
$response = ['message' => 'Invalid or non existing token', 'error' => true];
$status = Http::STATUS_BAD_REQUEST;
return new JSONResponse($response,$status);
$response = new JSONResponse($response, $status);
$response->throttle();
return $response;
}
if(!$this->trustedServers->isTrustedServer($recipientProvider)) {
$response = ['message' => 'Remote server not trusted', 'error' => true];
@ -283,16 +285,15 @@ class RequestHandlerController extends Controller {
$response = ['userID' => $data['user_id'], 'email' => $sharedFromEmail, 'name' => $sharedFromDisplayName];
$status = Http::STATUS_OK;
$updated = new DateTime("now");
$qb->update('federated_invites f')
->set('f.accepted', $qb->createNamedParameter(true))
->set('f.acceptedAt', $qb->createNamedParameter($updated))
->set('f.recipient_email', $qb->createNamedParameter($email))
->set('f.recipient_name', $qb->createNamedParameter($name))
->set('f.recipient_user_id', $qb->createNamedParameter($userId))
->set('f.recipient_provider', $qb->createNamedParameter($recipientProvider))
$qb->update('federated_invites')
->set('accepted', $qb->createNamedParameter(true))
->set('acceptedAt', $qb->createNamedParameter($updated))
->set('recipient_email', $qb->createNamedParameter($email))
->set('recipient_name', $qb->createNamedParameter($name))
->set('recipient_user_id', $qb->createNamedParameter($userId))
->set('recipient_provider', $qb->createNamedParameter($recipientProvider))
->where($qb->expr()->eq('token', $qb->createNamedParameter($token)));
$result = $qb->executeQuery();
$result->closeCursor();
$qb->executeStatement();
return new JSONResponse($response,$status);
}

12
apps/cloud_federation_api/lib/Migration/Version1015Date202502262004.php
View file

@ -3,7 +3,7 @@
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@ -43,7 +43,7 @@ class Version1015Date202502262004 extends SimpleMigrationStep
]);
$table->addColumn('user_id', Types::STRING, [
'notnull' => false,
'notnull' => true,
'length' => 64,
]);
@ -51,20 +51,20 @@ class Version1015Date202502262004 extends SimpleMigrationStep
// https://saturncloud.io/blog/what-is-the-maximum-length-of-a-url-in-different-browsers/#maximum-url-length-in-different-browsers
// We use the least common denominator, the minimum length supported by browsers
$table->addColumn('recipient_provider', Types::STRING, [
'notnull' => true,
'notnull' => false,
'length' => 2083,
]);
$table->addColumn('recipient_user_id', Types::STRING, [
'notnull' => true,
'notnull' => false,
'length' => 1024,
]);
$table->addColumn('recipient_name', Types::STRING, [
'notnull' => true,
'notnull' => false,
'length' => 1024,
]);
// https://www.directedignorance.com/blog/maximum-length-of-email-address
$table->addColumn('recipient_email', Types::STRING, [
'notnull' => true,
'notnull' => false,
'length' => 320,
]);
$table->addColumn('token', Types::STRING, [