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.

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

fix: Use wopi callback url for all urls handed over to Collabora #3580

Merged
merged 1 commit into from
Apr 12, 2024

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Apr 12, 2024

Fix #3579

Some URLs were not respecting the wopi_callback_url setting that we have in place now to configure the URL that Collabora will use to talk to Nextcloud, so this PR adapts those.

@@ -38,7 +38,7 @@ const getCallbackBaseUrl = () => {
}

const getWopiSrc = (fileId) => {
// WOPISrc - URL that loolwsd will access (ie. pointing to ownCloud)
// WOPISrc - URL that Collabora will use to access Nextcloud
Copy link
Member Author

Choose a reason for hiding this comment

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

@blizzz Sneaked this in from your comment in #3575 😁

Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

nitpick: URL generation can be put in an new short method, so the next time it needs just only one adjustment. Not a blocker.

@juliushaertl juliushaertl force-pushed the fix/wopi-callback-url branch 2 times, most recently from 40fad16 to 2f82662 Compare April 12, 2024 07:25
@juliushaertl
Copy link
Member Author

Cypress failure seems related, will check

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl juliushaertl merged commit 1c0dee5 into main Apr 12, 2024
55 checks passed
@juliushaertl juliushaertl deleted the fix/wopi-callback-url branch April 12, 2024 08:23
@juliushaertl
Copy link
Member Author

/backport to stable29

@juliushaertl
Copy link
Member Author

/backport to stable28

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong protocol for TemplateSource URL when using nextcloud behind a proxy
2 participants