Fix setting cookies to remember username/org

tvdijen · web-flow · commit 005184a2fdcd · 2023-05-30T12:45:15.000+02:00
We set them in the wrong place.
diff --git a/modules/core/src/Controller/Login.php b/modules/core/src/Controller/Login.php
@@ -155,9 +155,9 @@ private function handleLogin(Request $request, $source, array $state): Response
             $errorParams = $state['error']['params'];
         }
 
-        $cookies = [];
         if ($organizations === null || $organization !== '') {
             if (!empty($username) || !empty($password)) {
+                $cookies = [];
                 $httpUtils = new Utils\HTTP();
                 $sameSiteNone = $httpUtils->canSetSamesiteNone() ? Cookie::SAMESITE_NONE : null;
 
@@ -221,10 +221,16 @@ private function handleLogin(Request $request, $source, array $state): Response
 
                 try {
                     if ($source instanceof UserPassOrgBase) {
-                        return UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
+                        $response = UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
                     } else {
-                        return UserPassBase::handleLogin($authStateId, $username, $password);
+                        $response = UserPassBase::handleLogin($authStateId, $username, $password);
                     }
+
+                    foreach ($cookies as $cookie) {
+                        $response->headers->setCookie($cookie);
+                    }
+
+                    return $response;
                 } catch (Error\Error $e) {
                     // Login failed. Extract error code and parameters, to display the error
                     $errorCode = $e->getErrorCode();
@@ -302,10 +308,6 @@ private function handleLogin(Request $request, $source, array $state): Response
             $t->data['SPMetadata'] = null;
         }
 
-        foreach ($cookies as $cookie) {
-            $t->headers->setCookie($cookie);
-        }
-
         return $t;
     }
 
