CIL-610 When allowing bypass via idphint, must set providerId in the …

…portalcookie so OAuth2 providers work as expected (bug fix).
cilogon · Dec 2, 2019 · 3bea6df · 3bea6df
1 parent 4d95f70
commit 3bea6df
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Service/Content.php b/src/Service/Content.php
@@ -1172,6 +1172,12 @@ public static function handleNoSubmitButtonClicked()
             // make sure that it matches the saved providerId. If not,
             // then show the Logon page and uncheck the keepidp checkbox.
             if ((strlen($selected_idp) == 0) || ($selected_idp == $providerId)) {
+                if (strlen($pn) > 0) {
+                    $pc->set('providerId', $providerId);
+                    $pc->write();
+                } else {
+                    Util::setCookieVar('providerId', $providerId);
+                }
                 $providerName = Util::getAuthzIdP($providerId);
                 if (in_array($providerName, Util::$oauth2idps)) {
                     // Log in with an OAuth2 IdP