Move setRedirectUrl() logic

artefactual · Oct 10, 2024 · 18135ad · 18135ad
1 parent 1fb6ee1
commit 18135ad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/plugins/arOidcPlugin/lib/arOidc.class.php b/plugins/arOidcPlugin/lib/arOidc.class.php
@@ -33,12 +33,12 @@ public static function getOidcInstance()
     {
         $oidc = new OpenIDConnectClient();
 
-        // Validate redirect URL.
-        $redirectUrl = sfConfig::get('app_oidc_redirect_url', '');
-        if (empty($redirectUrl)) {
-            throw new Exception('Invalid OIDC redirect URL. Please review the app_oidc_redirect_url parameter in plugin app.yml.');
-        }
-        $oidc->setRedirectURL($redirectUrl);
+        // // Validate redirect URL.
+        // $redirectUrl = sfConfig::get('app_oidc_redirect_url', '');
+        // if (empty($redirectUrl)) {
+        //     throw new Exception('Invalid OIDC redirect URL. Please review the app_oidc_redirect_url parameter in plugin app.yml.');
+        // }
+        // $oidc->setRedirectURL($redirectUrl);
 
         return $oidc;
     }

diff --git a/plugins/arOidcPlugin/lib/oidcUser.class.php b/plugins/arOidcPlugin/lib/oidcUser.class.php
@@ -36,9 +36,18 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o
 
         parent::initialize($dispatcher, $storage, $options);
 
-        if (null === $this->oidcClient) {
-            $this->setOidcClient(arOidc::getOidcInstance());
+        $this->setOidcClient(arOidc::getOidcInstance());
+
+        $this->setRedirectURL();
+    }
+
+    public function setRedirectUrl()
+    {
+        $redirectUrl = sfConfig::get('app_oidc_redirect_url', '');
+        if (empty($redirectUrl)) {
+            throw new Exception('Invalid OIDC redirect URL. Please review the app_oidc_redirect_url parameter in plugin app.yml.');
         }
+        $this->oidcClient->setRedirectURL($redirectUrl);
     }
 
     /**