Skip to content

feat(controllers): Migrate server annotations to attributes #9377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Apr 26, 2023
Merged

feat(controllers): Migrate server annotations to attributes #9377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ac5d00
feat(controllers): Migrate server annotations to attributes
nickvergessen Apr 25, 2023
092b5aa
fix(deps): Bump nextcloud/ocp dependency
nickvergessen Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 8 additions & 14 deletions lib/Controller/AvatarController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
use OCA\Talk\Service\AvatarService;
use OCA\Talk\Service\RoomFormatter;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\Response;
Expand All @@ -53,9 +55,7 @@ public function __construct(
parent::__construct($appName, $request);
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireModeratorParticipant]
public function uploadAvatar(): DataResponse {
try {
Expand All @@ -78,10 +78,8 @@ public function uploadAvatar(): DataResponse {
}
}

/**
* @PublicPage
* @NoCSRFRequired
*/
#[PublicPage]
#[NoCSRFRequired]
#[RequireParticipant]
public function getAvatar(bool $darkTheme = false): Response {
$file = $this->avatarService->getAvatar($this->getRoom(), $this->userSession->getUser(), $darkTheme);
Expand All @@ -93,18 +91,14 @@ public function getAvatar(bool $darkTheme = false): Response {
return $response;
}

/**
* @PublicPage
* @NoCSRFRequired
*/
#[PublicPage]
#[NoCSRFRequired]
#[RequireParticipant]
public function getAvatarDark(): Response {
return $this->getAvatar(true);
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireModeratorParticipant]
public function deleteAvatar(): DataResponse {
$this->avatarService->deleteAvatar($this->getRoom());
Expand Down
37 changes: 10 additions & 27 deletions lib/Controller/BreakoutRoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use OCA\Talk\Service\ParticipantService;
use OCA\Talk\Service\RoomFormatter;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\Comments\MessageTooLongException;
use OCP\IRequest;
Expand All @@ -49,9 +50,7 @@ public function __construct(
parent::__construct($appName, $request);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function configureBreakoutRooms(int $mode, int $amount, string $attendeeMap = '[]'): DataResponse {
try {
Expand All @@ -64,9 +63,7 @@ public function configureBreakoutRooms(int $mode, int $amount, string $attendeeM
return new DataResponse($this->formatMultipleRooms($rooms), Http::STATUS_OK);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function removeBreakoutRooms(): DataResponse {
$this->breakoutRoomService->removeBreakoutRooms($this->room);
Expand All @@ -79,9 +76,7 @@ public function removeBreakoutRooms(): DataResponse {
));
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function broadcastChatMessage(string $message): DataResponse {
try {
Expand All @@ -95,9 +90,7 @@ public function broadcastChatMessage(string $message): DataResponse {
return new DataResponse($this->formatMultipleRooms($rooms), Http::STATUS_CREATED);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function applyAttendeeMap(string $attendeeMap): DataResponse {
try {
Expand All @@ -109,9 +102,7 @@ public function applyAttendeeMap(string $attendeeMap): DataResponse {
return new DataResponse($this->formatMultipleRooms($rooms), Http::STATUS_OK);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInParticipant]
public function requestAssistance(): DataResponse {
try {
Expand All @@ -128,9 +119,7 @@ public function requestAssistance(): DataResponse {
));
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInParticipant]
public function resetRequestForAssistance(): DataResponse {
try {
Expand All @@ -147,9 +136,7 @@ public function resetRequestForAssistance(): DataResponse {
));
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function startBreakoutRooms(): DataResponse {
try {
Expand All @@ -162,9 +149,7 @@ public function startBreakoutRooms(): DataResponse {
return new DataResponse($this->formatMultipleRooms($rooms), Http::STATUS_OK);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInModeratorParticipant]
public function stopBreakoutRooms(): DataResponse {
try {
Expand All @@ -177,9 +162,7 @@ public function stopBreakoutRooms(): DataResponse {
return new DataResponse($this->formatMultipleRooms($rooms), Http::STATUS_OK);
}

/**
* @NoAdminRequired
*/
#[NoAdminRequired]
#[RequireLoggedInParticipant]
public function switchBreakoutRoom(string $target): DataResponse {
try {
Expand Down
20 changes: 6 additions & 14 deletions lib/Controller/CallController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
use OCA\Talk\Service\ParticipantService;
use OCA\Talk\Service\RoomService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IRequest;
Expand All @@ -64,9 +65,7 @@ public function __construct(
$this->timeFactory = $timeFactory;
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireCallEnabled]
#[RequireModeratorOrNoLobby]
#[RequireParticipant]
Expand Down Expand Up @@ -104,9 +103,7 @@ public function getPeersForCall(): DataResponse {
return new DataResponse($result);
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireCallEnabled]
#[RequireModeratorOrNoLobby]
#[RequireParticipant]
Expand All @@ -133,9 +130,7 @@ public function joinCall(?int $flags = null, ?int $forcePermissions = null, bool
return new DataResponse();
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireCallEnabled]
#[RequireParticipant]
#[RequirePermission(permission: RequirePermission::START_CALL)]
Expand All @@ -155,9 +150,7 @@ public function ringAttendee(int $attendeeId): DataResponse {
return new DataResponse();
}

/**
* @PublicPage
*/
#[PublicPage]
#[RequireParticipant]
public function updateCallFlags(int $flags): DataResponse {
$session = $this->participant->getSession();
Expand All @@ -175,11 +168,10 @@ public function updateCallFlags(int $flags): DataResponse {
}

/**
* @PublicPage
*
* @param bool $all whether to also terminate the call for all participants
* @return DataResponse
*/
#[PublicPage]
#[RequireParticipant]
public function leaveCall(bool $all = false): DataResponse {
$session = $this->participant->getSession();
Expand Down
Loading