Skip to content
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

Jump to bottom

[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu #51538

Merged
merged 1 commit into from
Mar 26, 2025
Merged

[stable30] fix(cardav): only show users from enabled addressBooks in contacts menu #51538

merged 1 commit into from
Mar 26, 2025
+167 −22

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 17, 2025 •
edited by hamza221
Loading

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.

@backportbot backportbot bot 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
@backportbot backportbot bot added this to the Nextcloud 30.0.8 milestone Mar 17, 2025
@hamza221 hamza221 force-pushed the backport/51380/stable30 branch 2 times, most recently from 58303c5 to 031cf2f Compare March 21, 2025 14:10
@hamza221 hamza221 marked this pull request as ready for review March 21, 2025 14:10
github-advanced-security[bot]
github-advanced-security bot found potential problems Mar 21, 2025
View reviewed changes
apps/dav/lib/AppInfo/Application.php
@@ -262,12 +262,11 @@
$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
}

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

Check notice

Code scanning / Psalm

DeprecatedInterface Note

Interface OCP\AppFramework\IAppContainer is marked as deprecated
apps/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 Note

Argument 1 of OCA\DAV\Db\PropertyMapper::findPropertyByPathAndName expects string, but possibly different type array<array-key, string>|string provided
apps/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 Note

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

Check notice

Code scanning / Psalm

MissingReturnType Note

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

Check notice

Code scanning / Psalm

MissingParamType Note

Parameter $addressBooks has no provided type
@hamza221
fix(cardav): only show useres from enabled addressBooks in contacts menu
e55a375 
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
@hamza221 hamza221 force-pushed the backport/51380/stable30 branch from 031cf2f to e55a375 Compare March 21, 2025 14:14
github-advanced-security[bot]
github-advanced-security bot found potential problems Mar 21, 2025
View reviewed changes
apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -323,4 +336,25 @@
$this->addressBookInfo['{DAV:}displayname'] === $this->urlGenerator->getBaseUrl()
);
}

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

Check notice

Code scanning / Psalm

RiskyTruthyFalsyComparison Note

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

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

Check notice

Code scanning / Psalm

PossiblyInvalidOperand Note

Cannot concatenate with a array<array-key, string>|string
@hamza221
Copy link
Contributor

Cypress looks unrelated

@ChristophWurst ChristophWurst merged commit cf130f4 into stable30 Mar 26, 2025
263 of 286 checks passed
@ChristophWurst ChristophWurst deleted the backport/51380/stable30 branch March 26, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@st3iny st3iny st3iny approved these changes

@hamza221 hamza221 hamza221 approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@GretaD GretaD Awaiting requested review from GretaD

@SebastianKrupinski SebastianKrupinski Awaiting requested review from SebastianKrupinski SebastianKrupinski is a code owner

Assignees

@hamza221 hamza221

Labels
3. to review Waiting for reviews bug feature: carddav Related to CardDAV internals pending documentation This pull request needs an associated documentation update
Projects
None yet
Milestone
Nextcloud 30.0.9
Development

Successfully merging this pull request may close these issues.
5 participants
@hamza221 @AndyScherzinger @st3iny @ChristophWurst @blizzz