@sbc-connect/nuxt-auth 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @sbc-connect/nuxt-auth
 
+## 0.7.0
+
+### Minor Changes
+
+- [#135](https://github.com/bcgov/connect-nuxt/pull/135) [`31c8786`](https://github.com/bcgov/connect-nuxt/commit/31c87862eae861c21fd26d8b79325b38eca565cb) Thanks [@cameron-eyds](https://github.com/cameron-eyds)! - Updated Account Status Handling
+
+- [#136](https://github.com/bcgov/connect-nuxt/pull/136) [`7e3a970`](https://github.com/bcgov/connect-nuxt/commit/7e3a9701ddd5304851c8d55c9fc940b2da656cbf) Thanks [@cameron-eyds](https://github.com/cameron-eyds)! - Misc typing and e2e test fixes
+
+- [#137](https://github.com/bcgov/connect-nuxt/pull/137) [`9c10812`](https://github.com/bcgov/connect-nuxt/commit/9c10812d8ecde646eb185310376cabd3319a414d) Thanks [@deetz99](https://github.com/deetz99)! - Account creation form: fix padding
+
+- [#133](https://github.com/bcgov/connect-nuxt/pull/133) [`644cb59`](https://github.com/bcgov/connect-nuxt/commit/644cb59f04d17e8ad5d480ad63d475359415ebcc) Thanks [@cameron-eyds](https://github.com/cameron-eyds)! - Session expiry logout url updates
+
+### Patch Changes
+
+- Updated dependencies [[`9c10812`](https://github.com/bcgov/connect-nuxt/commit/9c10812d8ecde646eb185310376cabd3319a414d), [`7e3a970`](https://github.com/bcgov/connect-nuxt/commit/7e3a9701ddd5304851c8d55c9fc940b2da656cbf)]:
+  - @sbc-connect/nuxt-forms@0.6.0
+  - @sbc-connect/nuxt-base@0.7.0
+
+## 0.6.2
+
+### Patch Changes
+
+- [#131](https://github.com/bcgov/connect-nuxt/pull/131) [`f649e93`](https://github.com/bcgov/connect-nuxt/commit/f649e930fcb08a4e363e2b6632cb337466f21150) Thanks [@kialj876](https://github.com/kialj876)! - Update useConnectAccountFlowRedirect to add accountid to the query and remove modal in idp-enforcement middleware
+
 ## 0.6.1
 
 ### Patch Changes

package/app/components/Connect/Account/Create/Name.vue

@@ -18,9 +18,9 @@ const validateName = useDebounceFn(async (accountName: string) => {
     try {
       const { refetch } = authApi.verifyAccountName(accountName)
       const { data } = await refetch()
-      statusCode.value = data?.status
+      statusCode.value = data?.status ?? 500 // fallback as undefined is not considered an exception
     } catch (err: unknown) {
-      statusCode.value = err?.response?.status || 500
+      statusCode.value = getErrorStatus(err) ?? 500
     } finally {
       isLoading.value = false
     }
@@ -57,10 +57,10 @@ provide('UInput-props-account-name-input', uInputProps)
 
 <template>
   <ConnectFormFieldWrapper
-    class="pt-2 my-6"
     :label="$t('connect.page.createAccount.accountNameLabel')"
     orientation="horizontal"
     :error
+    padding-class="pt-6 pb-4 px-4 sm:pb-4 sm:pt-8 sm:px-8"
   >
     <ConnectFormInput
       v-model="accountFormState.accountName"

package/app/components/Connect/Account/Create/index.vue

@@ -25,7 +25,10 @@ const formErrors = computed<{
 })
 
 async function validate(fieldName?: keyof AccountProfileSchema) {
-  return formRef.value?.validate({ name: fieldName, silent: true })
+  return formRef.value?.validate({
+    name: fieldName as never,
+    silent: true
+  })
 }
 
 watch(() => statusCode.value, async () => {
@@ -42,11 +45,11 @@ watch(() => statusCode.value, async () => {
       label: $t('connect.label.accountInformation'),
       labelClass: 'font-bold md:ml-4',
     }"
+    ui-body="p-0 sm:p-0"
   >
     <UForm
       id="account-create-form"
       ref="account-create-form"
-      class="p-8"
       no-validate
       :validate-on="['input', 'change']"
       :schema="accountProfileSchema"
@@ -58,6 +61,7 @@ watch(() => statusCode.value, async () => {
       <ConnectFormFieldWrapper
         :label="$t('connect.page.createAccount.yourNameLabel')"
         orientation="horizontal"
+        class="py-6 sm:py-8"
       >
         <p class="font-bold">
           {{ userFullName }}
@@ -67,7 +71,7 @@ watch(() => statusCode.value, async () => {
         </p>
       </ConnectFormFieldWrapper>
 
-      <USeparator orientation="horizontal" class="my-8" />
+      <USeparator orientation="horizontal" />
 
       <!-- Account Name -->
       <ConnectAccountCreateName
@@ -77,10 +81,10 @@ watch(() => statusCode.value, async () => {
 
       <!-- Account Email -->
       <ConnectFormFieldWrapper
-        class="my-6"
         :label="$t('connect.page.createAccount.emailLabel')"
         orientation="horizontal"
         :error="formErrors.emailAddress"
+        padding-class="py-1 px-4 sm:py-2 sm:px-8"
       >
         <ConnectFormInput
           v-model="accountFormState.emailAddress"
@@ -95,6 +99,7 @@ watch(() => statusCode.value, async () => {
         :label="$t('connect.page.createAccount.phoneLabel')"
         orientation="horizontal"
         :error="formErrors.phone"
+        padding-class="py-1 px-4 sm:py-2 sm:px-8"
       >
         <div class="flex flex-row gap-2">
           <!-- Disabling country code selection until Auth Model Supports individual property -->
@@ -123,10 +128,10 @@ watch(() => statusCode.value, async () => {
 
       <!-- Account Address -->
       <ConnectFieldset
-        class="my-6"
         :label="$t('connect.page.createAccount.addressLabel')"
         orientation="horizontal"
         :error="formErrors.address"
+        padding-class="py-1 px-4 sm:pt-2 sm:pb-4 sm:px-8"
       >
         <ConnectFormAddress
           id="account-address"

package/app/composables/useConnectAccountFlowRedirect.ts

@@ -9,8 +9,9 @@ export const useConnectAccountFlowRedirect = () => {
     const externalRedirectUrl = route.query.return as string | undefined
     const internalRedirectUrl = ac.redirect
     const query = { ...route.query }
+    query.accountid = String(currentAccount.id)
 
-    const bypassAccounts = userAccounts.length === 1 && !query.populate
+    const bypassAccounts = userAccounts.length === 1 && !query.token
     const isNonStaffAccount = ![AccountType.STAFF, AccountType.SBC_STAFF].includes(currentAccount.accountType)
     const createOrSelectAccount = manageAccount && isNonStaffAccount && !bypassAccounts
 

package/app/composables/useConnectAuth.ts

@@ -29,7 +29,10 @@ export const useConnectAuth = () => {
     let redirectUri = redirect ?? window.location.href
 
     if (siteminderUrl) {
-      redirectUri = `${siteminderUrl}?returl=${redirectUri.replace(/(https?:\/\/)|(\/)+/g, '$1$2')}&retnow=1`
+      const cleanedUri = redirectUri.replace(/(https?:\/\/)|(\/)+/g, '$1$2')
+      const queryString = window.location.search
+      const returlValue = queryString ? `${cleanedUri}${queryString}` : cleanedUri
+      redirectUri = `${siteminderUrl}?returl=${returlValue}&retnow=1`
     }
 
     resetPiniaStores()

package/app/composables/useConnectHeaderOptions.ts

@@ -85,15 +85,15 @@ export function useConnectHeaderOptions() {
         const isActive = accountStore.currentAccount.id === account.id
         options.push({
           label: account.label,
-          onSelect: () => {
+          onSelect: async () => {
             if (!isActive && account.id) {
               if (route.meta.onAccountChange) {
                 const allowAccountChange = route.meta.onAccountChange(accountStore.currentAccount, account)
                 if (allowAccountChange) {
-                  accountStore.switchCurrentAccount(account.id)
+                  await accountStore.switchCurrentAccount(account.id)
                 }
               } else {
-                accountStore.switchCurrentAccount(account.id)
+                await accountStore.switchCurrentAccount(account.id)
               }
             }
           },

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

@@ -14,16 +14,23 @@ export interface ConnectLogoutConfig {
 }
 
 export interface ConnectHeaderConfig {
-  loginMenu: boolean
-  createAccount: boolean
-  notifications: boolean
-  accountOptionsMenu: boolean
+  loginMenu?: boolean
+  createAccount?: boolean
+  notifications?: boolean
+  accountOptionsMenu?: boolean
+  localeSelect?: boolean
+  whatsNew?: boolean
+}
+
+export interface ConnectFooterConfig {
+  versions?: string[]
 }
 
 export interface ConnectConfig {
   login: ConnectLoginConfig
   logout: ConnectLogoutConfig
   header: ConnectHeaderConfig
+  footer?: ConnectFooterConfig
 }
 
 export interface ConnectPresetOverrides {

package/app/interfaces/connect-account-address.ts

@@ -1 +1,3 @@
-export type ConnectAccountAddress = Pick<ConnectAddress, Exclude<keyof ConnectAddress, 'locationDescription'>>
+export type ConnectAccountAddress = Pick<ConnectAddress, Exclude<keyof ConnectAddress, 'locationDescription'>> & {
+  deliveryInstructions?: string
+}

package/app/interfaces/connect-account.ts

@@ -11,7 +11,7 @@ export interface ConnectAccount {
 
 export interface ConnectCreateAccount {
   accessType: ConnectAccessType
-  isBusinessAccount: boolean
+  isBusinessAccount?: boolean
   mailingAddress: ConnectAccountAddress
   name: string
   paymentInfo: {

package/app/middleware/01.setup-accounts.global.ts

@@ -6,7 +6,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
       await accountStore.initAccountStore()
 
       if (to.query.accountid) {
-        accountStore.switchCurrentAccount(parseInt(to.query.accountid as string))
+        await accountStore.switchCurrentAccount(parseInt(to.query.accountid as string))
       }
     }
   }

package/app/middleware/04.idp-enforcement.global.ts

@@ -2,7 +2,7 @@ import { useConnectAuth } from '#auth/app/composables/useConnectAuth'
 import { withQuery } from 'ufo'
 import type { ConnectIdpHint } from '#imports'
 import { useAppConfig } from '#imports'
-import { ConnectModalInvalidIdp } from '#components'
+// import { ConnectModalInvalidIdp } from '#components'
 
 export default defineNuxtRouteMiddleware(async (to) => {
   const localePath = useLocalePath()
@@ -15,13 +15,14 @@ export default defineNuxtRouteMiddleware(async (to) => {
   const allowedIdps = connectConfig?.login?.idps
 
   // Idp overlay
-  const overlay = useOverlay()
-  const modal = overlay.create(ConnectModalInvalidIdp)
+  // const overlay = useOverlay()
+  // const modal = overlay.create(ConnectModalInvalidIdp)
 
   /** Show Invalid IDP Modal and Logout on modal close */
   async function showInvalidIdpModal() {
     // Prompt user with invalid IDP modal
-    await modal.open({ currentIdp: authUser.value?.loginSource })
+    // FUTURE: Fix this in #32610. Currently it doesn't work - loading overlay covers it.
+    // await modal.open({ currentIdp: authUser.value?.loginSource })
 
     // Logout and Preserve any query param
     const pathWithQuery = withQuery(localePath('/auth/login'), to.query)

package/app/pages/auth/account/select.vue

@@ -23,8 +23,8 @@ useHead({
   title: pageTitle
 })
 
-function selectAndRedirect(id: number) {
-  accountStore.switchCurrentAccount(id)
+async function selectAndRedirect(id: number) {
+  await accountStore.switchCurrentAccount(id)
   finalRedirect(useRoute())
 }
 

package/app/stores/connect-account.ts

@@ -66,8 +66,8 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
       mailingAddress: {
         city: accountFormState.address.city,
         country: accountFormState.address.country,
-        region: accountFormState.address.region,
-        postalCode: accountFormState.address.postalCode,
+        region: accountFormState.address.region ?? '',
+        postalCode: accountFormState.address.postalCode ?? '',
         street: accountFormState.address.street,
         streetAdditional: accountFormState.address.streetAdditional || '',
         deliveryInstructions: accountFormState.address.locationDescription || ''
@@ -91,7 +91,7 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
           // Refresh and switch to new account prior to redirect
           if (createResponse?.id) {
             await setAccountInfo()
-            switchCurrentAccount(createResponse.id)
+            await switchCurrentAccount(createResponse.id)
           }
 
           // Update or create user contact and then redirect regardless of success or failure
@@ -148,10 +148,11 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
   }
 
   /** Switch the current account to the given account ID if it exists in the user's account list */
-  function switchCurrentAccount(accountId: number) {
+  async function switchCurrentAccount(accountId: number) {
     const account = userAccounts.value.find(account => account.id === accountId)
     if (account) {
       currentAccount.value = account
+      await checkAccountStatus()
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sbc-connect/nuxt-auth",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "repository": "github:bcgov/connect-nuxt",
   "license": "BSD-3-Clause",
   "main": "./nuxt.config.ts",
@@ -22,8 +22,8 @@
     "keycloak-js": "26.2.2",
     "pinia": "3.0.4",
     "pinia-plugin-persistedstate": "4.7.1",
-    "@sbc-connect/nuxt-base": "0.6.1",
-    "@sbc-connect/nuxt-forms": "0.5.0"
+    "@sbc-connect/nuxt-base": "0.7.0",
+    "@sbc-connect/nuxt-forms": "0.6.0"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",