-
Notifications
You must be signed in to change notification settings - Fork 437
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.
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
Federation invitation from stable29 to main fails #12654
Labels
1. to develop
bug
feature: api 🛠️
OCS API for conversations, chats and participants
feature: federation 🌐
high
Milestone
Comments
SystemKeeper
added
1. to develop
bug
feature: api 🛠️
OCS API for conversations, chats and participants
feature: federation 🌐
labels
Jul 9, 2024
|
|
Todo
|
github-project-automation
bot
moved this to 🧭 Planning evaluation (don't pick)
in 💬 Talk team
Jul 9, 2024
nickvergessen
moved this from 🧭 Planning evaluation (don't pick)
to 📄 To do (~10 entries)
in 💬 Talk team
Jul 9, 2024
Patchdiff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php
index c49a64c20..b95b525fe 100644
--- a/lib/Federation/CloudFederationProviderTalk.php
+++ b/lib/Federation/CloudFederationProviderTalk.php
@@ -510,8 +519,15 @@ class CloudFederationProviderTalk implements ICloudFederationProvider {
try {
return $this->invitationMapper->getByRemoteAndAccessToken($remoteServerUrl, $remoteAttendeeId, $sharedSecret);
} catch (DoesNotExistException) {
- throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND);
+ if (!$this->addressHandler->urlContainProtocol($remoteServerUrl)) {
+ try {
+ return $this->invitationMapper->getByRemoteAndAccessToken('https://' . $remoteServerUrl, $remoteAttendeeId, $sharedSecret);
+ } catch (DoesNotExistException) {
+ }
+ }
}
+
+ throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND);
}
private function notifyAboutNewShare(IUser $shareWith, string $inviteId, string $sharedByFederatedId, string $sharedByName, string $roomName, string $remoteRoomToken, string $remoteServerUrl): void {
💭 Thoughts
|
I think expecting the protocol is the better idea going forward as that is what will be send. |
3 tasks
github-project-automation
bot
moved this from 📄 To do (~10 entries)
to ☑️ Done
in 💬 Talk team
Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
1. to develop
bug
feature: api 🛠️
OCS API for conversations, chats and participants
feature: federation 🌐
high
How to use GitHub
Steps to reproduce
Expected behaviour
Should work
Actual behaviour
User is invited and directly removed again, but the invitation shows up on the main instance (although unable to accept it).
On the stable29 instance:
When trying again to invite the same user:
The text was updated successfully, but these errors were encountered: