Skip to content

Fix ocm end-point discovery discovery - #14255

Merged
MorrisJobke merged 5 commits into
masterfrom
fix-ocm-discovery
Feb 20, 2019
Merged

Fix ocm end-point discovery discovery#14255
MorrisJobke merged 5 commits into
masterfrom
fix-ocm-discovery

Conversation

@schiessle

Copy link
Copy Markdown
Member

@rullzer

rullzer commented Feb 17, 2019

Copy link
Copy Markdown
Member

TODO:

  • Update nginx docs

@schiessle

Copy link
Copy Markdown
MemberAuthor

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

@rullzer

Copy link
Copy Markdown
Member

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

@MorrisJobke

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
MemberAuthor

@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
Copy Markdown
MemberAuthor

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

Comment threadcore/js/setupchecks.js Outdated
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
…ected to the index.php
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Comment threadsettings/js/admin.js Outdated
@MorrisJobke

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

@MorrisJobke thanks for taking care of it! 👍

@MorrisJobke

Copy link
Copy Markdown
Member

And let me add some unit tests for it.

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

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

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

Copy link
Copy Markdown
Member

/backport to stable15

@backportbot-nextcloud

Copy link
Copy Markdown

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

@MorrisJobke

Copy link
Copy Markdown
Member

Backport in #14312

@MorrisJobke

Copy link
Copy Markdown
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ocm-provider end-point doesn't work

3 participants

@schiessle@rullzer@MorrisJobke