From 8cf40929e1b759703860ff834892ba73b8e8d100 Mon Sep 17 00:00:00 2001
From: MytsV <mytsvictoria@gmail.com>
Date: Thu, 7 Nov 2024 15:18:26 +0200
Subject: [PATCH 1/2] Set fetch API credentials parameter to include for
 consistent behaviour across browsers

---
 src/app/auth/login/page.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/auth/login/page.tsx b/src/app/auth/login/page.tsx
index a45c71952..df9e17f60 100644
--- a/src/app/auth/login/page.tsx
+++ b/src/app/auth/login/page.tsx
@@ -95,6 +95,7 @@ export default function Login() {
             res = await fetch(rucioX509Endpoint, {
                 method: 'GET',
                 headers: headers,
+                credentials: 'include',
             });
         } catch (error) {
             console.log(error);

From 13ba2a0e1bbf2b5625f5e965a557f1a5d2d1c314 Mon Sep 17 00:00:00 2001
From: MytsV <mytsvictoria@gmail.com>
Date: Thu, 7 Nov 2024 15:23:31 +0200
Subject: [PATCH 2/2] Fix the bug with x509 authentication failing with single
 account for identity

---
 src/component-library/pages/legacy/Login/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component-library/pages/legacy/Login/Login.tsx b/src/component-library/pages/legacy/Login/Login.tsx
index afe8b11d0..e2f4f6be8 100644
--- a/src/component-library/pages/legacy/Login/Login.tsx
+++ b/src/component-library/pages/legacy/Login/Login.tsx
@@ -142,7 +142,7 @@ export const Login = ({
 
         setLastAuthMethod('x509');
         handleAuthViewModel(x509AuthViewModel);
-        handleX509Session(x509AuthViewModel, account || '', vo.shortName);
+        handleX509Session(x509AuthViewModel, x509AuthViewModel.rucioAccount, vo.shortName);
     };
 
     const submitUserPass = async (account: string | undefined) => {