fix: corrected handling of 404 for nightly downloads

Author: thorsten

phpmyfaq/admin/assets/src/configuration/upgrade.ts

@@ -149,12 +149,18 @@ export const handleCheckForUpdates = (): void => {
         const divExtractPackage = document.getElementById('pmf-update-step-extract-package') as HTMLElement;
         const card = document.getElementById('pmf-update-step-download') as HTMLElement;
 
-        if (result) {
+        if (response.success) {
           card.classList.add('text-bg-success');
           divExtractPackage!.classList.remove('d-none');
           result.replaceWith(addElement('p', { innerText: response.success! }));
           spinner.classList.add('d-none');
         }
+
+        if (response.error) {
+          card.classList.add('text-bg-danger');
+          result.replaceWith(addElement('p', { innerText: response.error! }));
+          spinner.classList.add('d-none');
+        }
       } catch (error) {
         const errorMessage = error as ResponseData;
         const result = document.getElementById('result-download-new-version') as HTMLElement;

phpmyfaq/assets/templates/admin/configuration/upgrade.twig

@@ -70,7 +70,9 @@
             <p class="alert alert-warning">
               {{ 'alertNightlyBuild' | translate }}
             <hr>
-            {{ 'noteNightlyBuild' | translate }}
+              <span class="small">
+                {{ 'noteNightlyBuild' | translate }}
+              </span>
             </p>
             <div class="d-grid gap-2 d-md-flex justify-content-between">
               <button type="button" class="btn btn-primary mb-2" id="pmf-button-download-now">

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/UpdateController.php

@@ -139,7 +139,11 @@ public function downloadPackage(Request $request): JsonResponse
         $versionNumber = Filter::filterVar($request->get('versionNumber'), FILTER_SANITIZE_SPECIAL_CHARS);
 
         $upgrade = $this->container->get('phpmyfaq.setup.upgrade');
-        $pathToPackage = $upgrade->downloadPackage($versionNumber);
+        try {
+            $pathToPackage = $upgrade->downloadPackage($versionNumber);
+        } catch (Exception $exception) {
+            return $this->json(['error' => $exception->getMessage()], Response::HTTP_BAD_REQUEST);
+        }
 
         if ($pathToPackage === false) {
             return $this->json(['error' => Translation::get(

phpmyfaq/src/phpMyFAQ/Setup/Upgrade.php

@@ -132,7 +132,7 @@ public function downloadPackage(string $version): string
             $response = $httpClient->request('GET', $url);
 
             if ($response->getStatusCode() !== 200) {
-                throw new Exception('Cannot download package.');
+                throw new Exception('Cannot download package (HTTP Status: ' . $response->getStatusCode() . ').');
             }
 
             $package = $response->getContent();
@@ -342,7 +342,7 @@ public function getPath(): string
     public function getFilename(string $version): string
     {
         if ($this->isNightly()) {
-            return sprintf(self::GITHUB_FILENAME, date('Y-m-d', strtotime('now')));
+            return sprintf(self::GITHUB_FILENAME, date('Y-m-d', strtotime('-1 days')));
         }
 
         return sprintf(self::PHPMYFAQ_FILENAME, $version);