Skip to content

[stable6.0] fix: Instantiation of ContactsManager #4481

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
merged 1 commit into from
May 29, 2025
Merged

[stable6.0] fix: Instantiation of ContactsManager #4481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions lib/Service/SocialApiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\CardDAV\ContactsManager;

use OCA\DAV\Db\PropertyMapper;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Utility\ITimeFactory;
Expand Down Expand Up @@ -62,6 +62,8 @@ class SocialApiService {
private $timeFactory;
/** @var ImageResizer */
private $imageResizer;
/** @var PropertyMapper */
private $propertyMapper;

public function __construct(
CompositeSocialProvider $socialProvider,
Expand All @@ -72,7 +74,8 @@ public function __construct(
IURLGenerator $urlGen,
CardDavBackend $davBackend,
ITimeFactory $timeFactory,
ImageResizer $imageResizer) {
ImageResizer $imageResizer,
PropertyMapper $propertyMapper) {
$this->appName = Application::APP_ID;
$this->socialProvider = $socialProvider;
$this->manager = $manager;
Expand All @@ -83,6 +86,7 @@ public function __construct(
$this->davBackend = $davBackend;
$this->timeFactory = $timeFactory;
$this->imageResizer = $imageResizer;
$this->propertyMapper = $propertyMapper;
}


Expand Down Expand Up @@ -158,7 +162,7 @@ protected function getAddressBook(string $addressbookId, IManager $manager = nul
* @param {IManager} the contact manager to load
*/
protected function registerAddressbooks($userId, IManager $manager) {
$coma = new ContactsManager($this->davBackend, $this->l10n);
$coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper);
$coma->setupContactsProvider($manager, $userId, $this->urlGen);
$this->manager = $manager;
}
Expand Down Expand Up @@ -270,7 +274,7 @@ public function updateContact(string $addressbookId, string $contactId, ?string
*/
public function existsAddressBook(string $searchBookId, string $userId): bool {
$manager = $this->manager;
$coma = new ContactsManager($this->davBackend, $this->l10n);
$coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper);
$coma->setupContactsProvider($manager, $userId, $this->urlGen);
$addressBooks = $manager->getUserAddressBooks();
return $this->getAddressBook($searchBookId, $manager) !== null;
Expand All @@ -288,7 +292,7 @@ public function existsAddressBook(string $searchBookId, string $userId): bool {
public function existsContact(string $searchContactId, string $searchBookId, string $userId): bool {
// load address books for the user
$manager = $this->manager;
$coma = new ContactsManager($this->davBackend, $this->l10n);
$coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper);
$coma->setupContactsProvider($manager, $userId, $this->urlGen);
$addressBook = $this->getAddressBook($searchBookId, $manager);
if ($addressBook == null) {
Expand Down
25 changes: 15 additions & 10 deletions tests/unit/Service/SocialApiServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,31 @@

use PHPUnit\Framework\MockObject\MockObject;
use ChristophWurst\Nextcloud\Testing\TestCase;
use OCA\DAV\Db\PropertyMapper;

class SocialApiServiceTest extends TestCase {
private SocialApiService $service;

/** @var CompositeSocialProvider|MockObject */
/** @var CompositeSocialProvider&MockObject */
private $socialProvider;
/** @var IManager|MockObject */
/** @var IManager&MockObject */
private $manager;
/** @var IConfig|MockObject */
/** @var IConfig&MockObject */
private $config;
/** @var IClientService|MockObject */
/** @var IClientService&MockObject */
private $clientService;
/** @var IL10N|MockObject */
/** @var IL10N&MockObject */
private $l10n;
/** @var IURLGenerator|MockObject */
/** @var IURLGenerator&MockObject */
private $urlGen;
/** @var CardDavBackend|MockObject */
/** @var CardDavBackend&MockObject */
private $davBackend;
/** @var ITimeFactory|MockObject */
/** @var ITimeFactory&MockObject */
private $timeFactory;
/** @var ImageResizer|MockObject */
/** @var ImageResizer&MockObject */
private $imageResizer;
/** @var PropertyMapper&MockObject */
private $propertyMapper;

public function allSocialProfileProviders(): array {
$body = "the body";
Expand Down Expand Up @@ -130,6 +133,7 @@ protected function setUp(): void {
$this->davBackend = $this->createMock(CardDavBackend::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->imageResizer = $this->createMock(ImageResizer::class);
$this->propertyMapper = $this->createMock(PropertyMapper::class);
$this->service = new SocialApiService(
$this->socialProvider,
$this->manager,
Expand All @@ -139,7 +143,8 @@ protected function setUp(): void {
$this->urlGen,
$this->davBackend,
$this->timeFactory,
$this->imageResizer
$this->imageResizer,
$this->propertyMapper,
);
}

Expand Down
Loading