Use new SAML login paths in frontend and e2e-tests

espoon-voltti · Dec 11, 2024 · 8260346 · 8260346
1 parent 5fda7a9
commit 8260346
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/frontend/src/citizen-frontend/navigation/const.ts b/frontend/src/citizen-frontend/navigation/const.ts
@@ -6,12 +6,11 @@ export const logoutUrl = `/api/citizen/auth/logout?RelayState=/`
 
 export const getWeakLoginUri = (
   url = `${window.location.pathname}${window.location.search}${window.location.hash}`
-) =>
-  `/api/application/auth/evaka-customer/login?RelayState=${encodeURIComponent(url)}`
+) => `/api/citizen/auth/keycloak/login?RelayState=${encodeURIComponent(url)}`
 
 export const getStrongLoginUri = (
   url = `${window.location.pathname}${window.location.search}${window.location.hash}`
-) => `/api/application/auth/saml/login?RelayState=${encodeURIComponent(url)}`
+) => `/api/citizen/auth/sfi/login?RelayState=${encodeURIComponent(url)}`
 
 export const headerHeightDesktop = 80
 export const headerHeightMobile = 60

diff --git a/frontend/src/e2e-test/config.ts b/frontend/src/e2e-test/config.ts
@@ -60,8 +60,7 @@ const config = {
       env('BROWSER', parseEnum(['chromium', 'firefox', 'webkit'] as const)) ??
       'chromium'
   },
-  apiUrl: `${browserUrl}/api/internal`,
-  citizenApiUrl: `${browserUrl}/api/application`,
+  apiUrl: `${browserUrl}/api`,
   adminUrl: `${browserUrl}/employee/applications`,
   employeeUrl: `${browserUrl}/employee`,
   employeeLoginUrl: `${browserUrl}/employee/login`,

diff --git a/frontend/src/e2e-test/utils/user.ts b/frontend/src/e2e-test/utils/user.ts
@@ -12,7 +12,7 @@ export async function enduserLogin(page: Page, person: DevPerson) {
     throw new Error('Person does not have an SSN: cannot login')
   }
 
-  const authUrl = `${config.citizenApiUrl}/auth/saml/login/callback?RelayState=%2Fapplications`
+  const authUrl = `${config.apiUrl}/citizen/auth/sfi/login/callback?RelayState=%2Fapplications`
   if (!page.url.startsWith(config.enduserUrl)) {
     // We must be in the correct domain to be able to fetch()
     await page.goto(config.enduserLoginUrl)
@@ -85,7 +85,7 @@ export async function employeeLogin(
     email?: string | null
   }
 ) {
-  const authUrl = `${config.apiUrl}/auth/saml/login/callback?RelayState=%2Femployee`
+  const authUrl = `${config.apiUrl}/employee/auth/ad/login/callback?RelayState=%2Femployee`
   const preset = JSON.stringify({
     externalId,
     firstName,

diff --git a/frontend/src/employee-frontend/api/auth.ts b/frontend/src/employee-frontend/api/auth.ts
@@ -30,9 +30,9 @@ const redirectUri = (() => {
   }${searchParams}${window.location.hash}`
 })()
 
-export function getLoginUrl(type: 'evaka' | 'saml' = 'saml') {
+export function getLoginUrl(type: 'ad' | 'keycloak' = 'ad') {
   const relayState = encodeURIComponent(redirectUri)
-  return `/api/internal/auth/${type}/login?RelayState=${relayState}`
+  return `/api/employee/auth/${type}/login?RelayState=${relayState}`
 }
 
 export async function getAuthStatus(): Promise<AuthStatus<User>> {

diff --git a/frontend/src/employee-frontend/components/login-page/Login.tsx b/frontend/src/employee-frontend/components/login-page/Login.tsx
@@ -39,11 +39,11 @@ function Login({ error }: Props) {
           {i18n.login.subtitle}
         </Title>
         <Center>
-          <LinkButton data-qa="login-btn" href={getLoginUrl('saml')}>
+          <LinkButton data-qa="login-btn" href={getLoginUrl('ad')}>
             <span>{i18n.login.loginAD}</span>
           </LinkButton>
           <Gap horizontal />
-          <LinkButton data-qa="login-btn" href={getLoginUrl('evaka')}>
+          <LinkButton data-qa="login-btn" href={getLoginUrl('keycloak')}>
             <span>{i18n.login.loginEvaka}</span>
           </LinkButton>
         </Center>