Merge pull request #13134 from nextcloud/bugfix/13088/404-instead-of-exception

returns a 404 instead of exception if app is not installed - #13088

1 files changed, 7 insertions, 3 deletions

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index cca3707acdf..4aa60912c37 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -52,12 +52,16 @@
 		 * @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
-		 * @param {int} expectedStatus the expected HTTP status to be returned by the URL, 207 by default
+		 * @param {int|int[]} expectedStatus the expected HTTP status to be returned by the URL, 207 by default
 		 * @return $.Deferred object resolved with an array of error messages
 		 */
 		checkWellKnownUrl: function(url, placeholderUrl, runCheck, expectedStatus) {
 			if (expectedStatus === undefined) {
-				expectedStatus = 207;
+				expectedStatus = [207];
+			}
+
+			if (!Array.isArray(expectedStatus)) {
+				expectedStatus = [expectedStatus];
 			}
 
 			var deferred = $.Deferred();
@@ -68,7 +72,7 @@
 			}
 			var afterCall = function(xhr) {
 				var messages = [];
-				if (xhr.status !== expectedStatus) {
+				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 <a target="_blank" rel="noreferrer noopener" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }),