From 7c31c9a7486b055de008364be2d5a1176a45c43b Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 19 Feb 2019 22:20:33 +0100 Subject: [PATCH] add setup check for ocm-provider route Signed-off-by: Bjoern Schiessle --- core/js/setupchecks.js | 40 ++++++++++++++++++++++++++++++++++++++++ settings/js/admin.js | 1 + 2 files changed, 41 insertions(+) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 4aa60912c37..da5dc68b166 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -91,6 +91,46 @@ return deferred.promise(); }, + + /** + * Check whether the .well-known URLs works. + * + * @param url the URL to test + * @param placeholderUrl the placeholder URL - can be found at oc_defaults.docPlaceholderUrl + * @param {boolean} runCheck if this is set to false the check is skipped and no error is returned + * + * @return $.Deferred object resolved with an array of error messages + */ + checkProviderUrl: function(url, placeholderUrl, runCheck) { + var expectedStatus = [200]; + var deferred = $.Deferred(); + + if(runCheck === false) { + deferred.resolve([]); + return deferred.promise(); + } + var afterCall = function(xhr) { + var messages = []; + if (expectedStatus.indexOf(xhr.status) === -1) { + var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL'); + messages.push({ + msg: t('core', 'Your web server is not properly set up to resolve "{url}". Further information can be found in the documentation.', { docLink: docUrl, url: url }), + type: OC.SetupChecks.MESSAGE_TYPE_INFO + }); + } + deferred.resolve(messages); + }; + + $.ajax({ + type: 'GET', + url: url, + complete: afterCall, + allowAuthErrors: true + }); + return deferred.promise(); + }, + + /** * Check whether the WOFF2 URLs works. * diff --git a/settings/js/admin.js b/settings/js/admin.js index 1c9b5460eab..d47c0de3375 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -251,6 +251,7 @@ $(document).ready(function(){ OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!oc_appconfig.core.public_webfinger, [200, 501]), OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkProviderUrl('/ocm-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkSetup(), OC.SetupChecks.checkGeneric(), OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), oc_defaults.docPlaceholderUrl), -- 2.39.5