Handle missing auth data and stale package lists

diff --git a/wcfsetup/install/files/acp/templates/license.tpl b/wcfsetup/install/files/acp/templates/license.tpl
index 43ee7f711f820a1d47a7f3c4422142bb97b9e91c..5294e69cb4e2f861bdc44c1b347114536acbdffc 100644 (file)
--- a/wcfsetup/install/files/acp/templates/license.tpl
+++ b/wcfsetup/install/files/acp/templates/license.tpl
@@ -48,7 +48,7 @@
     <h1 class="sectionTitle">WoltLab®</h1>
 
     <div class="section tabularBox">
-        <table class="table licensed_packages licensed_packages--woltlab">
+        <table class="table licensed_packages">
             <thead>
                 <tr>
                     <th colspan="2">{lang}wcf.acp.package.name{/lang}</th>
@@ -96,43 +96,40 @@
     <h1 class="sectionTitle">WoltLab® Plugin-Store</h1>
 
     <div class="section tabularBox">
-        <table class="table">
+        <table class="table licensed_packages">
             <thead>
                 <tr>
-                    <th>TODO: Name</th>
-                    <th>TODO: Major Version</th>
-                    <th>TODO: Action</th>
+                    <th colspan="2">{lang}wcf.acp.package.name{/lang}</th>
                 </tr>
             </thead>
             <tbody>
                 {content}
-                {foreach from=$licenseData[pluginstore] key=package item=majorVersion}
-                    <tr>
-                        <td>{$package}</td>
-                        <td>{$majorVersion}</td>
-
-                        {* TODO: Are we able to suggest if there is a newer
-                           version available? And if yes, how do we display this
-                           without breaking the version filter? Or does it only
-                           affect the availibility of the install button and not
-                           the row itself? *}
-                        
-                        {* TODO: Do we want to display the time of purchase here? *}
-
-                        <td>
-                            {if $package|in_array:$installedPackages}
-                                <span class="green">
+                {foreach from=$licenseData[woltlab] key=package item=majorVersion}
+                    <tr class="licensed_packages__package" data-package="{$package}">
+                        {if $installedPackages[$package]|isset}
+                            <td class="columnText">
+                                <span class="licensed_packages__package__title">{$installedPackages[$package]}</span>
+                                <span class="licensed_packages__package__version">{$installedPackages[$package]->packageVersion}</span>
+                                <small class="licensed_packages__package__description">{$installedPackages[$package]->getDescription()}</small>
+                            </td>
+                            <td class="columnStatus">
+                                <small class="green licensed_packages__package__action">
                                     {icon name='check'}
-                                    TODO: Installed
-                                </span>
-                            {elseif $installablePackages[$package]|isset}
+                                    {lang}wcf.acp.license.package.installed{/lang}
+                                </small>
+                            </td>
+                        {else}
+                            <td class="columnText">
+                                <span class="licensed_packages__package__title">{$packageUpdates[$package]->packageName}</span>
+                                <span class="licensed_packages__package__version">{$installablePackages[$package]}</span>
+                                <small class="licensed_packages__package__description">{$packageUpdates[$package]->packageDescription}</small>
+                            </td>
+                            <td class="columnStatus">
                                 <button type="button" class="button small jsInstallPackage" data-package="{$package}" data-package-version="{$installablePackages[$package]}">
-                                    TODO: Install {$installablePackages[$package]}
+                                    {lang}wcf.acp.license.package.install{/lang}
                                 </button>
-                            {else}
-                                TODO: Not available.
-                            {/if}
-                        </td>
+                            </td>
+                        {/if}
                     </tr>
                 {/foreach}
                 {/content}

diff --git a/wcfsetup/install/files/lib/acp/page/LicensePage.class.php b/wcfsetup/install/files/lib/acp/page/LicensePage.class.php
index 0d48b5e0805b2495f001bc9ce16102299d098e65..ffb68179b2130a64859cd82bd63ddb12154cd4ce 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/LicensePage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/LicensePage.class.php
@@ -5,14 +5,26 @@ namespace wcf\acp\page;
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
 use GuzzleHttp\Psr7\Request;
+use Laminas\Diactoros\Response\RedirectResponse;
+use wcf\acp\form\LicenseEditForm;
 use wcf\data\package\Package;
 use wcf\data\package\update\PackageUpdate;
+use wcf\data\package\update\PackageUpdateAction;
 use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\page\AbstractPage;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\io\HttpFactory;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 
+/**
+ * Lists the licensed products and offers to install them.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2023 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.0
+ */
 final class LicensePage extends AbstractPage
 {
     // TODO: This should be the actual menu item.
@@ -36,12 +48,14 @@ final class LicensePage extends AbstractPage
 
         $this->updateServer = PackageUpdateServer::getWoltLabUpdateServer();
 
-        // TODO: We actually need to fetch the data from the official package
-        // update servers first, because we rely on the human readable names.
+        if (!$this->hasLicenseCredentials()) {
+            return new RedirectResponse(
+                LinkHandler::getInstance()->getControllerLink(LicenseEditForm::class),
+            );
+        }
+
+        (new PackageUpdateAction([], 'refreshDatabase'))->executeAction();
 
-        // TODO: We should cache this data for a certain amount of time. There
-        // also needs tobe a way to manually trigger a refresh in case of a
-        // recent purchase.
         $this->licenseData = $this->fetchLicenseData();
 
         $identifiers = \array_merge(
@@ -82,10 +96,16 @@ final class LicensePage extends AbstractPage
                 return $b->isApplication <=> $a->isApplication;
             });
         }
+    }
+
+    private function hasLicenseCredentials(): bool
+    {
+        $authData = $this->updateServer->getAuthData();
+        if (empty($authData['username']) || empty($authData['password'])) {
+            return false;
+        }
 
-        // TODO: We need the data from the official package update servers to
-        // determine the human readable values for each package and to filter
-        // out those that are incompatible with the installed version.
+        return true;
     }
 
     public function assignVariables()