@sbc-connect/nuxt-auth 0.5.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @sbc-connect/nuxt-auth
 
+## 0.6.1
+
+### Patch Changes
+
+- Updated dependencies [[`93c5650`](https://github.com/bcgov/connect-nuxt/commit/93c5650be9a6b48e51d876d522f168d885d006c4)]:
+  - @sbc-connect/nuxt-forms@0.5.0
+
+## 0.6.0
+
+### Minor Changes
+
+- [#127](https://github.com/bcgov/connect-nuxt/pull/127) [`63409ea`](https://github.com/bcgov/connect-nuxt/commit/63409eab3ef9072fe8e05662b44f61bb8be6cff4) Thanks [@cameron-eyds](https://github.com/cameron-eyds)! - Improved name lookup validations
+
+- [#125](https://github.com/bcgov/connect-nuxt/pull/125) [`fda1d48`](https://github.com/bcgov/connect-nuxt/commit/fda1d48ed55838aeece70aa04a82440153a3db24) Thanks [@cameron-eyds](https://github.com/cameron-eyds)! - Includes contact POST and minor redirect refactors
+
+### Patch Changes
+
+- Updated dependencies [[`8cc8cc0`](https://github.com/bcgov/connect-nuxt/commit/8cc8cc09aad741dc841a864998129c6ac5a6af2f)]:
+  - @sbc-connect/nuxt-base@0.6.1
+  - @sbc-connect/nuxt-forms@0.4.1
+
 ## 0.5.0
 
 ### Minor Changes

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

@@ -24,9 +24,16 @@ const formErrors = computed<{
   }
 })
 
-async function validate() {
-  return formRef.value?.validate({ silent: true })
+async function validate(fieldName?: keyof AccountProfileSchema) {
+  return formRef.value?.validate({ name: fieldName, silent: true })
 }
+
+watch(() => statusCode.value, async () => {
+  if (statusCode.value !== undefined) {
+    await nextTick()
+    await validate('accountName')
+  }
+})
 </script>
 
 <template>

package/app/composables/useAuthApi.ts

@@ -64,17 +64,18 @@ export const useAuthApi = () => {
    * Updates a users contact by PUTing the given payload to `/users/contacts`.
    * @returns Object containing mutation state and `updateUserContact` function.
    */
-  const useUpdateUserContact = defineMutation(() => {
+  const useUpdateOrCreateUserContact = defineMutation(() => {
     const { mutateAsync, ...mutation } = useMutation({
       mutation: (vars: {
         email: string
         phone: string
         phoneExtension: string | undefined
+        method?: 'POST' | 'PUT'
         successCb?: () => Promise<unknown>
         errorCb?: (error: unknown) => Promise<unknown>
       }) => {
         return $authApi<ConnectAuthProfile>('/users/contacts', {
-          method: 'PUT',
+          method: vars.method || 'PUT',
           body: {
             email: vars.email,
             phone: vars.phone,
@@ -101,7 +102,7 @@ export const useAuthApi = () => {
 
     return {
       ...mutation,
-      updateUserContact: mutateAsync
+      updateOrCreateUserContact: mutateAsync
     }
   })
 
@@ -149,7 +150,7 @@ export const useAuthApi = () => {
     getTermsOfUse,
     useCreateAccount,
     usePatchTermsOfUse,
-    useUpdateUserContact,
+    useUpdateOrCreateUserContact,
     verifyAccountName
   }
 }

package/app/composables/useConnectAccountFlowRedirect.ts

@@ -3,22 +3,23 @@ import type { RouteLocationNormalizedGeneric } from '#vue-router'
 export const useConnectAccountFlowRedirect = () => {
   function finalRedirect(route: RouteLocationNormalizedGeneric, manageAccount = false) {
     const { authUser } = useConnectAuth()
-    const { userAccounts } = useConnectAccountStore()
+    const { currentAccount, userAccounts } = useConnectAccountStore()
     const localePath = useLocalePath()
     const ac = useAppConfig().connect.login
     const externalRedirectUrl = route.query.return as string | undefined
     const internalRedirectUrl = ac.redirect
-
     const query = { ...route.query }
 
-    if (manageAccount && userAccounts.length !== 1) {
-      const isBcscCreate
-        = userAccounts.length === 0
-          && authUser.value.loginSource === ConnectLoginSource.BCSC
+    const bypassAccounts = userAccounts.length === 1 && !query.populate
+    const isNonStaffAccount = ![AccountType.STAFF, AccountType.SBC_STAFF].includes(currentAccount.accountType)
+    const createOrSelectAccount = manageAccount && isNonStaffAccount && !bypassAccounts
+
+    if (createOrSelectAccount) {
+      const isBcscUserWithNoAccounts = (!userAccounts.length || userAccounts.length === 0)
+        && authUser.value.loginSource === ConnectLoginSource.BCSC
+      const redirectPath = isBcscUserWithNoAccounts ? '/auth/account/create' : '/auth/account/select'
 
-      return isBcscCreate
-        ? navigateTo({ path: localePath('/auth/account/create'), query })
-        : navigateTo({ path: localePath('/auth/account/select'), query })
+      return navigateTo({ path: localePath(redirectPath), query })
     }
 
     if (externalRedirectUrl) {
@@ -30,7 +31,7 @@ export const useConnectAccountFlowRedirect = () => {
           path: appendUrlParam(
             externalRedirectUrl,
             'accountid',
-            useConnectAccountStore().currentAccount.id
+            currentAccount.id
           ),
           query: cleanQuery
         },

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

@@ -33,7 +33,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
   if (idpEnforcement && authUser.value?.loginSource) {
     // User's IDP is not allowed, log them out and redirect to login page
     if (!allowedIdps?.includes(authUser.value?.loginSource.toLowerCase() as unknown as ConnectIdpHint)) {
-      showInvalidIdpModal()
+      await showInvalidIdpModal()
     }
   }
 })

package/app/stores/connect-account.ts

@@ -5,7 +5,7 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
   const { $authApi } = useNuxtApp()
   const rtc = useRuntimeConfig().public
   const { authUser } = useConnectAuth()
-  const { useCreateAccount, useUpdateUserContact, getAuthUserProfile } = useAuthApi()
+  const { useCreateAccount, useUpdateOrCreateUserContact, getAuthUserProfile } = useAuthApi()
   const { finalRedirect } = useConnectAccountFlowRedirect()
 
   // selected user account
@@ -21,7 +21,7 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
   // Create account
   const isLoading = ref<boolean>(false)
   const { createAccount } = useCreateAccount()
-  const { updateUserContact } = useUpdateUserContact()
+  const { updateOrCreateUserContact } = useUpdateOrCreateUserContact()
   const createAccountProfileSchema = getAccountCreateSchema()
   const accountFormState = reactive<AccountProfileSchema>(createAccountProfileSchema.parse({}))
   /**
@@ -94,11 +94,12 @@ export const useConnectAccountStore = defineStore('connect-auth-account-store',
             switchCurrentAccount(createResponse.id)
           }
 
-          // Update user contact and then redirect regardless of success or failure
-          await updateUserContact({
+          // Update or create user contact and then redirect regardless of success or failure
+          await updateOrCreateUserContact({
             email: accountFormState.emailAddress,
             phone: accountFormState.phone.phoneNumber,
             phoneExtension: accountFormState.phone.ext,
+            method: userAccounts.value.length === 1 ? 'POST' : 'PUT', // if only 1 account exists then contact is new
             successCb: async () => await finalRedirect(useRoute()),
             errorCb: async () => await finalRedirect(useRoute())
           })

package/app/utils/schemas/account.ts

@@ -6,7 +6,7 @@ export function getAccountNameSchema(status?: number | undefined) {
 
   return z.string().min(1, t('connect.validation.requiredAccountName'))
     .superRefine((val, ctx) => {
-      // Only run if we have a value and a statusCode
+      // Validate account name uniqueness based on API response status code
       if (val && status !== undefined) {
         if (status === 200) {
           ctx.addIssue({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sbc-connect/nuxt-auth",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "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.0",
-    "@sbc-connect/nuxt-forms": "0.4.0"
+    "@sbc-connect/nuxt-base": "0.6.1",
+    "@sbc-connect/nuxt-forms": "0.5.0"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",