From 0cbe63bc31add7a41cdfe8c108db07f4f300db96 Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Fri, 15 Apr 2022 19:38:15 +0200 Subject: [PATCH 1/7] feat: Default Presentation added Frontend --- ts/Common/Api.ts | 3 +- ts/Manager/App.scss | 38 +++++++++++++++++++- ts/Manager/EditRoom.tsx | 5 +-- ts/Manager/EditRoomDialog.tsx | 10 +++++- ts/Manager/RoomRow.tsx | 2 +- ts/Manager/SharedPresentationInput.tsx | 48 ++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 ts/Manager/SharedPresentationInput.tsx diff --git a/ts/Common/Api.ts b/ts/Common/Api.ts index 6a2c278..0cac44e 100644 --- a/ts/Common/Api.ts +++ b/ts/Common/Api.ts @@ -45,6 +45,8 @@ export interface Room { cleanLayout: boolean, joinMuted: boolean, running: boolean, + presentationUserId: string, + presentationPath: string | string[] } export interface RoomShare { @@ -178,7 +180,6 @@ class Api { public async updateRoom(room: Room) { const response = await axios.put(this.getUrl(`rooms/${room.id}`), room); - return response.data; } diff --git a/ts/Manager/App.scss b/ts/Manager/App.scss index 7b1f295..9b38895 100644 --- a/ts/Manager/App.scss +++ b/ts/Manager/App.scss @@ -67,6 +67,42 @@ pre { } } +.bbb-presentation-input { + display: flex; + flex-direction: column; + height: min-content; + width: fit-content; + margin-top: 10px; + align-content: flex-start; + + .hidden { + display: none; + } + + p { + display: flex; + justify-content: flex-start; + align-items: center; + + button { + border: 0; + background-color: transparent; + padding: 0; + margin: 5px; + border-radius: 50%; + line-height: 0; + display: inline-block; + justify-self: flex-end; + } + } + + img { + margin: 5px; + height: 32px; + width: auto; + } +} + #bbb-settings { #bbb-warning, #bbb-success { @@ -306,4 +342,4 @@ pre { border: 5px solid #fff; } } -} \ No newline at end of file +} diff --git a/ts/Manager/EditRoom.tsx b/ts/Manager/EditRoom.tsx index 3012a80..736a280 100644 --- a/ts/Manager/EditRoom.tsx +++ b/ts/Manager/EditRoom.tsx @@ -6,9 +6,10 @@ type Props = { room: Room; restriction?: Restriction; updateProperty: (key: string, value: string | boolean | number | null) => Promise; + updateRoom: (Room) => Promise; } -const EditRoom: React.FC = ({ room, restriction, updateProperty }) => { +const EditRoom: React.FC = ({ room, restriction, updateProperty, updateRoom }) => { const [open, setOpen] = useState(false); return ( @@ -18,7 +19,7 @@ const EditRoom: React.FC = ({ room, restriction, updateProperty }) => { - + ); }; diff --git a/ts/Manager/EditRoomDialog.tsx b/ts/Manager/EditRoomDialog.tsx index ba0ff44..6b6d3d2 100644 --- a/ts/Manager/EditRoomDialog.tsx +++ b/ts/Manager/EditRoomDialog.tsx @@ -6,6 +6,7 @@ import Dialog from './Dialog'; import ShareWith from './ShareWith'; import { SubmitInput } from './SubmitInput'; import { AccessOptions } from '../Common/Translation'; +import SharedPresentationInput from './SharedPresentationInput'; const descriptions: { [key: string]: string } = { name: t('bbb', 'Descriptive name of this room.'), @@ -29,11 +30,12 @@ type Props = { room: Room; restriction?: Restriction; updateProperty: (key: string, value: string | boolean | number | null) => Promise; + updateRoom: (Room) => Promise; open: boolean; setOpen: (open: boolean) => void; } -const EditRoomDialog: React.FC = ({ room, restriction, updateProperty, open, setOpen }) => { +const EditRoomDialog: React.FC = ({ room, restriction, updateProperty, open, setOpen, updateRoom }) => { const [shares, setShares] = useState(); const maxParticipantsLimit = (restriction?.maxParticipants || 0) < 0 ? undefined : restriction?.maxParticipants; @@ -226,6 +228,12 @@ const EditRoomDialog: React.FC = ({ room, restriction, updateProperty, op

{descriptions.joinMuted}

+
+
+ + +
+
); diff --git a/ts/Manager/RoomRow.tsx b/ts/Manager/RoomRow.tsx index 40de45b..20b0140 100644 --- a/ts/Manager/RoomRow.tsx +++ b/ts/Manager/RoomRow.tsx @@ -223,7 +223,7 @@ const RoomRow: React.FC = (props) => { - + +

+ + ); +}; + +export default SharedPresentationInput; From 1f1879013c92e7f8d95ece3619eee8fbca510eb4 Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Fri, 15 Apr 2022 19:44:18 +0200 Subject: [PATCH 2/7] feat: Default Presentation added migration --- .../Version000000Date20220413130357.php | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 lib/Migration/Version000000Date20220413130357.php diff --git a/lib/Migration/Version000000Date20220413130357.php b/lib/Migration/Version000000Date20220413130357.php new file mode 100644 index 0000000..47d6711 --- /dev/null +++ b/lib/Migration/Version000000Date20220413130357.php @@ -0,0 +1,72 @@ + + * + * @author Your name + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\BigBlueButton\Migration; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +/** + * Auto-generated migration step: Please modify to your needs! + */ +class Version000000Date20220413130357 extends SimpleMigrationStep +{ + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper + { + + $schema = $schemaClosure(); + + if ($schema->hasTable('bbb_rooms')) { + $table = $schema->getTable('bbb_rooms'); + + if (!$table->hasColumn('presentation_user_id')) { + $table->addColumn('presentation_user_id', 'string', [ + 'notnull' => true, + 'length' => 200, + ]); + } + + if (!$table->hasColumn('presentation_path')) { + $table->addColumn('presentation_path', 'string', [ + 'notnull' => false, + ]); + } + + return $schema; + } + + return null; + } +} From 38da9bda60c4c96d4f413d446f17a7f2afe2fdcc Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Fri, 15 Apr 2022 19:45:27 +0200 Subject: [PATCH 3/7] feat: Default Presentation added backend handling --- lib/BigBlueButton/API.php | 2 +- lib/BigBlueButton/Presentation.php | 20 ++++++++++++---- lib/Controller/JoinController.php | 37 ++++++++++++++++++++++-------- lib/Controller/RoomController.php | 29 ++++++++++++++++++----- lib/Db/Room.php | 4 ++++ lib/Service/RoomService.php | 8 ++++++- 6 files changed, 78 insertions(+), 22 deletions(-) diff --git a/lib/BigBlueButton/API.php b/lib/BigBlueButton/API.php index 2176ca3..90e1f69 100644 --- a/lib/BigBlueButton/API.php +++ b/lib/BigBlueButton/API.php @@ -206,7 +206,7 @@ class API { if ($presentation !== null && $presentation->isValid()) { /** @psalm-suppress InvalidArgument */ - $createMeetingParams->addPresentation($presentation->getUrl(), null, $presentation->getFilename()); + $createMeetingParams->addPresentation($presentation->generateUrl(), null, $presentation->getFilename()); } if ($room->access === Room::ACCESS_WAITING_ROOM || $room->access === Room::ACCESS_WAITING_ROOM_ALL) { diff --git a/lib/BigBlueButton/Presentation.php b/lib/BigBlueButton/Presentation.php index 39e629b..b473def 100644 --- a/lib/BigBlueButton/Presentation.php +++ b/lib/BigBlueButton/Presentation.php @@ -2,14 +2,26 @@ namespace OCA\BigBlueButton\BigBlueButton; +use OCP\Files\Storage\IStorage; + class Presentation { private $url; private $filename; - public function __construct(string $url, string $filename) { - $this->url = $url; - $this->filename = preg_replace('/[^\x20-\x7E]+/','#', $filename); + private $path; + + /** @var IStorage */ + private $storage; + + public function __construct(string $path, IStorage $storage) { + $this->storage = $storage; + $this->path = preg_replace('/^\//', '', $path); + $this->filename = preg_replace('/[^\x20-\x7E]+/','#', $path); + } + + public function generateUrl(): string { + return $this->storage->getDirectDownload($this->path); } public function getUrl(): string { @@ -21,6 +33,6 @@ class Presentation { } public function isValid(): bool { - return !empty($this->url) && !empty($this->filename); + return !empty($this->filename); } } diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php index 1a56a89..4e5387d 100644 --- a/lib/Controller/JoinController.php +++ b/lib/Controller/JoinController.php @@ -14,11 +14,13 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\BackgroundJob\IJobList; +use OCP\Files\Storage\IStorage; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; -class JoinController extends Controller { +class JoinController extends Controller +{ /** @var string */ protected $token; @@ -43,6 +45,9 @@ class JoinController extends Controller { /** @var IJobList */ private $jobList; + /** @var IStorage */ + private $storage; + public function __construct( string $appName, IRequest $request, @@ -51,7 +56,8 @@ class JoinController extends Controller { IUserSession $userSession, API $api, Permission $permission, - IJobList $jobList + IJobList $jobList, + IStorage $storage ) { parent::__construct($appName, $request); @@ -61,14 +67,17 @@ class JoinController extends Controller { $this->api = $api; $this->permission = $permission; $this->jobList = $jobList; + $this->storage = $storage; } - public function setToken(string $token): void { + public function setToken(string $token): void + { $this->token = $token; $this->room = null; } - public function isValidToken(): bool { + public function isValidToken(): bool + { $room = $this->getRoom(); return $room !== null; @@ -81,7 +90,8 @@ class JoinController extends Controller { * * @return RedirectResponse|TemplateResponse */ - public function index($displayname, $u = '', $filename = '', $password = '') { + public function index($displayname, $u = '', $filename = '', $password = '') + { $room = $this->getRoom(); if ($room === null) { @@ -108,7 +118,11 @@ class JoinController extends Controller { } if ($this->permission->isAdmin($room, $userId)) { - $presentation = new Presentation($u, $filename); + $presentation = new Presentation($filename, $this->storage); + } + + if (!$room->running && $presentation === null) { + $presentation = new Presentation($room->presentationPath, $this->storage); } } elseif ($room->access === Room::ACCESS_INTERNAL || $room->access === Room::ACCESS_INTERNAL_RESTRICTED) { return new RedirectResponse($this->getLoginUrl()); @@ -138,7 +152,7 @@ class JoinController extends Controller { $this->markAsRunning($room); - \OCP\Util::addHeader('meta', ['http-equiv' => 'refresh', 'content' => '3;url='.$joinUrl]); + \OCP\Util::addHeader('meta', ['http-equiv' => 'refresh', 'content' => '3;url=' . $joinUrl]); return new TemplateResponse($this->appName, 'forward', [ 'room' => $room->name, @@ -146,7 +160,8 @@ class JoinController extends Controller { ], 'guest'); } - private function getRoom(): ?Room { + private function getRoom(): ?Room + { if ($this->room === null) { $this->room = $this->service->findByUid($this->token); } @@ -154,7 +169,8 @@ class JoinController extends Controller { return $this->room; } - private function getLoginUrl(): string { + private function getLoginUrl(): string + { return $this->urlGenerator->linkToRoute('core.login.showLoginForm', [ 'redirect_url' => $this->urlGenerator->linkToRoute( 'bbb.join.index', @@ -163,7 +179,8 @@ class JoinController extends Controller { ]); } - private function markAsRunning(Room $room) { + private function markAsRunning(Room $room) + { if (!$room->running) { $this->service->updateRunning($room->getId(), true); } diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index a5252c5..37497fc 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -13,7 +13,8 @@ use OCP\IGroupManager; use OCP\IRequest; use OCP\IUserManager; -class RoomController extends Controller { +class RoomController extends Controller +{ /** @var RoomService */ private $service; @@ -56,7 +57,8 @@ class RoomController extends Controller { /** * @NoAdminRequired */ - public function index(): DataResponse { + public function index(): DataResponse + { $user = $this->userManager->get($this->userId); $groupIds = $this->groupManager->getUserGroupIds($user); $circleIds = $this->circleHelper->getCircleIds($this->userId); @@ -119,7 +121,9 @@ class RoomController extends Controller { bool $listenOnly, bool $mediaCheck, bool $cleanLayout, - bool $joinMuted + bool $joinMuted, + string $presentationUserId, + string $presentationPath ): DataResponse { $room = $this->service->find($id); @@ -142,15 +146,28 @@ class RoomController extends Controller { return new DataResponse(['message' => 'Access type not allowed.'], Http::STATUS_BAD_REQUEST); } - return $this->handleNotFound(function () use ($id, $name, $welcome, $maxParticipants, $record, $access, $everyoneIsModerator, $requireModerator, $moderatorToken, $listenOnly, $mediaCheck, $cleanLayout, $joinMuted) { - return $this->service->update($id, $name, $welcome, $maxParticipants, $record, $access, $everyoneIsModerator, $requireModerator, $moderatorToken, $listenOnly, $mediaCheck, $cleanLayout, $joinMuted); + if ($presentationUserId != '' && $presentationUserId != $room->getPresentationUserId()) { + return new DataResponse(['message' => 'Not allowed to change to another user.'], Http::STATUS_BAD_REQUEST); + } + + if ($presentationUserId === '') { + $presentationUserId = $this->userId; + } + + if ($presentationUserId != $this->userId && $presentationPath != $room->getPresentationPath()) { + return new DataResponse(['message' => 'Not allowed to choose path of another user.'], Http::STATUS_BAD_REQUEST); + } + + return $this->handleNotFound(function () use ($id, $name, $welcome, $maxParticipants, $record, $access, $everyoneIsModerator, $requireModerator, $moderatorToken, $listenOnly, $mediaCheck, $cleanLayout, $joinMuted, $presentationUserId, $presentationPath) { + return $this->service->update($id, $name, $welcome, $maxParticipants, $record, $access, $everyoneIsModerator, $requireModerator, $moderatorToken, $listenOnly, $mediaCheck, $cleanLayout, $joinMuted, $presentationUserId, $presentationPath); }); } /** * @NoAdminRequired */ - public function destroy(int $id): DataResponse { + public function destroy(int $id): DataResponse + { $room = $this->service->find($id); if (!$this->permission->isAdmin($room, $this->userId)) { diff --git a/lib/Db/Room.php b/lib/Db/Room.php index 7fb2816..b59ec1a 100644 --- a/lib/Db/Room.php +++ b/lib/Db/Room.php @@ -74,6 +74,8 @@ class Room extends Entity implements JsonSerializable { public $cleanLayout; public $joinMuted; public $running; + public $presentationUserId; + public $presentationPath; public function __construct() { $this->addType('maxParticipants', 'integer'); @@ -108,6 +110,8 @@ class Room extends Entity implements JsonSerializable { 'cleanLayout' => boolval($this->cleanLayout), 'joinMuted' => boolval($this->joinMuted), 'running' => boolval($this->running), + 'presentationUserId' => $this->presentationUserId, + 'presentationPath' => $this->presentationPath, ]; } } diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php index d8e42b6..6117f7f 100644 --- a/lib/Service/RoomService.php +++ b/lib/Service/RoomService.php @@ -103,6 +103,8 @@ class RoomService { $room->setMediaCheck($mediaCheck); $room->setCleanLayout(false); $room->setJoinMuted(false); + $room->setPresentationUserId(''); + $room->setPresentationPath(''); if ($access === Room::ACCESS_PASSWORD) { $room->setPassword($this->humanReadableRandom(8)); @@ -133,7 +135,9 @@ class RoomService { bool $listenOnly, bool $mediaCheck, bool $cleanLayout, - bool $joinMuted) { + bool $joinMuted, + string $presentationUserId, + string $presentationPath) { try { $room = $this->mapper->find($id); @@ -156,6 +160,8 @@ class RoomService { $room->setMediaCheck($mediaCheck); $room->setCleanLayout($cleanLayout); $room->setJoinMuted($joinMuted); + $room->setPresentationUserId($presentationUserId); + $room->setPresentationPath($presentationPath); return $this->mapper->update($room); } catch (Exception $e) { From 9f0f591d7a1eecd592887106e1728af9b148c07b Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Tue, 10 May 2022 15:35:59 +0200 Subject: [PATCH 4/7] feat: Default Presentation get the direct download from the php api instead of frontend --- lib/BigBlueButton/Presentation.php | 40 +++++++++++++++++++----------- lib/Controller/JoinController.php | 21 ++++++++-------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/lib/BigBlueButton/Presentation.php b/lib/BigBlueButton/Presentation.php index b473def..1efaaa0 100644 --- a/lib/BigBlueButton/Presentation.php +++ b/lib/BigBlueButton/Presentation.php @@ -2,37 +2,49 @@ namespace OCA\BigBlueButton\BigBlueButton; +use OCP\Files\IRootFolder; +use OCP\Files\File; use OCP\Files\Storage\IStorage; -class Presentation { +class Presentation +{ private $url; - private $filename; + /** @var File*/ + private $file; - private $path; + /** @var IRootFolder */ + private $userFolder; /** @var IStorage */ private $storage; - public function __construct(string $path, IStorage $storage) { - $this->storage = $storage; - $this->path = preg_replace('/^\//', '', $path); - $this->filename = preg_replace('/[^\x20-\x7E]+/','#', $path); + public function __construct(string $path, string $userID, IRootFolder $iRootFolder) + { + $userFolder = $iRootFolder->getUserFolder($userID); + $this->file = $userFolder->get($path); + $this->storage = $this->file->getStorage(); } - public function generateUrl(): string { - return $this->storage->getDirectDownload($this->path); + public function generateUrl(): string + { + $filePath = $this->file->getInternalPath(); + [$url] = $this->storage->getDirectDownload($filePath); + return $url; } - public function getUrl(): string { + public function getUrl(): string + { return $this->url; } - public function getFilename(): string { - return $this->filename; + public function getFilename(): string + { + return $this->file->getName(); } - public function isValid(): bool { - return !empty($this->filename); + public function isValid(): bool + { + return !empty($this->file->getContent()); } } diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php index 4e5387d..6115e29 100644 --- a/lib/Controller/JoinController.php +++ b/lib/Controller/JoinController.php @@ -14,7 +14,7 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\BackgroundJob\IJobList; -use OCP\Files\Storage\IStorage; +use OCP\Files\IRootFolder; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; @@ -45,8 +45,8 @@ class JoinController extends Controller /** @var IJobList */ private $jobList; - /** @var IStorage */ - private $storage; + /** @var IRootFolder */ + private $iRootFolder; public function __construct( string $appName, @@ -57,7 +57,7 @@ class JoinController extends Controller API $api, Permission $permission, IJobList $jobList, - IStorage $storage + IRootFolder $iRootFolder ) { parent::__construct($appName, $request); @@ -67,7 +67,7 @@ class JoinController extends Controller $this->api = $api; $this->permission = $permission; $this->jobList = $jobList; - $this->storage = $storage; + $this->iRootFolder = $iRootFolder; } public function setToken(string $token): void @@ -117,13 +117,12 @@ class JoinController extends Controller throw new NoPermissionException(); } - if ($this->permission->isAdmin($room, $userId)) { - $presentation = new Presentation($filename, $this->storage); - } - - if (!$room->running && $presentation === null) { - $presentation = new Presentation($room->presentationPath, $this->storage); + if ($this->permission->isAdmin($room, $userId) && !empty($filename)) { + $presentation = new Presentation($filename, $userId, $this->iRootFolder); + } else if (!$room->running && !empty($room->presentationPath)) { + $presentation = new Presentation($room->presentationPath, $room->presentationUserId, $this->iRootFolder); } + } elseif ($room->access === Room::ACCESS_INTERNAL || $room->access === Room::ACCESS_INTERNAL_RESTRICTED) { return new RedirectResponse($this->getLoginUrl()); } elseif (empty($displayname) || strlen($displayname) < 3 || ($room->access === Room::ACCESS_PASSWORD && $password !== $room->password)) { From 7f2372d207378a91fed696e40aa798ea5a396434 Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Mon, 23 May 2022 12:41:42 +0200 Subject: [PATCH 5/7] feat: Default Presentation generate direct in the DB instead of using getDirectDownload() --- lib/BigBlueButton/Presentation.php | 59 ++++++++++++++++++++++++------ lib/Controller/JoinController.php | 25 +++++++++++-- 2 files changed, 69 insertions(+), 15 deletions(-) diff --git a/lib/BigBlueButton/Presentation.php b/lib/BigBlueButton/Presentation.php index 1efaaa0..458bf04 100644 --- a/lib/BigBlueButton/Presentation.php +++ b/lib/BigBlueButton/Presentation.php @@ -2,34 +2,71 @@ namespace OCA\BigBlueButton\BigBlueButton; +use OCA\DAV\Db\Direct; +use OCA\DAV\Db\DirectMapper; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IRootFolder; use OCP\Files\File; +use OCP\Files\Folder; use OCP\Files\Storage\IStorage; +use OCP\IURLGenerator; +use OCP\Security\ISecureRandom; class Presentation { private $url; + private $userId; /** @var File*/ private $file; - /** @var IRootFolder */ + /** @var Folder */ private $userFolder; - /** @var IStorage */ - private $storage; + /** @var DirectMapper */ + private $mapper; - public function __construct(string $path, string $userID, IRootFolder $iRootFolder) - { - $userFolder = $iRootFolder->getUserFolder($userID); - $this->file = $userFolder->get($path); - $this->storage = $this->file->getStorage(); + /** @var ISecureRandom */ + private $random; + + /** @var ITimeFactory */ + private $timeFactory; + + /** @var IURLGenerator */ + private $urlGenerator; + + public function __construct( + string $path, + string $userId, + IRootFolder $iRootFolder, + DirectMapper $mapper, + ISecureRandom $random, + ITimeFactory $timeFactory, + IURLGenerator $urlGenerator + ) { + $this->userFolder = $iRootFolder->getUserFolder($userId); + $this->file = $this->userFolder->get($path); + $this->mapper = $mapper; + $this->random = $random; + $this->timeFactory = $timeFactory; + $this->userId = $userId; + $this->urlGenerator = $urlGenerator; } - public function generateUrl(): string + public function generateUrl() { - $filePath = $this->file->getInternalPath(); - [$url] = $this->storage->getDirectDownload($filePath); + $direct = new Direct(); + $direct->setUserId($this->userId); + $direct->setFileId($this->file->getId()); + + $token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC); + $direct->setToken($token); + $direct->setExpiration($this->timeFactory->getTime() + (60 * 60 * 8)); + + $this->mapper->insert($direct); + + $url = $this->urlGenerator->getAbsoluteURL('remote.php/direct/' . $token); + return $url; } diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php index 6115e29..30fa13d 100644 --- a/lib/Controller/JoinController.php +++ b/lib/Controller/JoinController.php @@ -10,14 +10,17 @@ use OCA\BigBlueButton\NoPermissionException; use OCA\BigBlueButton\NotFoundException; use OCA\BigBlueButton\Permission; use OCA\BigBlueButton\Service\RoomService; +use OCA\DAV\Db\DirectMapper; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\Files\IRootFolder; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; +use OCP\Security\ISecureRandom; class JoinController extends Controller { @@ -48,6 +51,15 @@ class JoinController extends Controller /** @var IRootFolder */ private $iRootFolder; + /** @var DirectMapper */ + private $mapper; + + /** @var ISecureRandom */ + private $random; + + /** @var ITimeFactory */ + private $timeFactory; + public function __construct( string $appName, IRequest $request, @@ -57,7 +69,10 @@ class JoinController extends Controller API $api, Permission $permission, IJobList $jobList, - IRootFolder $iRootFolder + IRootFolder $iRootFolder, + DirectMapper $mapper, + ISecureRandom $random, + ITimeFactory $timeFactory ) { parent::__construct($appName, $request); @@ -68,6 +83,9 @@ class JoinController extends Controller $this->permission = $permission; $this->jobList = $jobList; $this->iRootFolder = $iRootFolder; + $this->mapper = $mapper; + $this->random = $random; + $this->timeFactory = $timeFactory; } public function setToken(string $token): void @@ -118,11 +136,10 @@ class JoinController extends Controller } if ($this->permission->isAdmin($room, $userId) && !empty($filename)) { - $presentation = new Presentation($filename, $userId, $this->iRootFolder); + $presentation = new Presentation($filename, $userId, $this->iRootFolder, $this->mapper, $this->random, $this->timeFactory, $this->urlGenerator); } else if (!$room->running && !empty($room->presentationPath)) { - $presentation = new Presentation($room->presentationPath, $room->presentationUserId, $this->iRootFolder); + $presentation = new Presentation($room->presentationPath, $room->presentationUserId, $this->iRootFolder, $this->mapper, $this->random, $this->timeFactory, $this->urlGenerator); } - } elseif ($room->access === Room::ACCESS_INTERNAL || $room->access === Room::ACCESS_INTERNAL_RESTRICTED) { return new RedirectResponse($this->getLoginUrl()); } elseif (empty($displayname) || strlen($displayname) < 3 || ($room->access === Room::ACCESS_PASSWORD && $password !== $room->password)) { From e0bc1a233285eb9a6d6ce42ff06dcfee57d2603d Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Tue, 24 May 2022 23:58:07 +0200 Subject: [PATCH 6/7] feat: default Presentation fixed some formatting with cs-fixer --- lib/BigBlueButton/Presentation.php | 16 ++++--------- lib/Controller/JoinController.php | 23 +++++++------------ lib/Controller/RoomController.php | 12 ++++------ .../Version000000Date20220413130357.php | 8 ++----- lib/Service/RoomService.php | 7 +++--- 5 files changed, 23 insertions(+), 43 deletions(-) diff --git a/lib/BigBlueButton/Presentation.php b/lib/BigBlueButton/Presentation.php index 458bf04..b57caae 100644 --- a/lib/BigBlueButton/Presentation.php +++ b/lib/BigBlueButton/Presentation.php @@ -8,12 +8,10 @@ use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IRootFolder; use OCP\Files\File; use OCP\Files\Folder; -use OCP\Files\Storage\IStorage; use OCP\IURLGenerator; use OCP\Security\ISecureRandom; -class Presentation -{ +class Presentation { private $url; private $userId; @@ -53,8 +51,7 @@ class Presentation $this->urlGenerator = $urlGenerator; } - public function generateUrl() - { + public function generateUrl() { $direct = new Direct(); $direct->setUserId($this->userId); $direct->setFileId($this->file->getId()); @@ -70,18 +67,15 @@ class Presentation return $url; } - public function getUrl(): string - { + public function getUrl(): string { return $this->url; } - public function getFilename(): string - { + public function getFilename(): string { return $this->file->getName(); } - public function isValid(): bool - { + public function isValid(): bool { return !empty($this->file->getContent()); } } diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php index 30fa13d..91a3e06 100644 --- a/lib/Controller/JoinController.php +++ b/lib/Controller/JoinController.php @@ -22,8 +22,7 @@ use OCP\IURLGenerator; use OCP\IUserSession; use OCP\Security\ISecureRandom; -class JoinController extends Controller -{ +class JoinController extends Controller { /** @var string */ protected $token; @@ -88,14 +87,12 @@ class JoinController extends Controller $this->timeFactory = $timeFactory; } - public function setToken(string $token): void - { + public function setToken(string $token): void { $this->token = $token; $this->room = null; } - public function isValidToken(): bool - { + public function isValidToken(): bool { $room = $this->getRoom(); return $room !== null; @@ -108,8 +105,7 @@ class JoinController extends Controller * * @return RedirectResponse|TemplateResponse */ - public function index($displayname, $u = '', $filename = '', $password = '') - { + public function index($displayname, $u = '', $filename = '', $password = '') { $room = $this->getRoom(); if ($room === null) { @@ -137,7 +133,7 @@ class JoinController extends Controller if ($this->permission->isAdmin($room, $userId) && !empty($filename)) { $presentation = new Presentation($filename, $userId, $this->iRootFolder, $this->mapper, $this->random, $this->timeFactory, $this->urlGenerator); - } else if (!$room->running && !empty($room->presentationPath)) { + } elseif (!$room->running && !empty($room->presentationPath)) { $presentation = new Presentation($room->presentationPath, $room->presentationUserId, $this->iRootFolder, $this->mapper, $this->random, $this->timeFactory, $this->urlGenerator); } } elseif ($room->access === Room::ACCESS_INTERNAL || $room->access === Room::ACCESS_INTERNAL_RESTRICTED) { @@ -176,8 +172,7 @@ class JoinController extends Controller ], 'guest'); } - private function getRoom(): ?Room - { + private function getRoom(): ?Room { if ($this->room === null) { $this->room = $this->service->findByUid($this->token); } @@ -185,8 +180,7 @@ class JoinController extends Controller return $this->room; } - private function getLoginUrl(): string - { + private function getLoginUrl(): string { return $this->urlGenerator->linkToRoute('core.login.showLoginForm', [ 'redirect_url' => $this->urlGenerator->linkToRoute( 'bbb.join.index', @@ -195,8 +189,7 @@ class JoinController extends Controller ]); } - private function markAsRunning(Room $room) - { + private function markAsRunning(Room $room) { if (!$room->running) { $this->service->updateRunning($room->getId(), true); } diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 37497fc..9bbb197 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -13,8 +13,8 @@ use OCP\IGroupManager; use OCP\IRequest; use OCP\IUserManager; -class RoomController extends Controller -{ +class RoomController extends Controller { + use Errors; /** @var RoomService */ private $service; @@ -33,8 +33,6 @@ class RoomController extends Controller /** @var string */ private $userId; - use Errors; - public function __construct( $appName, IRequest $request, @@ -57,8 +55,7 @@ class RoomController extends Controller /** * @NoAdminRequired */ - public function index(): DataResponse - { + public function index(): DataResponse { $user = $this->userManager->get($this->userId); $groupIds = $this->groupManager->getUserGroupIds($user); $circleIds = $this->circleHelper->getCircleIds($this->userId); @@ -166,8 +163,7 @@ class RoomController extends Controller /** * @NoAdminRequired */ - public function destroy(int $id): DataResponse - { + public function destroy(int $id): DataResponse { $room = $this->service->find($id); if (!$this->permission->isAdmin($room, $this->userId)) { diff --git a/lib/Migration/Version000000Date20220413130357.php b/lib/Migration/Version000000Date20220413130357.php index 47d6711..5b83537 100644 --- a/lib/Migration/Version000000Date20220413130357.php +++ b/lib/Migration/Version000000Date20220413130357.php @@ -34,18 +34,14 @@ use OCP\Migration\SimpleMigrationStep; /** * Auto-generated migration step: Please modify to your needs! */ -class Version000000Date20220413130357 extends SimpleMigrationStep -{ - +class Version000000Date20220413130357 extends SimpleMigrationStep { /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` * @param array $options * @return null|ISchemaWrapper */ - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper - { - + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { $schema = $schemaClosure(); if ($schema->hasTable('bbb_rooms')) { diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php index 6117f7f..0e09f20 100644 --- a/lib/Service/RoomService.php +++ b/lib/Service/RoomService.php @@ -16,7 +16,6 @@ use OCP\IConfig; use OCP\Security\ISecureRandom; class RoomService { - /** @var RoomMapper */ private $mapper; @@ -33,7 +32,8 @@ class RoomService { RoomMapper $mapper, IConfig $config, IEventDispatcher $eventDispatcher, - ISecureRandom $random) { + ISecureRandom $random + ) { $this->mapper = $mapper; $this->config = $config; $this->eventDispatcher = $eventDispatcher; @@ -137,7 +137,8 @@ class RoomService { bool $cleanLayout, bool $joinMuted, string $presentationUserId, - string $presentationPath) { + string $presentationPath + ) { try { $room = $this->mapper->find($id); From 76bd1e16ab5b42d5faf73d81d907d29ff9fd7d09 Mon Sep 17 00:00:00 2001 From: "Specht, David" Date: Wed, 25 May 2022 00:00:27 +0200 Subject: [PATCH 7/7] feat: default Presentation eslint cleanup --- ts/Manager/SharedPresentationInput.tsx | 61 +++++++++++++------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/ts/Manager/SharedPresentationInput.tsx b/ts/Manager/SharedPresentationInput.tsx index 3faeb51..b076294 100644 --- a/ts/Manager/SharedPresentationInput.tsx +++ b/ts/Manager/SharedPresentationInput.tsx @@ -1,6 +1,5 @@ -import React from "react"; -import { useState } from "react"; -import { Room } from "../Common/Api"; +import React from 'react'; +import { Room } from '../Common/Api'; type Props = { id: string @@ -11,38 +10,38 @@ type Props = { const SharedPresentationInput: React.FC = ({ room, updateRoom, id }) => { function filepicker() { - OC.dialogs.filepicker(t('bbb', 'Default Presentation'), file => { - updateRoom({...room, presentationUserId: '', presentationPath: file}); - }, - ); - } + OC.dialogs.filepicker(t('bbb', 'Default Presentation'), file => { + updateRoom({...room, presentationUserId: '', presentationPath: file}); + }, + ); + } - function removeFile() { - updateRoom({...room, presentationUserId: '', presentationPath: ''}); - } + function removeFile() { + updateRoom({...room, presentationUserId: '', presentationPath: ''}); + } - function getAvatarUrl(userId) { - if (room.presentationUserId === null || room.presentationUserId === undefined) { - return ; - } + function getAvatarUrl() { + if (room.presentationUserId === null || room.presentationUserId === undefined) { + return ; + } - return (OC.generateUrl('/avatar/' + encodeURIComponent(room.presentationUserId) + '/' + 24, { - user: room.presentationUserId, - size: 24, - requesttoken: OC.requestToken, - })) - } + return (OC.generateUrl('/avatar/' + encodeURIComponent(room.presentationUserId) + '/' + 24, { + user: room.presentationUserId, + size: 24, + requesttoken: OC.requestToken, + })); + } - return( -
- -

- {room.presentationUserId} - {room.presentationPath} - -

-
- ); + return( +
+ +

+ {room.presentationUserId} + {room.presentationPath} + +

+
+ ); }; export default SharedPresentationInput;