[4] Cleanup response from deleting /installation folder (#34173)

joomla · May 28, 2021 · f61b9ae · f61b9ae
1 parent d1b2b6b
commit f61b9ae
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Session\Session;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -256,24 +257,31 @@ public function delete()
 
 		/** @var \Joomla\CMS\Installation\Model\CleanupModel $model */
 		$model = $this->getModel('Cleanup');
-		$success = $model->deleteInstallationFolder();
 
-		// If an error was encountered return an error.
-		if (!$success)
+		if (!$model->deleteInstallationFolder())
 		{
-			$this->app->enqueueMessage(Text::sprintf('INSTL_COMPLETE_ERROR_FOLDER_DELETE', 'installation'), 'warning');
+			// We can't send a response with sendJsonResponse because our installation classes might not now exist
+			$error = [
+				'token' => Session::getFormToken(true),
+				'error' => true,
+				'data' => [
+					'view' => 'remove'
+				],
+				'messages' => [
+					'warning' => [
+						Text::sprintf('INSTL_COMPLETE_ERROR_FOLDER_DELETE', 'installation')
+					]
+				]
+			];
+
+			echo json_encode($error);
+
+			return;
 		}
 
 		$this->app->getSession()->destroy();
 
-		$r = new \stdClass;
-		$r->view = 'remove';
-
-		/**
-		 * TODO: We can't send a response this way because our installation classes no longer
-		 *       exist. We probably need to hardcode a json response here
-		 *
-		 * $this->sendJsonResponse($r);
-		 */
+		// We can't send a response with sendJsonResponse because our installation classes now do not exist
+		echo json_encode(['error' => false]);
 	}
 }
diff --git a/installation/template/js/remove.js b/installation/template/js/remove.js
@@ -42,11 +42,22 @@ if (document.getElementById('removeInstallationFolder')) {
 					perform: true,
 					token: true,
 					headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-					onSuccess: function () {
-						const customInstallation = document.getElementById('customInstallation');
-						customInstallation.parentNode.removeChild(customInstallation);
-						const removeInstallationTab = document.getElementById('removeInstallationTab');
-						removeInstallationTab.parentNode.removeChild(removeInstallationTab);
+					onSuccess: function (response) {
+            const successresponse = JSON.parse(response);
+            if (successresponse.error === true) {
+              if (successresponse.messages) {
+                Joomla.renderMessages(successresponse.messages, '#system-message-container');
+                Joomla.loadOptions({'csrf.token': successresponse.token});
+              } else {
+                // Stuff went wrong. No error messages. Just panic bail!
+                Joomla.renderMessages('Unknown error deleting the installation folder.', '#system-message-container');
+              }
+            } else {
+              const customInstallation = document.getElementById('customInstallation');
+              customInstallation.parentNode.removeChild(customInstallation);
+              const removeInstallationTab = document.getElementById('removeInstallationTab');
+              removeInstallationTab.parentNode.removeChild(removeInstallationTab);
+            }
 					},
 					onError: function (xhr) {
             Joomla.renderMessages({ error: [xhr] }, '#system-message-container');