From fe7e90d6499367de5db1fa705540f060edbfe3ef Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Tue, 22 Oct 2024 18:33:40 -0700
Subject: [PATCH 1/3] set redirect urls on home page

---
 app/pages/index.vue                 | 13 ++++++++++++-
 app/utils/setSiteMinderLogoutUrl.ts |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 app/utils/setSiteMinderLogoutUrl.ts

diff --git a/app/pages/index.vue b/app/pages/index.vue
index c76e555..104e26d 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -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')
 })
@@ -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>
diff --git a/app/utils/setSiteMinderLogoutUrl.ts b/app/utils/setSiteMinderLogoutUrl.ts
new file mode 100644
index 0000000..4f0a4e0
--- /dev/null
+++ b/app/utils/setSiteMinderLogoutUrl.ts
@@ -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)
+  }
+}

From 62c5c70b0aa17a03763c578c8feece0663a09f7a Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 25 Oct 2024 20:53:01 -0700
Subject: [PATCH 2/3] set redirect urls on ppr-marketing page

---
 app/pages/ppr-marketing.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/pages/ppr-marketing.vue b/app/pages/ppr-marketing.vue
index b8bc173..7236dd8 100644
--- a/app/pages/ppr-marketing.vue
+++ b/app/pages/ppr-marketing.vue
@@ -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.setLoginRedirectUrl(`${config.baseURL}${locale.value}/ppr-marketing`)
+})
 </script>
 <template>
   <div>

From 475c7e17cd40248283cf5968988dd0895c84adca Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 25 Oct 2024 22:05:20 -0700
Subject: [PATCH 3/3] add missing redirects and auth pages

---
 app/middleware/signin-page.ts            | 10 --------
 app/pages/dashboard.vue                  | 10 +++++---
 app/pages/{auth/signin.vue => login.vue} | 27 +++++++++++++-------
 app/pages/ppr-marketing.vue              |  2 +-
 app/pages/signin.vue                     | 32 ++++++++++++++++++++++++
 app/pages/signout.vue                    | 16 ++++++++++++
 6 files changed, 74 insertions(+), 23 deletions(-)
 delete mode 100644 app/middleware/signin-page.ts
 rename app/pages/{auth/signin.vue => login.vue} (72%)
 create mode 100644 app/pages/signin.vue
 create mode 100644 app/pages/signout.vue

diff --git a/app/middleware/signin-page.ts b/app/middleware/signin-page.ts
deleted file mode 100644
index 746fa2f..0000000
--- a/app/middleware/signin-page.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default defineNuxtRouteMiddleware((to) => {
-  if (import.meta.client) {
-    const { isAuthenticated } = useKeycloak()
-    const localePath = useLocalePath()
-
-    if (isAuthenticated.value && to.path === localePath('/auth/signin')) {
-      return navigateTo(localePath('/'))
-    }
-  }
-})
diff --git a/app/pages/dashboard.vue b/app/pages/dashboard.vue
index 1488339..7c0961c 100644
--- a/app/pages/dashboard.vue
+++ b/app/pages/dashboard.vue
@@ -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')
@@ -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>
diff --git a/app/pages/auth/signin.vue b/app/pages/login.vue
similarity index 72%
rename from app/pages/auth/signin.vue
rename to app/pages/login.vue
index 8649727..5015162 100644
--- a/app/pages/auth/signin.vue
+++ b/app/pages/login.vue
@@ -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>
diff --git a/app/pages/ppr-marketing.vue b/app/pages/ppr-marketing.vue
index 7236dd8..8548249 100644
--- a/app/pages/ppr-marketing.vue
+++ b/app/pages/ppr-marketing.vue
@@ -92,7 +92,7 @@ onMounted(() => {
   // 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.setLoginRedirectUrl(`${config.baseURL}${locale.value}/ppr-marketing`)
+  keycloak.setLogoutRedirectUrl(`${config.baseURL}${locale.value}/ppr-marketing`)
 })
 </script>
 <template>
diff --git a/app/pages/signin.vue b/app/pages/signin.vue
new file mode 100644
index 0000000..f8e8c2d
--- /dev/null
+++ b/app/pages/signin.vue
@@ -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>
diff --git a/app/pages/signout.vue b/app/pages/signout.vue
new file mode 100644
index 0000000..54c070f
--- /dev/null
+++ b/app/pages/signout.vue
@@ -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>