plugins-nextcloud-mirror/spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-12-18 05:20:50 +01:00
Code Projects Releases Activity

More IShare::TYPE_* fixes

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-09-27 15:31:28 +02:00
parent c975f6af6a
commit 7314559199
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
9 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/Chat/SystemMessage/Listener.php
View file

@ -24,20 +24,15 @@ namespace OCA\Talk\Chat\SystemMessage;
use OCA\Talk\Chat\ChatManager;
use OCA\Talk\Chat\MessageParser;
use OCA\Talk\Chat\Parser\SystemMessage;
use OCA\Talk\Manager;
use OCA\Talk\Model\Message;
use OCA\Talk\Participant;
use OCA\Talk\Room;
use OCA\Talk\Share\RoomShareProvider;
use OCA\Talk\TalkSession;
use OCA\Talk\Webinary;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Comments\IComment;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Share;
use OCP\Share\IShare;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
@ -250,7 +245,7 @@ class Listener {
/** @var IShare $share */
$share = $event->getSubject();
if ($share->getShareType() !== Share::SHARE_TYPE_ROOM) {
if ($share->getShareType() !== IShare::TYPE_ROOM) {
return;
}

4
lib/Collaboration/Collaborators/RoomPlugin.php
View file

@ -29,7 +29,7 @@ use OCP\Collaboration\Collaborators\ISearchPlugin;
use OCP\Collaboration\Collaborators\ISearchResult;
use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\IUserSession;
use OCP\Share;
use OCP\Share\IShare;
class RoomPlugin implements ISearchPlugin {
@ -86,7 +86,7 @@ class RoomPlugin implements ISearchPlugin {
[
'label' => $room->getDisplayName($userId),
'value' => [
'shareType' => Share::SHARE_TYPE_ROOM,
'shareType' => IShare::TYPE_ROOM,
'shareWith' => $room->getToken()
]
];

4
lib/Controller/PublicShareAuthController.php
View file

@ -32,9 +32,9 @@ use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share;
use OCP\Share\IManager as IShareManager;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IShare;
class PublicShareAuthController extends OCSController {
@ -98,7 +98,7 @@ class PublicShareAuthController extends OCSController {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}
if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
if ($share->getShareType() === IShare::TYPE_EMAIL) {
$roomName = $share->getSharedWith();
} else {
$roomName = trim($share->getTarget(), '/');

2
lib/Files/Listener.php
View file

@ -138,7 +138,7 @@ class Listener {
* @param Room $room
* @param string $userId
*/
public function addUserAsPersistentParticipant(Room $room, string $userId) {
public function addUserAsPersistentParticipant(Room $room, string $userId): void {
if ($room->getObjectType() !== 'file') {
return;
}

3
lib/Notification/Notifier.php
View file

@ -47,6 +47,7 @@ use OCP\RichObjectStrings\Definitions;
use OCP\Share;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as IShareManager;
use OCP\Share\IShare;
class Notifier implements INotifier {
@ -544,7 +545,7 @@ class Notifier implements INotifier {
$notification = $this->addActionButton($notification, $l->t('Call back'));
}
if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
if ($share->getShareType() === IShare::TYPE_EMAIL) {
$sharedWith = $share->getSharedWith();
if ($callIsActive) {
$subject = $l->t('{email} is requesting the password to access {file}');

27
lib/Share/RoomShareProvider.php
View file

@ -42,7 +42,6 @@ use OCP\Share\Exceptions\GenericShareException;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as IShareManager;
use OCP\Share\IShare;
use OCP\Share\IShareHelper;
use OCP\Share\IShareProvider;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
@ -223,7 +222,7 @@ class RoomShareProvider implements IShareProvider {
): int {
$qb = $this->dbConnection->getQueryBuilder();
$qb->insert('share')
->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM))
->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM))
->setValue('share_with', $qb->createNamedParameter($shareWith))
->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
->setValue('uid_owner', $qb->createNamedParameter($shareOwner))
@ -530,7 +529,7 @@ class RoomShareProvider implements IShareProvider {
$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
))
->andWhere(
$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM))
$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM))
);
/**
@ -578,7 +577,7 @@ class RoomShareProvider implements IShareProvider {
$qb->select('*')
->from('share');
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)));
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)));
/**
* Reshares for this user are shares where they are the owner.
@ -635,7 +634,7 @@ class RoomShareProvider implements IShareProvider {
->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
->where($qb->expr()->eq('s.id', $qb->createNamedParameter($id)))
->andWhere($qb->expr()->eq('s.share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)));
->andWhere($qb->expr()->eq('s.share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)));
$cursor = $qb->execute();
$data = $cursor->fetch();
@ -731,7 +730,7 @@ class RoomShareProvider implements IShareProvider {
$cursor = $qb->select('*')
->from('share')
->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->execute();
$shares = [];
@ -791,7 +790,7 @@ class RoomShareProvider implements IShareProvider {
$rooms = array_map(function(Room $room) { return $room->getToken(); }, $rooms);
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
$rooms,
IQueryBuilder::PARAM_STR_ARRAY
@ -852,7 +851,7 @@ class RoomShareProvider implements IShareProvider {
$cursor = $qb->select('*')
->from('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
->execute();
@ -926,7 +925,7 @@ class RoomShareProvider implements IShareProvider {
$qb = $this->dbConnection->getQueryBuilder();
$types = [\OCP\Share::SHARE_TYPE_ROOM];
$types = [IShare::TYPE_ROOM];
if ($currentAccess) {
$types[] = self::SHARE_TYPE_USERROOM;
}
@ -944,7 +943,7 @@ class RoomShareProvider implements IShareProvider {
$users = [];
while($row = $cursor->fetch()) {
$type = (int)$row['share_type'];
if ($type === \OCP\Share::SHARE_TYPE_ROOM) {
if ($type === IShare::TYPE_ROOM) {
$roomToken = $row['share_with'];
try {
$room = $this->manager->getRoomByToken($roomToken);
@ -1026,7 +1025,7 @@ class RoomShareProvider implements IShareProvider {
$qb->select('*')
->from('share')
->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->orderBy('id');
$cursor = $qb->execute();
@ -1055,7 +1054,7 @@ class RoomShareProvider implements IShareProvider {
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('id')
->from('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
if ($user !== null) {
@ -1082,7 +1081,7 @@ class RoomShareProvider implements IShareProvider {
// Now delete all the original room shares
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
if ($user !== null) {
@ -1096,7 +1095,7 @@ class RoomShareProvider implements IShareProvider {
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('id')
->from('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
$cursor = $qb->execute();

18
tests/integration/features/bootstrap/SharingContext.php
View file

@ -128,7 +128,7 @@ class SharingContext implements Context {
* @param TableNode|null $body
*/
public function userSharesWithUser(string $user, string $path, string $sharee, TableNode $body = null) {
$this->userSharesWith($user, $path, 0 /*Share::SHARE_TYPE_USER*/, $sharee, $body);
$this->userSharesWith($user, $path, 0 /*IShare::TYPE_USER*/, $sharee, $body);
}
/**
@ -153,7 +153,7 @@ class SharingContext implements Context {
* @param TableNode|null $body
*/
public function userSharesWithGroup(string $user, string $path, string $sharee, TableNode $body = null) {
$this->userSharesWith($user, $path, 1 /*Share::SHARE_TYPE_GROUP*/, $sharee, $body);
$this->userSharesWith($user, $path, 1 /*IShare::TYPE_GROUP*/, $sharee, $body);
}
/**
@ -178,7 +178,7 @@ class SharingContext implements Context {
* @param TableNode|null $body
*/
public function userSharesWithRoom(string $user, string $path, string $room, TableNode $body = null) {
$this->userSharesWith($user, $path, 10 /*Share::SHARE_TYPE_ROOM*/, FeatureContext::getTokenForIdentifier($room), $body);
$this->userSharesWith($user, $path, 10 /*IShare::TYPE_ROOM*/, FeatureContext::getTokenForIdentifier($room), $body);
}
/**
@ -202,7 +202,7 @@ class SharingContext implements Context {
* @param TableNode|null $body
*/
public function userSharesByLink(string $user, string $path, TableNode $body = null) {
$this->userSharesWith($user, $path, 3 /*Share::SHARE_TYPE_LINK*/, '', $body);
$this->userSharesWith($user, $path, 3 /*IShare::TYPE_LINK*/, '', $body);
}
/**
@ -400,7 +400,7 @@ class SharingContext implements Context {
$url = '/apps/files_sharing/api/v1/sharees';
$parameters = [];
$parameters[] = 'shareType=10'; // Share::SHARE_TYPE_ROOM,
$parameters[] = 'shareType=10'; // IShare::TYPE_ROOM,
$parameters[] = 'itemType=file';
foreach ($body->getRowsHash() as $key => $value) {
$parameters[] = $key . '=' . $value;
@ -562,7 +562,7 @@ class SharingContext implements Context {
$defaultExpectedFields = [
'id' => 'A_NUMBER',
'share_type' => '10', // Share::SHARE_TYPE_ROOM,
'share_type' => '10', // IShare::TYPE_ROOM,
'permissions' => '19',
'stime' => 'A_NUMBER',
'parent' => '',
@ -586,7 +586,7 @@ class SharingContext implements Context {
}
if (array_key_exists('share_type', $expectedFields) &&
$expectedFields['share_type'] == 10 /* Share::SHARE_TYPE_ROOM */ &&
$expectedFields['share_type'] == 10 /* IShare::TYPE_ROOM */ &&
array_key_exists('share_with', $expectedFields)) {
if ($expectedFields['share_with'] === 'private_conversation') {
$expectedFields['share_with'] = 'REGEXP /^private_conversation_[0-9a-f]{6}$/';
@ -607,7 +607,7 @@ class SharingContext implements Context {
* name is checked against the returned "label" value, and the room test
* identifier is used to get the room token, which is checked against the
* returned "shareWith" value. The returned "shareType" value is expected to
* always be "Share::SHARE_TYPE_ROOM", so there is no need to specify it.
* always be "IShare::TYPE_ROOM", so there is no need to specify it.
*
* @param string $shareeType
* @param string $isEmpty
@ -618,7 +618,7 @@ class SharingContext implements Context {
$sharees = [];
foreach ($shareesList->getRows() as $row) {
$expectedSharee = [$row[0]];
$expectedSharee[] = 10; // Share::SHARE_TYPE_ROOM
$expectedSharee[] = 10; // IShare::TYPE_ROOM
$expectedSharee[] = FeatureContext::getTokenForIdentifier($row[1]);
$sharees[] = $expectedSharee;
}

3
tests/integration/spreedcheats/lib/Controller/ApiController.php
View file

@ -27,6 +27,7 @@ use OCP\AppFramework\OCSController;
use OCP\AppFramework\Http\DataResponse;
use OCP\IDBConnection;
use OCP\IRequest;
use OCP\Share\IShare;
class ApiController extends OCSController {
@ -62,7 +63,7 @@ class ApiController extends OCSController {
$query = $this->db->getQueryBuilder();
$query->delete('share')
->where($query->expr()->orX(
$query->expr()->eq('share_type', $query->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)),
$query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_ROOM)),
$query->expr()->eq('share_type', $query->createNamedParameter(11 /*RoomShareProvider::SHARE_TYPE_USERROOM*/))
))
->execute();

4
tests/php/Collaboration/Collaborators/RoomPluginTest.php
View file

@ -31,7 +31,7 @@ use OCP\Collaboration\Collaborators\ISearchResult;
use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Share;
use OCP\Share\IShare;
class RoomPluginTest extends \Test\TestCase {
@ -91,7 +91,7 @@ class RoomPluginTest extends \Test\TestCase {
return [
'label' => $label,
'value' => [
'shareType' => Share::SHARE_TYPE_ROOM,
'shareType' => IShare::TYPE_ROOM,
'shareWith' => $shareWith
]
];