Skip to content

Add support for sending the password for a share by Nextcloud Talk #1049

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 15 commits into from
Aug 8, 2018
Merged

Add support for sending the password for a share by Nextcloud Talk #1049

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
29a72c3
Add columns "object_type" and "object_id" to table "talk_rooms"
danxuliu Jul 11, 2018
eb40ec1
Add support for creating rooms associated to arbitrary objects
danxuliu Jul 11, 2018
80705ad
Add end point to create rooms for requesting the password of a share
danxuliu Jul 12, 2018
7dfcbe2
Destroy "share:password" rooms as soon as one of the participants leaves
danxuliu Jul 12, 2018
94b4a18
Prevent extra participants from joining a "share:password" room
danxuliu Jul 12, 2018
efc9d95
Send notification to the sharer that a password has been requested
danxuliu Jul 12, 2018
7190c20
Load additional scripts in public share auth page when needed
danxuliu Jul 13, 2018
03cdef0
Prevent function from main UI to be executed in the embedded UI
danxuliu Jul 13, 2018
1bd7baa
Do not change the URL when a conversation ends in the embedded UI
danxuliu Jul 13, 2018
38fbf39
Hide the Talk sidebar automatically when the embedded conversation ends
danxuliu Jul 13, 2018
e667836
Rename the Listener and register it like we register new listeners
nickvergessen Jul 25, 2018
041f524
Use short class names
nickvergessen Jul 25, 2018
55a983f
Use the language of the owner for the room name
nickvergessen Jul 25, 2018
f81f5e0
Do not reuse the room
nickvergessen Jul 25, 2018
112c73b
Open the call in a new tab for now
nickvergessen Jul 25, 2018
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
Prev Previous commit
Next Next commit
Use the language of the owner for the room name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
  • Loading branch information
@nickvergessen @danxuliu
nickvergessen authored and danxuliu committed Aug 8, 2018
commit 55a983fd9f87cd61608e2283a798c6ccdffe5a0e
12 changes: 2 additions & 10 deletions lib/Controller/PublicShareAuthController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
Expand All @@ -47,8 +46,6 @@ class PublicShareAuthController extends OCSController {
private $shareManager;
/** @var Manager */
private $manager;
/** @var IL10N */
private $l10n;

/**
* @param string $appName
Expand All @@ -57,23 +54,20 @@ class PublicShareAuthController extends OCSController {
* @param NotificationManager $notificationManager
* @param ShareManager $shareManager
* @param Manager $manager
* @param IL10N $l10n
*/
public function __construct(
string $appName,
IRequest $request,
IUserManager $userManager,
NotificationManager $notificationManager,
ShareManager $shareManager,
Manager $manager,
IL10N $l10n
Manager $manager
) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->notificationManager = $notificationManager;
$this->shareManager = $shareManager;
$this->manager = $manager;
$this->l10n = $l10n;
}

/**
Expand Down Expand Up @@ -127,10 +121,8 @@ public function createRoom(string $shareToken): DataResponse {
}
}

$roomName = $this->l10n->t("Password request by %s", [$share->getSharedWith()]);

// Create the room
$room = $this->manager->createPublicRoom($roomName, 'share:password', $shareToken);
$room = $this->manager->createPublicRoom($share->getSharedWith(), 'share:password', $shareToken);
$room->addUsers([
'userId' => $sharerUser->getUID(),
'participantType' => Participant::OWNER,
Expand Down
5 changes: 5 additions & 0 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ protected function formatRoom(Room $room, Participant $participant = null): arra
return $roomData;
}

if ($room->getObjectType() === 'share:password') {
// FIXME use an event
$roomData['displayName'] = $this->l10n->t('Password request by %s', [$room->getName()]);
}

$currentUser = $this->userManager->get($this->userId);
if ($currentUser instanceof IUser) {
$unreadSince = $this->chatManager->getUnreadMarker($room, $currentUser);
Expand Down