Skip to content

[stable29] fix(cardav): only show users from enabled addressBooks in contacts menu - #51537

Merged
hamza221 merged 1 commit into
stable29from
backport/51380/stable29
Mar 21, 2025
Merged

[stable29] fix(cardav): only show users from enabled addressBooks in contacts menu#51537
hamza221 merged 1 commit into
stable29from
backport/51380/stable29

Conversation

@backportbot

@backportbotbackportbotBot commented Mar 17, 2025•
edited by hamza221
Loading

Copy link
Copy Markdown

Backport of #51380

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbotbackportbotBot added bug 3. to review Waiting for reviews pending documentation This pull request needs an associated documentation update feature: carddav Related to CardDAV internals labels Mar 17, 2025
@backportbotbackportbotBot added this to the Nextcloud 29.0.14 milestone Mar 17, 2025
@hamza221
hamza221force-pushed the backport/51380/stable29 branch from 3f98715 to 0f1ff70CompareMarch 21, 2025 13:42
@hamza221
hamza221 marked this pull request as ready for review March 21, 2025 13:42
@hamza221
hamza221force-pushed the backport/51380/stable29 branch from 0f1ff70 to 6c39f7dCompareMarch 21, 2025 13:43
github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 21, 2025
View reviewed changes
Comment threadapps/dav/lib/AppInfo/Application.php

private function setupSystemContactsProvider(IContactsManager $contactsManager,
IAppContainer $container): void {
private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {

Check notice

Code scanning / Psalm

DeprecatedInterface

Interface OCP\AppFramework\IAppContainer is marked as deprecated
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php Fixed
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php Fixed
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php Fixed
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php Fixed
Comment threadapps/dav/lib/CardDAV/ContactsManager.php
* @param IURLGenerator $urlGenerator
*/
public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) {

Check notice

Code scanning / Psalm

MissingReturnType

Method OCA\DAV\CardDAV\ContactsManager::setupSystemContactsProvider does not have a return type, expecting void
Comment threadapps/dav/lib/CardDAV/ContactsManager.php
* @param ?string $userId
*/
private function register(IManager $cm, $addressBooks, $urlGenerator) {
private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) {

Check notice

Code scanning / Psalm

MissingReturnType

Method OCA\DAV\CardDAV\ContactsManager::register does not have a return type, expecting void
Comment threadapps/dav/lib/CardDAV/ContactsManager.php
* @param ?string $userId
*/
private function register(IManager $cm, $addressBooks, $urlGenerator) {
private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) {

Check notice

Code scanning / Psalm

MissingParamType

Parameter $addressBooks has no provided type
@hamza221
hamza221 marked this pull request as draft March 21, 2025 13:52
@hamza221
hamza221force-pushed the backport/51380/stable29 branch from 6c39f7d to 4f44398CompareMarch 21, 2025 13:54
@hamza221
fix(cardav): only show useres from enabled addressBooks in contacts menu
408c4bf
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 21, 2025
View reviewed changes
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php
}

public function isEnabled(): bool {
if (!$this->userId) {

Check notice

Code scanning / Psalm

RiskyTruthyFalsyComparison

Operand of type null|string contains type string, which can be falsy and truthy. This can cause possibly unexpected behavior. Use strict comparison instead.
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php
$uri = $this->addressBookInfo['uri'];
}

$path = 'addressbooks/users/' . $user . '/' . $uri;

Check notice

Code scanning / Psalm

PossiblyInvalidOperand

Cannot concatenate with a array<array-key, string>|string
Comment threadapps/dav/lib/CardDAV/AddressBookImpl.php
}

$path = 'addressbooks/users/' . $user . '/' . $uri;
$properties = $this->propertyMapper->findPropertyByPathAndName($user, $path, '{http://owncloud.org/ns}enabled');

Check notice

Code scanning / Psalm

PossiblyInvalidArgument

Argument 1 of OCA\DAV\Db\PropertyMapper::findPropertyByPathAndName expects string, but possibly different type array<array-key, string>|string provided
@hamza221
hamza221force-pushed the backport/51380/stable29 branch from 4f44398 to 408c4bfCompareMarch 21, 2025 13:58
@hamza221
hamza221 marked this pull request as ready for review March 21, 2025 13:59
@hamza221
hamza221 merged commit c896c5f into stable29Mar 21, 2025
@hamza221
hamza221 deleted the backport/51380/stable29 branch March 21, 2025 15:09
@skjnldsvskjnldsv removed the pending documentation This pull request needs an associated documentation update label Mar 27, 2025
@AltahrimAltahrim mentioned this pull request Apr 3, 2025
Merged
7 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzingerAndyScherzingerAndyScherzinger approved these changes
@hamza221hamza221hamza221 approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@GretaDGretaDAwaiting requested review from GretaD
@SebastianKrupinskiSebastianKrupinskiAwaiting requested review from SebastianKrupinskiSebastianKrupinski is a code owner

Assignees

@hamza221hamza221

Labels

3. to reviewWaiting for reviewsbugfeature: carddavRelated to CardDAV internals

Projects

None yet

Milestone

Nextcloud 29.0.15

Development

Successfully merging this pull request may close these issues.

5 participants

@AndyScherzinger@hamza221@github-advanced-security@blizzz@skjnldsv