Skip to content

fix(OCM): align parameter naming with spec and extend OCMProvider - #55471

Merged
AndyScherzinger merged 3 commits into
nextcloud:masterfrom
SUNET:kano-ocm-discovery
Oct 28, 2025
Merged

fix(OCM): align parameter naming with spec and extend OCMProvider#55471
AndyScherzinger merged 3 commits into
nextcloud:masterfrom
SUNET:kano-ocm-discovery

Conversation

@mickenordin

@mickenordinmickenordin commented Oct 1, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR updates the cloud_federation_api and OCM provider model:

  • Rename userId → userID in inviteAccepted (controller, logs, mapper, OpenAPI).
  • Extend OCMProvider:
    • Import capabilities from discovery data.
    • Include provider in jsonSerialize() output.

Fixes

  • Spec compliant clients send userID (not userId).
  • Discovery consumers now receive provider and capabilities.

@mickenordin
mickenordin requested a review from a team as a code ownerOctober 1, 2025 12:47
@mickenordin
mickenordin requested review from leftybournes, salmart-dev and sorbaugh and removed request for a teamOctober 1, 2025 12:47
@mickenordin
mickenordinforce-pushed the kano-ocm-discovery branch 2 times, most recently from 79018ee to 4f66547CompareOctober 2, 2025 07:12
@mickenordin
mickenordin requested a review from a team as a code ownerOctober 2, 2025 09:12
@mickenordin
mickenordin requested review from nfebe and susnux and removed request for a teamOctober 2, 2025 09:12
@mickenordinmickenordin changed the title fix(ocm): ensure capabilities are set on OCMProvider from discovery datafix(ocm): Fix OCMProvider discovery to include capabilities and provider fieldOct 2, 2025
@susnux
susnux removed their request for review October 2, 2025 09:44
@ArtificialOwl

ArtificialOwl commented Oct 2, 2025

Copy link
Copy Markdown
Member

/backport to stable32

@mickenordinmickenordin added the 3. to review Waiting for reviews label Oct 2, 2025
@mickenordin
mickenordinforce-pushed the kano-ocm-discovery branch 4 times, most recently from 0a63925 to eabfd8cCompareOctober 3, 2025 12:27
@mickenordinmickenordin changed the title fix(ocm): Fix OCMProvider discovery to include capabilities and provider fieldfix(OCM): align parameter naming with spec and extend OCMProviderOct 3, 2025
@mickenordinmickenordin added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 3, 2025
@mickenordin
mickenordinforce-pushed the kano-ocm-discovery branch 3 times, most recently from 23e1293 to 7b7e332CompareOctober 15, 2025 12:47
@github-actions

github-actionsBot commented Oct 16, 2025

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

nickvergessen added a commit to nextcloud/spreed that referenced this pull request Oct 17, 2025
@nickvergessen
test(federation): Run tests againnextcloud/server#55471
ae3f52d
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessennickvergessen mentioned this pull request Oct 17, 2025
Closed
@nickvergessen

nickvergessen commented Oct 17, 2025

Copy link
Copy Markdown
Member

@nickvergessen

nickvergessen commented Oct 17, 2025

Copy link
Copy Markdown
Member

Tests look fine in Talk

@mickenordin
mickenordinforce-pushed the kano-ocm-discovery branch 2 times, most recently from 009faf0 to eea8743CompareOctober 21, 2025 14:03
@mickenordin
fix(ocm): ensure capabilities are set on OCMProvider from discovery data
802a3f5
- Call `setCapabilities()` with `capabilities` field when available.
- Prevents loss of provider capability information during discovery.
Signed-off-by: Micke Nordin <kano@sunet.se>
@mickenordin
fix(ocm): include provider field in OCMProvider serialization
495a01a
- Add `provider` to `jsonSerialize()` output of OCMProvider.
- Ensures discovery consumers receive provider identifier along with
endpoint, version, and resources.
Signed-off-by: Micke Nordin <kano@sunet.se>
@mickenordin
fix(cloud-federation-api): align inviteAccepted parameter naming with…
a171fbf
… spec
- Rename method parameter from `userId` to `userID`.
- Update log message and `setRecipientUserId` call to use new variable.
- Without this change, we can not accept invites.
Signed-off-by: Micke Nordin <kano@sunet.se>
@blizzzblizzz added this to the Nextcloud 33 milestone Oct 27, 2025
mwinkens
mwinkens approved these changes Oct 28, 2025
View reviewed changes

@mwinkensmwinkens left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good to me. I don't know why the tests are failing here, this looks unrelated?

@ArtificialOwl

ArtificialOwl commented Oct 28, 2025

Copy link
Copy Markdown
Member

This is looking good to me. I don't know why the tests are failing here, this looks unrelated?

test are not run because the PR is generated from a fork

@AndyScherzinger

AndyScherzinger commented Oct 28, 2025

Copy link
Copy Markdown
Member

/backport to stable32

@AndyScherzinger
AndyScherzinger merged commit 4174c58 into nextcloud:masterOct 28, 2025
180 of 193 checks passed
@backportbotbackportbotBot mentioned this pull request Oct 28, 2025
Merged
@nextcloud-botnextcloud-bot mentioned this pull request Jan 6, 2026
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ArtificialOwlArtificialOwlArtificialOwl approved these changes
@provokateurinprovokateurinprovokateurin approved these changes
@mwinkensmwinkensmwinkens approved these changes
@salmart-devsalmart-devAwaiting requested review from salmart-devsalmart-dev is a code owner automatically assigned from nextcloud/server-backend
@leftybournesleftybournesAwaiting requested review from leftybournesleftybournes is a code owner automatically assigned from nextcloud/server-backend
@sorbaughsorbaughAwaiting requested review from sorbaughsorbaugh is a code owner automatically assigned from nextcloud/server-backend
@nfebenfebeAwaiting requested review from nfebenfebe was automatically assigned from nextcloud/server-frontend

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish32-feedbackbugfeedback-requested

Projects

None yet

Milestone

Nextcloud 33

Development

Successfully merging this pull request may close these issues.

7 participants

@mickenordin@ArtificialOwl@nickvergessen@AndyScherzinger@provokateurin@mwinkens@blizzz