WIP move to SSP UI

Author: cicnavi

bin/install.php

@@ -22,7 +22,7 @@
     $database = Database::getInstance();
     $databaseMigration = new DatabaseMigration($database);
 
-    if ($databaseMigration->isUpdated()) {
+    if ($databaseMigration->isMigrated()) {
         echo 'Database is up to date, skipping.' . PHP_EOL;
         return 0;
     }

hooks/hook_federationpage.php

@@ -27,7 +27,7 @@ function oidc_hook_federationpage(Template $template): void
     $href = Module::getModuleURL('oidc/admin-clients/index.php');
     $text = Translate::noop('OpenID Connect Registry');
 
-    if (! (new DatabaseMigration())->isUpdated()) {
+    if (! (new DatabaseMigration())->isMigrated()) {
         $href = Module::getModuleURL('oidc/install.php');
         $text = Translate::noop('OpenID Connect Installation');
     }

public/assets/css/src/default.css

@@ -65,7 +65,23 @@ h4 {
 /* Style for the content area */
 .content {
     flex-grow: 1;
-    padding: 20px;
+    padding-left: 20px;
     max-width: inherit;
     background-color: #fff;
 }
+
+ul.config {
+    list-style: disc outside none;
+}
+
+/* Text colors */
+.black-text { color: black; }
+.red-text { color: red; }
+.lightcoral-text { color: lightcoral; }
+.green-text { color: green; }
+.yellow-text { color: yellow; }
+.blue-text { color: blue; }
+.magenta-text { color: magenta; }
+.cyan-text { color: cyan; }
+.lightcyan-text { color: lightcyan; }
+.white-text { color: white; }

routing/routes/routes.php

@@ -25,6 +25,9 @@
      */
     $routes->add(RoutesEnum::AdminConfigOverview->name, RoutesEnum::AdminConfigOverview->value)
         ->controller([AdminController::class, 'configOverview']);
+    $routes->add(RoutesEnum::AdminRunMigrations->name, RoutesEnum::AdminRunMigrations->value)
+        ->controller([AdminController::class, 'runMigrations'])
+        ->methods([HttpMethodsEnum::POST->value]);
 
     /**
      * OpenID Connect Discovery routes.

src/Codebooks/RoutesEnum.php

@@ -8,6 +8,8 @@ enum RoutesEnum: string
 {
     // Admin area
     case AdminConfigOverview = 'admin/config-overview';
+    case AdminRunMigrations = 'admin/run-migrations';
+    case AdminClients = 'admin/clients';
 
     // Protocols
     case Authorization = 'authorization';

src/Controller/AdminController.php

@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Module\oidc\Controller;
 
+use SimpleSAML\Locale\Translate;
 use SimpleSAML\Module\oidc\Admin\Authorization;
 use SimpleSAML\Module\oidc\Codebooks\RoutesEnum;
 use SimpleSAML\Module\oidc\Factories\TemplateFactory;
 use SimpleSAML\Module\oidc\ModuleConfig;
+use SimpleSAML\Module\oidc\Services\DatabaseMigration;
+use SimpleSAML\Module\oidc\Services\SessionMessagesService;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 
 class AdminController
@@ -16,6 +20,8 @@ public function __construct(
         protected readonly ModuleConfig $moduleConfig,
         protected readonly TemplateFactory $templateFactory,
         protected readonly Authorization $authorization,
+        protected readonly DatabaseMigration $databaseMigration,
+        protected readonly SessionMessagesService $sessionMessagesService,
     ) {
         $this->authorization->requireSspAdmin(true);
     }
@@ -24,8 +30,26 @@ public function configOverview(): Response
     {
         return $this->templateFactory->build(
             'oidc:config/overview.twig',
-            ['moduleConfig' => $this->moduleConfig],
+            [
+                'moduleConfig' => $this->moduleConfig,
+                'databaseMigration' => $this->databaseMigration,
+            ],
             RoutesEnum::AdminConfigOverview->value,
         );
     }
+
+    public function runMigrations(): Response
+    {
+        if ($this->databaseMigration->isMigrated()) {
+            $message = Translate::noop('Database is already migrated.');
+            $this->sessionMessagesService->addMessage($message);
+            return new RedirectResponse($this->moduleConfig->getModuleUrl(RoutesEnum::AdminConfigOverview->value));
+        }
+
+        $this->databaseMigration->migrate();
+        $message = Translate::noop('Database migrated successfully.');
+        $this->sessionMessagesService->addMessage($message);
+
+        return new RedirectResponse($this->moduleConfig->getModuleUrl(RoutesEnum::AdminConfigOverview->value));
+    }
 }

src/Controller/InstallerController.php

@@ -42,7 +42,7 @@ public function __construct(
      */
     public function __invoke(ServerRequest $request): Template|RedirectResponse
     {
-        if ($this->databaseMigration->isUpdated()) {
+        if ($this->databaseMigration->isMigrated()) {
             return new RedirectResponse((new HTTP())->addURLParameters('admin-clients/index.php', []));
         }
 

src/Factories/AuthSimpleFactory.php

@@ -44,7 +44,7 @@ public function build(ClientEntityInterface $clientEntity): Simple
      */
     public function getDefaultAuthSource(): Simple
     {
-        return new Simple($this->getDefaultAuthSourceId());
+        return new Simple($this->moduleConfig->getDefaultAuthSourceId());
     }
 
     /**
@@ -54,14 +54,6 @@ public function getDefaultAuthSource(): Simple
      */
     public function resolveAuthSourceId(ClientEntityInterface $client): string
     {
-        return $client->getAuthSourceId() ?? $this->getDefaultAuthSourceId();
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function getDefaultAuthSourceId(): string
-    {
-        return $this->moduleConfig->config()->getString(ModuleConfig::OPTION_AUTH_SOURCE);
+        return $client->getAuthSourceId() ?? $this->moduleConfig->getDefaultAuthSourceId();
     }
 }

src/Factories/TemplateFactory.php

@@ -22,6 +22,7 @@
 use SimpleSAML\Module\oidc\Bridges\SspBridge;
 use SimpleSAML\Module\oidc\Codebooks\RoutesEnum;
 use SimpleSAML\Module\oidc\ModuleConfig;
+use SimpleSAML\Module\oidc\Services\SessionMessagesService;
 use SimpleSAML\XHTML\Template;
 
 class TemplateFactory
@@ -34,6 +35,7 @@ public function __construct(
         protected readonly ModuleConfig $moduleConfig,
         protected readonly Menu $oidcMenu,
         protected readonly SspBridge $sspBridge,
+        protected readonly SessionMessagesService $sessionMessagesService,
     ) {
     }
 
@@ -60,6 +62,7 @@ public function build(
             'moduleConfiguration' => $this->moduleConfig,
             'oidcMenu' => $this->oidcMenu,
             'showMenu' => $this->showMenu,
+            'sessionMessages' => $this->sessionMessagesService->getMessages(),
         ];
 
         if ($this->sspBridge->module()->isModuleEnabled('admin')) {
@@ -87,6 +90,13 @@ protected function includeDefaultMenuItems(): void
                 \SimpleSAML\Locale\Translate::noop('Config Overview '),
             ),
         );
+
+        $this->oidcMenu->addItem(
+            $this->oidcMenu->buildItem(
+                $this->moduleConfig->getModuleUrl(RoutesEnum::AdminClients->value),
+                \SimpleSAML\Locale\Translate::noop('Clients '),
+            ),
+        );
     }
 
     public function setShowMenu(bool $showMenu): TemplateFactory

src/ModuleConfig.php

@@ -161,6 +161,14 @@ public function getIssuer(): string
         return $issuer;
     }
 
+    /**
+     * @throws \Exception
+     */
+    public function getDefaultAuthSourceId(): string
+    {
+        return $this->config()->getString(self::OPTION_AUTH_SOURCE);
+    }
+
     public function getModuleUrl(string $path = null): string
     {
         $base = $this->sspBridge->module()->getModuleURL(self::MODULE_NAME);