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 ocm end-point discovery discovery #14255

Merged
merged 5 commits into from Feb 20, 2019
Merged

Fix ocm end-point discovery discovery #14255

merged 5 commits into from Feb 20, 2019

Conversation

schiessle
Copy link
Member

fix #14247

@rullzer
Copy link
Member

rullzer commented Feb 17, 2019

TODO:

  • Update nginx docs

@schiessle
Copy link
Member Author

@rullzer updated the documentation as well: nextcloud/documentation#1260

@rullzer
Copy link
Member

rullzer commented Feb 18, 2019

@MorrisJobke just editing it there is enough to also trigger the recreation of htacceess during update right?

@MorrisJobke
Copy link
Member

Please add a setup check to the admin settings to notify users about this.

See for example the well-known check in the browser that does something like this:

OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!oc_appconfig.core.public_webfinger, [200, 501]),

@MorrisJobke
Copy link
Member

@MorrisJobke just editing it there is enough to also trigger the recreation of htacceess during update right?

It is written on every update - so yes.

@schiessle
Copy link
Member Author

@MorrisJobke seems like we don't have a similar check for the "ocs-provider" endpoint as well. I'm not sure how to add this quickly. Maybe some of our @nextcloud/javascript experts?

@schiessle
Copy link
Member Author

I added a check for both (while I'm on it), the ocs-provider and the ocm-provider route, see the last two commits

core/js/setupchecks.js Outdated Show resolved Hide resolved
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
…ected to the index.php

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
settings/js/admin.js Outdated Show resolved Hide resolved
@MorrisJobke
Copy link
Member

And let me also rebase to resolve conflicts ...

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@schiessle
Copy link
Member Author

@MorrisJobke thanks for taking care of it! 👍

@MorrisJobke
Copy link
Member

And let me add some unit tests for it.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke MorrisJobke mentioned this pull request Feb 20, 2019
4 tasks
@MorrisJobke MorrisJobke merged commit beba182 into master Feb 20, 2019
@MorrisJobke MorrisJobke deleted the fix-ocm-discovery branch February 20, 2019 14:33
@MorrisJobke
Copy link
Member

/backport to stable15

@backportbot-nextcloud
Copy link

The backport to stable15 failed. Please do this backport manually.

@MorrisJobke
Copy link
Member

Backport in #14312

@MorrisJobke
Copy link
Member

@schiessle Is there any reason why this is not put under the /.well-known/ path, because this is the exact purpose of this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ocm-provider end-point doesn't work
3 participants