@sbc-connect/nuxt-auth 0.16.3 → 0.16.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @sbc-connect/nuxt-auth
 
+## 0.16.5
+
+### Patch Changes
+
+- [#194](https://github.com/bcgov/connect-nuxt/pull/194) [`a765c6e`](https://github.com/bcgov/connect-nuxt/commit/a765c6e9a87608e7a2c6e07abffd410a1e7e30c7) Thanks [@kialj876](https://github.com/kialj876)! - 34765 Auth - allow pre selecting login from redirect
+
+## 0.16.4
+
+### Patch Changes
+
+- [#192](https://github.com/bcgov/connect-nuxt/pull/192) [`7a8ed9f`](https://github.com/bcgov/connect-nuxt/commit/7a8ed9f6ab50bafb165d5fe0dc90477ec7917458) Thanks [@kialj876](https://github.com/kialj876)! - Login description can be set by the preset override
+
 ## 0.16.3
 
 ### Patch Changes

package/app/interfaces/app-config-shapes.ts

@@ -5,6 +5,7 @@ export interface ConnectLoginConfig {
   idps: IdpList
   skipAccountRedirect: boolean
   idpEnforcement: boolean
+  description?: string | null
   alert?: {
     title?: string
     message?: string

package/app/middleware/connect-auth.ts

@@ -1,5 +1,5 @@
 export default defineNuxtRouteMiddleware(async (to) => {
-  const { isAuthenticated } = useConnectAuth()
+  const { isAuthenticated, login } = useConnectAuth()
   const rtc = useRuntimeConfig().public
   const localePath = useLocalePath()
   const service = useConnectAuthService()
@@ -8,6 +8,19 @@ export default defineNuxtRouteMiddleware(async (to) => {
   const isLoginPage = to.meta.connectLogin === true
   const isTosPage = to.meta.connectTosPage === true
 
+  // a valid idp query param (e.g. ?idp=bcsc) triggers that login instead of showing the login options
+  // - the idp must be in the app's allowed idps list
+  if (!isAuthenticated.value && !rtc.playwright) {
+    const idp = String(to.query.idp ?? '')
+    if ((useAppConfig().connect.login.idps as string[]).includes(idp)) {
+      // remove the idp param from the Keycloak redirect URI so a cancelled login
+      // returns to the login options instead of re-triggering
+      const redirectUrl = new URL(`${rtc.baseUrl}${to.fullPath.slice(1)}`)
+      redirectUrl.searchParams.delete('idp')
+      return login(idp as ConnectIdpHint, redirectUrl.href)
+    }
+  }
+
   if (!isAuthenticated.value && !isLoginPage && !rtc.playwright) {
     const defaultReturn = `${rtc.baseUrl}${to.fullPath.slice(1)}`
     const returnUrl = (to.query.return && String(to.query.return)) || defaultReturn

package/app/pages/auth/login.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import loginImage from '#auth/public/img/BCReg_Generic_Login_image.jpg'
 
-const { t } = useI18n()
+const { t, te } = useI18n()
 const { login } = useConnectAuth()
 const ac = useAppConfig().connect.login
 
@@ -18,6 +18,21 @@ definePageMeta({
 
 const isSessionExpired = sessionStorage.getItem(ConnectAuthStorageKey.CONNECT_SESSION_EXPIRED)
 
+// app config (or preset) description overrides the default text
+// - either an i18n key or a literal string
+// - undefined (not specified) uses the default text
+// - empty string or null hides the description
+const description = computed(() => {
+  const override = ac.description
+  if (override === undefined) {
+    return t('connect.page.login.description')
+  }
+  if (!override) {
+    return ''
+  }
+  return te(override) ? t(override) : override
+})
+
 const loginOptions = computed(() => {
   const loginOptionsMap: Record<
     ConnectValidIdpOption,
@@ -64,8 +79,12 @@ const loginOptions = computed(() => {
       <h1>
         {{ $t('connect.page.login.h1') }}
       </h1>
-      <p class="max-w-[40rem] text-center">
-        {{ $t('connect.page.login.description') }}
+      <p
+        v-if="description"
+        class="max-w-[40rem] text-center"
+        data-testid="login-description"
+      >
+        {{ description }}
       </p>
       <UAlert
         v-if="isSessionExpired"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sbc-connect/nuxt-auth",
   "type": "module",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "repository": "github:bcgov/connect-nuxt",
   "license": "BSD-3-Clause",
   "main": "./nuxt.config.ts",
@@ -11,9 +11,9 @@
     "nuxt": "4.4.8",
     "typescript": "6.0.3",
     "vue-tsc": "3.3.1",
-    "@sbc-connect/eslint-config": "0.0.8",
     "@sbc-connect/playwright-config": "0.2.0",
-    "@sbc-connect/vitest-config": "0.2.0"
+    "@sbc-connect/vitest-config": "0.2.0",
+    "@sbc-connect/eslint-config": "0.0.8"
   },
   "dependencies": {
     "@pinia/colada": "1.3.0",