Merge pull request #1585 from stevenc987/main

Name Examination UI: change to use Namex API GW URL and API key#30767

Author: stevenc987

app/.env.example

@@ -4,7 +4,8 @@
 NUXT_SITEMINDER_LOGOUT_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi"
 
 #vaults API
-NUXT_NAMEX_API_URL="https://namex-dev.apps.silver.devops.gov.bc.ca"
+NUXT_NAMEX_API_GW_URL="https://test.api.connect.gov.bc.ca/namex-dev"
+NUXT_NAMEX_API_KEY=
 NUXT_NAMEX_API_VERSION="/api/v1"
 NUXT_NAMEX_ADMIN_URL = "https://namex-solr-dev.apps.silver.devops.gov.bc.ca/"
 

app/devops/vaults.env

@@ -5,7 +5,8 @@ NUXT_SITEMINDER_LOGOUT_URL="op://web-url/$APP_ENV/siteminder/SITEMINDER_LOGOUT_U
 NUXT_NAMEX_ADMIN_URL="op://web-url/$APP_ENV/namex-examination/NAMEX_ADMIN_URL"
 
 #vaults API
-NUXT_NAMEX_API_URL="op://API/$APP_ENV/namex-api/NAMEX_API_URL"
+NUXT_NAMEX_API_GW_URL="op://API/$APP_ENV/namex-api/NAMEX_API_GW_URL"
+NUXT_NAMEX_API_KEY="op://API/$APP_ENV/namex-api/NAMEX_API_KEY"
 NUXT_NAMEX_API_VERSION="op://API/$APP_ENV/namex-api/NAMEX_API_VERSION"
 
 #vaults keycloak

app/nuxt.config.ts

@@ -18,7 +18,6 @@ export default defineNuxtConfig({
     '@nuxt/content',
     '@nuxtjs/tailwindcss',
     '@pinia/nuxt',
-    'nuxt-vitest',
   ],
   css: ['@/assets/css/main.scss'],
   typescript: {
@@ -50,7 +49,8 @@ export default defineNuxtConfig({
       firebaseAuthDomain: process.env.NUXT_AUTH_DOMAIN,
       firebaseProjectId: process.env.NUXT_PROJECT_ID,
       firebaseAppId: process.env.NUXT_APP_ID,
-      namexAPIURL: process.env.NUXT_NAMEX_API_URL,
+      namexAPIURL: process.env.NUXT_NAMEX_API_GW_URL,
+      namexAPIKey: process.env.NUXT_NAMEX_API_KEY,
       namexAPIVersion: process.env.NUXT_NAMEX_API_VERSION,
       namexAdminURL: process.env.NUXT_NAMEX_ADMIN_URL,
       keycloakAuthUrl: process.env.NUXT_KEYCLOAK_AUTH_URL,

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.47",
+  "version": "1.2.48",
   "private": true,
   "scripts": {
     "build": "nuxt generate",

app/util/namex-api.ts

@@ -29,6 +29,7 @@ async function callNamexApi(url: URL, options?: object, headers?: object) {
     headers: {
       Authorization: `Bearer ${token}`,
       'App-Name': packageInfo.name,
+      'X-Apikey': useRuntimeConfig().public.namexAPIKey || '',
       ...headers,
     },
     ...(options ? options : {}),
@@ -41,9 +42,10 @@ async function callNamexApi(url: URL, options?: object, headers?: object) {
  */
 export function getNamexApiUrl(endpoint: string): URL {
   const config = useRuntimeConfig().public
+  const base = config.namexAPIURL
   return new URL(
-    config.namexAPIVersion + endpoint,
-    config.namexAPIURL as string
+    config.namexAPIVersion.replace(/^\//, '') + endpoint,
+    base.endsWith('/') ? base : base + '/' as string
   )
 }