@sbc-connect/nuxt-auth 0.13.1 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @sbc-connect/nuxt-auth
 
+## 0.15.0
+
+### Minor Changes
+
+- [#180](https://github.com/bcgov/connect-nuxt/pull/180) [`4e25088`](https://github.com/bcgov/connect-nuxt/commit/4e250886da973eda99044ff1c34383604b05d718) Thanks [@deetz99](https://github.com/deetz99)! - Force type resolutions via nuxt config prepare:types hook.
+
+### Patch Changes
+
+- Updated dependencies [[`4e25088`](https://github.com/bcgov/connect-nuxt/commit/4e250886da973eda99044ff1c34383604b05d718)]:
+  - @sbc-connect/nuxt-base@0.12.0
+  - @sbc-connect/nuxt-forms@0.7.7
+
+## 0.14.0
+
+### Minor Changes
+
+- [#178](https://github.com/bcgov/connect-nuxt/pull/178) [`3c8d9bf`](https://github.com/bcgov/connect-nuxt/commit/3c8d9bfdf9147d6fd6ce0dadc4b47f043feb4f4b) Thanks [@deetz99](https://github.com/deetz99)! - Fix type augmentation resolution
+
+### Patch Changes
+
+- Updated dependencies [[`3c8d9bf`](https://github.com/bcgov/connect-nuxt/commit/3c8d9bfdf9147d6fd6ce0dadc4b47f043feb4f4b)]:
+  - @sbc-connect/nuxt-base@0.11.0
+  - @sbc-connect/nuxt-forms@0.7.6
+
 ## 0.13.1
 
 ### Patch Changes

package/app/app.config.ts

@@ -1,4 +1,4 @@
-import { ConnectIdpHint } from '#auth/app/enums/connect-idp-hint'
+import { ConnectIdpHint } from './enums/connect-idp-hint'
 import type { AppConfigInput } from 'nuxt/schema'
 
 export default defineAppConfig({

package/app/components/Connect/Header/AccountLabel.vue

@@ -8,12 +8,14 @@ const {
   username?: string
   theme?: 'header' | 'dropdown'
 }>()
+
+const { locale } = useI18n()
 </script>
 
 <template>
   <div class="flex items-center gap-1">
     <UAvatar
-      :text="username[0] ? username[0].toLocaleUpperCase($i18n.locale) : 'U'"
+      :text="username[0] ? username[0].toLocaleUpperCase(locale) : 'U'"
       size="md"
       class="text-inverted self-start sm:self-center"
       :ui="{ root: 'bg-blue-300 rounded-none text-lg', fallback: 'text-inverted font-bold' }"

package/app/composables/useConnectAppConfig.ts

@@ -1,5 +1,4 @@
-import { useAppConfig } from '#imports'
-
+/* eslint-disable @typescript-eslint/no-explicit-any */
 export const useConnectAppConfig = () => {
   /**
    * Merge preset overrides (from app.config.connectOverrides) into the provided baseConfig.
@@ -7,10 +6,10 @@ export const useConnectAppConfig = () => {
    */
   function mergeAppConfigOverrides(
     baseConfig: ConnectConfig,
-    presetName: ConnectPresetType
+    presetName: string
   ): ConnectConfig {
     const appConfig = useAppConfig()
-    const overrides = appConfig.connectOverrides?.[presetName] ?? null
+    const overrides = (appConfig.connectOverrides as Record<string, any>)?.[presetName] ?? null
 
     return {
       ...baseConfig,

package/app/middleware/02.app-config-presets.global.ts

@@ -1,10 +1,12 @@
 export default defineNuxtRouteMiddleware((to) => {
-  const appConfig = useAppConfig()
-  const { mergeAppConfigOverrides } = useConnectAppConfig()
+  if (to.query.preset) {
+    const appConfig = useAppConfig()
+    const { mergeAppConfigOverrides } = useConnectAppConfig()
 
-  // Build and assign app.config presets
-  appConfig.connect = mergeAppConfigOverrides(
-    appConfig.connect as ConnectConfig,
-    to.query.preset as ConnectPresetType
-  )
+    // Build and assign app.config presets
+    appConfig.connect = mergeAppConfigOverrides(
+      appConfig.connect as ConnectConfig,
+      to.query.preset as string
+    )
+  }
 })

package/app/types/auth-nuxt-hooks.d.ts

@@ -5,3 +5,5 @@ declare module '#app' {
     'connect:auth:refresh': (payload: { token: string | undefined }) => HookResult
   }
 }
+
+export {}

package/app/types/auth-plugins.d.ts

@@ -0,0 +1,11 @@
+import type { $Fetch } from 'ofetch'
+import type Keycloak from 'keycloak-js'
+
+declare module '#app' {
+  interface NuxtApp {
+    $authApi: $Fetch
+    $connectAuth: Keycloak
+  }
+}
+
+export {}

package/nuxt.config.ts

@@ -88,5 +88,20 @@ export default defineNuxtConfig({
         'keycloak-js'
       ]
     }
+  },
+
+  // Nuxt 4 tsconfig `references` context workaround for type augmentation
+  // Forces type augmentations into the correct context
+  // https://nuxt.com/docs/4.x/guide/modules/recipes-advanced#extend-typescript-config
+  // Can also force sharedReferences, nodeReferences - and nitro references using the 'nitro:prepare:types' hook
+  hooks: {
+    'prepare:types': ({ references }) => {
+      references.push(
+        { path: resolve('./app/types/auth-app-config.d.ts') },
+        { path: resolve('./app/types/auth-nuxt-hooks.d.ts') },
+        { path: resolve('./app/types/auth-page-meta.d.ts') },
+        { path: resolve('./app/types/auth-plugins.d.ts') }
+      )
+    }
   }
 })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sbc-connect/nuxt-auth",
   "type": "module",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "repository": "github:bcgov/connect-nuxt",
   "license": "BSD-3-Clause",
   "main": "./nuxt.config.ts",
@@ -11,8 +11,8 @@
     "nuxt": "4.4.6",
     "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/eslint-config": "0.0.8",
     "@sbc-connect/vitest-config": "0.2.0"
   },
   "dependencies": {
@@ -22,8 +22,8 @@
     "keycloak-js": "26.2.4",
     "pinia": "3.0.4",
     "pinia-plugin-persistedstate": "4.7.1",
-    "@sbc-connect/nuxt-base": "0.10.0",
-    "@sbc-connect/nuxt-forms": "0.7.5"
+    "@sbc-connect/nuxt-base": "0.12.0",
+    "@sbc-connect/nuxt-forms": "0.7.7"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",

package/app/enums/connect-preset-type.ts

@@ -1,4 +0,0 @@
-export enum ConnectPresetType {
-  DEFAULT = 'default',
-  BCSC_USER = 'bcscUser'
-}