Merge pull request #14255 from nextcloud/fix-ocm-discovery

Fix ocm end-point discovery discovery

1 files changed, 40 insertions, 0 deletions

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 4aa60912c37..7582b062d52 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-nginx');
+					messages.push({
+						msg: t('core', 'Your web server is not properly set up to resolve "{url}". This is most likely related to a web server configuration that was not updated to deliver this folder directly. Please compare your configuration against the shipped rewrite rules in ".htaccess" for Apache or the provided one in the documentation for Nginx at it\'s <a target="_blank" rel="noreferrer noopener" href="{docLink}">documentation page</a>. On Nginx those are typically the lines starting with "location ~" that need an update.', { docLink: docUrl, url: url }),
+						type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+					});
+				}
+				deferred.resolve(messages);
+			};
+
+			$.ajax({
+				type: 'GET',
+				url: url,
+				complete: afterCall,
+				allowAuthErrors: true
+			});
+			return deferred.promise();
+		},
+
+
 		/**
 		 * Check whether the WOFF2 URLs works.
 		 *