Fix regression in autofill username (introduced in v2.2.2)

tvdijen · tvdijen · commit c27831c44037 · 2024-06-19T19:00:42.000+02:00
diff --git a/modules/core/src/Controller/Login.php b/modules/core/src/Controller/Login.php
@@ -241,7 +241,7 @@ private function handleLogin(Request $request, UserPassBase|UserPassOrgBase $sou
         $t = new Template($this->config, 'core:loginuserpass.twig');
 
         if ($source instanceof UserPassOrgBase) {
-            $t->data['username'] = $username;
+            $t->data['username'] = $state['core:username'];
             $t->data['forceUsername'] = false;
             $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
             $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
@@ -255,7 +255,7 @@ private function handleLogin(Request $request, UserPassBase|UserPassOrgBase $sou
             $t->data['rememberMeEnabled'] = $source->isRememberMeEnabled();
             $t->data['rememberMeChecked'] = $source->isRememberMeChecked();
         } else {
-            $t->data['username'] = $username;
+            $t->data['username'] = $state['core:username'];
             $t->data['forceUsername'] = false;
             $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
             $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
@@ -380,8 +380,6 @@ private function getUsernameFromRequest(Request $request, Auth\Source $source, a
             && $request->cookies->has($source->getAuthId() . '-username')
         ) {
             $username = $request->cookies->get($source->getAuthId() . '-username');
-        } elseif (isset($state['core:username'])) {
-            $username = strval($state['core:username']);
         }
 
         return $username;
diff --git a/modules/saml/src/IdP/SAML2.php b/modules/saml/src/IdP/SAML2.php
@@ -345,6 +345,7 @@ public static function receiveAuthnRequest(Request $request, IdP $idp): Response
         }
 
         $authnRequestSigned = false;
+        $username = null;
 
         if ($request->query->has('spentityid') || $request->query->has('providerId')) {
             /* IdP initiated authentication. */
@@ -418,6 +419,10 @@ public static function receiveAuthnRequest(Request $request, IdP $idp): Response
                 );
             }
 
+            if (isset($_REQUEST['username'])) {
+                $username = (string) $_REQUEST['username'];
+            }
+
             $issuer = $authnRequest->getIssuer();
             if ($issuer === null) {
                 throw new Error\BadRequest(
@@ -545,6 +550,10 @@ public static function receiveAuthnRequest(Request $request, IdP $idp): Response
             'saml:RequestedAuthnContext'  => $authnContext,
         ];
 
+        if ($username !== null) {
+            $state['core:username'] = $username,
+        }
+
         return $idp->handleAuthenticationRequest($state);
     }
 
