Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2 - Auth Redirects #192

Merged
merged 3 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions app/middleware/signin-page.ts

This file was deleted.

10 changes: 7 additions & 3 deletions app/pages/dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const productStore = useUserProductsStore()
const { t } = useI18n()
const localePath = useLocalePath()
const { clearLoginRedirectUrl } = useKeycloak()
const { clearLoginRedirectUrl, setLogoutRedirectUrl } = useKeycloak()

useHead({
title: t('page.dashboard.title')
Expand All @@ -15,12 +15,16 @@ definePageMeta({
const helpHref = 'https://www2.gov.bc.ca/gov/content/employment-business/business/managing-a-business/permits-licences/news-updates/modernization-updates/modernization-resources'

onMounted(async () => {
const config = useRuntimeConfig().public
clearLoginRedirectUrl()
setLogoutRedirectUrl(config.baseURL)

await productStore.getUserProducts()

setBreadcrumbs([
{ to: localePath('/'), label: t('ConnectBreadcrumb.default') },
{ label: t('page.dashboard.h1') }
])
await productStore.getUserProducts()
clearLoginRedirectUrl()
})
</script>
<template>
Expand Down
13 changes: 12 additions & 1 deletion app/pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script setup lang="ts">
const { t } = useI18n()
const { t, locale } = useI18n()
const localePath = useLocalePath()
const { setLoginRedirectUrl, setLogoutRedirectUrl } = useKeycloak()
useHead({
title: t('page.home.title')
})
Expand All @@ -19,6 +20,16 @@ const homeItems = [
setBreadcrumbs([
{ label: t('ConnectBreadcrumb.default') }
])

onMounted(() => {
const config = useRuntimeConfig().public
// if user logs in from this page, go to dashboard
setLoginRedirectUrl(`${config.baseURL}${locale.value}/dashboard`)
// if user logs out from this page, return here
setLogoutRedirectUrl(`${config.baseURL}${locale.value}`)
// siteminder url to clear cookie
setSiteMinderLogoutUrl()
})
</script>
<template>
<div>
Expand Down
27 changes: 18 additions & 9 deletions app/pages/auth/signin.vue → app/pages/login.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
<script setup lang="ts">
const connectNav = reactive(useConnectNav())
const { t } = useI18n()
const localePath = useLocalePath()

useHead({
title: t('page.signin.title')
})

definePageMeta({
middleware: ['signin-page']
})

const items = computed(() => {
return connectNav.loggedOutUserOptions[1]
})

setBreadcrumbs([
{ to: localePath('/'), label: t('labels.bcRegAndOLServices') },
{ label: t('page.signin.h1') }
])
onMounted(async () => {
const keycloak = reactive(useKeycloak())
const localePath = useLocalePath()
const route = useRoute()

const returnUrl = route.query.return

if (keycloak.isAuthenticated) {
returnUrl ? await navigateTo(returnUrl as string, { external: true }) : await navigateTo(localePath('/dashboard'))
} else if (returnUrl) {
keycloak.setLoginRedirectUrl(returnUrl as string)
}

setBreadcrumbs([
{ to: localePath('/'), label: t('labels.bcRegAndOLServices') },
{ label: t('page.signin.h1') }
])
})
</script>
<template>
<ClientOnly>
Expand Down
16 changes: 12 additions & 4 deletions app/pages/ppr-marketing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,18 @@ watchDebounced(width, () => {
}
}, { immediate: true, debounce: 100 })

setBreadcrumbs([
{ to: localePath('/'), label: t('labels.bcRegAndOLServices') },
{ label: t('labels.ppr') }
])
onMounted(() => {
const config = useRuntimeConfig().public
setBreadcrumbs([
{ to: localePath('/'), label: t('labels.bcRegAndOLServices') },
{ label: t('labels.ppr') }
])

// if user logs in from this page, go to dashboard
keycloak.setLoginRedirectUrl(`${config.baseURL}${locale.value}/dashboard`)
// if user logs out from this page, return here
keycloak.setLogoutRedirectUrl(`${config.baseURL}${locale.value}/ppr-marketing`)
})
</script>
<template>
<div>
Expand Down
32 changes: 32 additions & 0 deletions app/pages/signin.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<script setup lang="ts">
definePageMeta({
path: '/signin/:slug'
})

onMounted(async () => {
const route = useRoute()
const config = useRuntimeConfig().public
const keycloak = reactive(useKeycloak())
const localePath = useLocalePath()
const { locale } = useI18n()

if (keycloak.isAuthenticated) {
await navigateTo(localePath('/dashboard'))
} else {
const sessionLoginUrl = sessionStorage.getItem('LOGIN_URL')
const loginUrl = sessionLoginUrl || `${config.baseURL}${locale.value}/dashboard`
const slug = route.params.slug as IdpHint | undefined

if (slug && [IdpHint.BCEID, IdpHint.BCSC, IdpHint.IDIR].includes(slug)) {
keycloak.login(slug, loginUrl)
} else {
await navigateTo('/login')
}
}
})
</script>
<template>
<ClientOnly>
<ConnectSpinner overlay />
</ClientOnly>
</template>
16 changes: 16 additions & 0 deletions app/pages/signout.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script setup lang="ts">
onMounted(() => {
const keycloak = useKeycloak()
const { locale } = useI18n()
const config = useRuntimeConfig().public

const redirectUrl = sessionStorage.getItem('LOGOUT_URL') || `${config.baseURL}${locale.value}`

keycloak.logout(redirectUrl)
})
</script>
<template>
<ClientOnly>
<ConnectSpinner overlay />
</ClientOnly>
</template>
7 changes: 7 additions & 0 deletions app/utils/setSiteMinderLogoutUrl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/** Sets site minder URL to clear cookie. */
export function setSiteMinderLogoutUrl (): void {
const url = useRuntimeConfig().public.siteMinderLogoutUrl
if (url?.includes('http')) {
sessionStorage.setItem('SITEMINDER_LOGOUT_URL', url)
}
}
Loading