refactor(routes): rely on RuntimeRoutesProvider for URL generation

src/Admin/OAuthProviderController.php

@@ -29,7 +29,7 @@
 use Horde\Core\Sidebar\SidebarRenderer;
 use Horde\Core\Topbar\TopbarBuilder;
 use Horde\Core\Topbar\TopbarRenderer;
-use Horde\Horde\Service\UrlGenerator;
+use Horde\Core\Uri\RouteUrlWriter;
 use Horde\Horde\Traits\HtmlResponseTrait;
 use Horde\Horde\Traits\RedirectResponseTrait;
 use Horde\OAuth\Client\ProviderDiscovery;
@@ -57,7 +57,7 @@ public function __construct(
         private readonly AdminSidebarPanel $adminPanel,
         private readonly SidebarRenderer $sidebarRenderer,
         private readonly Horde_Registry $registry,
-        private readonly UrlGenerator $urlGenerator,
+        private readonly RouteUrlWriter $urlWriter,
         private readonly ?ProviderDiscovery $discovery = null,
     ) {}
 
@@ -188,7 +188,7 @@ private function editProvider(ServerRequestInterface $request, ?string $provider
         $view->provider = $provider;
         $view->baseUrl = $baseUrl;
         $view->setupNotes = $preset['notes'] ?? '';
-        $view->callbackUrl = $this->urlGenerator->absoluteUrlFor('SettingsOAuthCallback');
+        $view->callbackUrl = $this->urlWriter->absoluteUrlFor('SettingsOAuthCallback');
 
         $template = $provider['type'] === 'service_app' ? 'edit-service-app' : 'edit-oauth2';
 

src/Auth/OAuthLoginController.php

@@ -18,7 +18,7 @@
 
 use Horde\Core\Service\OAuthProviderConfigRepository;
 use Horde\Core\Service\Exception\OAuthProviderConfigNotFoundException;
-use Horde\Horde\Service\UrlGenerator;
+use Horde\Core\Uri\RouteUrlWriter;
 use Horde\Horde\Traits\RedirectResponseTrait;
 use Horde\OAuth\Client\OAuth2Client;
 use Horde\OAuth\Client\OAuthFlowData;
@@ -39,7 +39,7 @@ class OAuthLoginController implements RequestHandlerInterface
 
     public function __construct(
         private readonly OAuthProviderConfigRepository $providerConfig,
-        private readonly UrlGenerator $urlGenerator,
+        private readonly RouteUrlWriter $urlWriter,
         private readonly OAuthFlowStore $flowStore,
         private readonly Horde_Registry $registry,
         private readonly ClientInterface $httpClient,
@@ -84,7 +84,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             redirectUrl: $redirectUrl,
         ));
 
-        $callbackUri = $this->urlGenerator->absoluteUrlFor('SettingsOAuthCallback');
+        $callbackUri = $this->urlWriter->absoluteUrlFor('SettingsOAuthCallback');
         $providerCfg = ProviderConfig::fromArray($row);
 
         $client = new OAuth2Client(

src/Service/UrlGenerator.php

@@ -20,6 +20,12 @@
 use Horde\Routes\Mapper;
 use Horde\Routes\Utils;
 
+/**
+ * NOTE: New code should use Horde\Core\Uri\RouteUrlWriter instead.
+ * RouteUrlWriter consumes the RoutesProvider interface and works in both
+ * Rampage (without legacy bootstrap) and legacy flows. This class remains
+ * for existing callers wired through _bootstrap() in Application.php.
+ */
 class UrlGenerator
 {
     private Utils $utils;

src/Settings/OAuthAccountController.php

@@ -31,7 +31,7 @@
 use Horde\Core\Topbar\TopbarRenderer;
 use Horde\Horde\Service\AuthLink;
 use Horde\Horde\Service\IdentityLinkService;
-use Horde\Horde\Service\UrlGenerator;
+use Horde\Core\Uri\RouteUrlWriter;
 use Horde\Horde\Traits\HtmlResponseTrait;
 use Horde\Horde\Traits\RedirectResponseTrait;
 use Horde\Identity\IdentityRole;
@@ -65,7 +65,7 @@ public function __construct(
         private readonly OAuthTokenService $tokenService,
         private readonly IdentityLinkService $identityLinkService,
         private readonly IdentityService $identityService,
-        private readonly UrlGenerator $urlGenerator,
+        private readonly RouteUrlWriter $urlWriter,
         private readonly OAuthFlowStore $flowStore,
         private readonly Horde_Notification_Handler $notification,
         private readonly AssetCollector $assetCollector,
@@ -438,7 +438,7 @@ private function disconnect(ServerRequestInterface $request, ?string $providerId
     private function buildOAuth2Client(array $row): OAuth2Client
     {
         $providerConfig = ProviderConfig::fromArray($row);
-        $redirectUri = $this->urlGenerator->absoluteUrlFor('SettingsOAuthCallback');
+        $redirectUri = $this->urlWriter->absoluteUrlFor('SettingsOAuthCallback');
 
         return new OAuth2Client(
             provider: $providerConfig,