feat(services-bff): My pages bff setup

apps/application-system/form/infra/application-system-form.ts

@@ -1,25 +1,12 @@
 import { ref, service, ServiceBuilder } from '../../../../infra/src/dsl/dsl'
 
-export const serviceSetup = (services: {
-  api: ServiceBuilder<'api'>
-}): ServiceBuilder<'application-system-form'> =>
+export const serviceSetup = (): ServiceBuilder<'application-system-form'> =>
   service('application-system-form')
     .namespace('application-system')
     .liveness('/liveness')
     .readiness('/readiness')
     .env({
       BASEPATH: '/umsoknir',
-      SI_PUBLIC_GRAPHQL_PATH: {
-        dev: '',
-        prod: '',
-        staging: '',
-        local: ref((h) => `http://${h.svc(services.api)}`),
-      },
-      SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL: {
-        dev: 'https://identity-server.dev01.devland.is',
-        staging: 'https://identity-server.staging01.devland.is',
-        prod: 'https://innskra.island.is',
-      },
       SI_PUBLIC_ENVIRONMENT: ref((h) => h.env.type),
     })
     .secrets({

apps/application-system/form/project.json

@@ -64,7 +64,8 @@
       "executor": "@nx/webpack:dev-server",
       "options": {
         "port": 4242,
-        "buildTarget": "application-system-form:build"
+        "buildTarget": "application-system-form:build",
+        "proxyConfig": "apps/application-system/form/proxy.config.json"
       },
       "configurations": {
         "production": {
@@ -103,16 +104,32 @@
         "parallel": false
       }
     },
+    "start-bff": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node -r esbuild-register src/cli/cli.ts run-local-env services-bff-portals-my-pages"
+        ],
+        "cwd": "infra"
+      }
+    },
     "dev": {
       "executor": "nx:run-commands",
       "options": {
         "commands": [
           "yarn nx run application-system-api:dev",
+          "yarn nx run service-portal:start-bff",
           "yarn start application-system-form"
         ],
         "parallel": true
       }
     },
+    "mock": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": ["API_MOCKS=true yarn start application-system-form"]
+      }
+    },
     "docker-static": {
       "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-static`"
     }

apps/application-system/form/proxy.config.json

@@ -0,0 +1,6 @@
+{
+  "/bff/*": {
+    "target": "http://localhost:3010",
+    "secure": false
+  }
+}

apps/application-system/form/src/app/App.tsx

@@ -1,23 +1,34 @@
 import { ApolloProvider } from '@apollo/client'
 
-import { initializeClient } from '@island.is/application/graphql'
+import { client } from '@island.is/application/graphql'
 import { LocaleProvider } from '@island.is/localization'
-import { defaultLanguage } from '@island.is/shared/constants'
-import { AuthProvider } from '@island.is/auth/react'
 import { FeatureFlagProvider } from '@island.is/react/feature-flags'
+import { defaultLanguage } from '@island.is/shared/constants'
 
+import { applicationSystemScopes } from '@island.is/auth/scopes'
+import { BffProvider, createMockedInitialState } from '@island.is/react-spa/bff'
+import { Router } from '../components/Router'
 import { environment } from '../environments'
 import { BASE_PATH } from '../lib/routes'
-import { Router } from '../components/Router'
+import { isMockMode } from '../mocks'
+
+const mockedInitialState = isMockMode
+  ? createMockedInitialState({
+      scopes: applicationSystemScopes,
+    })
+  : undefined
 
 export const App = () => (
-  <ApolloProvider client={initializeClient(environment.baseApiUrl)}>
+  <ApolloProvider client={client}>
     <LocaleProvider locale={defaultLanguage} messages={{}}>
-      <AuthProvider basePath={BASE_PATH}>
+      <BffProvider
+        applicationBasePath={BASE_PATH}
+        mockedInitialState={mockedInitialState}
+      >
         <FeatureFlagProvider sdkKey={environment.featureFlagSdkKey}>
           <Router />
         </FeatureFlagProvider>
-      </AuthProvider>
+      </BffProvider>
     </LocaleProvider>
   </ApolloProvider>
 )

apps/application-system/form/src/components/Router.tsx

@@ -1,15 +1,15 @@
 import { createBrowserRouter, RouterProvider } from 'react-router-dom'
 
-import { useAuth } from '@island.is/auth/react'
-import { LoadingScreen } from '@island.is/react/components'
-import { BASE_PATH, routes } from '../lib/routes'
-import React, { useRef } from 'react'
 import { useLocale } from '@island.is/localization'
+import { useUserInfo } from '@island.is/react-spa/bff'
+import { LoadingScreen } from '@island.is/react/components'
+import { useRef } from 'react'
 import { m } from '../lib/messages'
+import { BASE_PATH, routes } from '../lib/routes'
 
 export const Router = () => {
   const { formatMessage } = useLocale()
-  const { userInfo } = useAuth()
+  const userInfo = useUserInfo()
   const router = useRef<ReturnType<typeof createBrowserRouter>>()
 
   if (!userInfo) {

apps/application-system/form/src/environments/environment.ts

@@ -2,10 +2,6 @@ import { getStaticEnv } from '@island.is/shared/utils'
 
 const devConfig = {
   production: false,
-  baseApiUrl: 'http://localhost:4444',
-  identityServer: {
-    authority: 'https://identity-server.dev01.devland.is',
-  },
   featureFlagSdkKey: 'YcfYCOwBTUeI04mWOWpPdA/KgCHhUk0_k2BdiKMaNh3qA',
   DD_RUM_CLIENT_TOKEN: 'unknown',
   DD_RUM_APPLICATION_ID: 'unknown',
@@ -15,10 +11,6 @@ const devConfig = {
 
 const prodConfig = {
   production: true,
-  baseApiUrl: getStaticEnv('SI_PUBLIC_GRAPHQL_PATH') ?? window.location.origin,
-  identityServer: {
-    authority: getStaticEnv('SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL'),
-  },
   featureFlagSdkKey: getStaticEnv('SI_PUBLIC_CONFIGCAT_SDK_KEY'),
   DD_RUM_CLIENT_TOKEN: getStaticEnv('SI_PUBLIC_DD_RUM_CLIENT_TOKEN'),
   DD_RUM_APPLICATION_ID: getStaticEnv('SI_PUBLIC_DD_RUM_APPLICATION_ID'),

apps/application-system/form/src/lib/routes.tsx

@@ -1,12 +1,12 @@
 import { Outlet, RouteObject } from 'react-router-dom'
 
-import { UserProfileLocale } from '@island.is/shared/components'
 import { ErrorShell, HeaderInfoProvider } from '@island.is/application/ui-shell'
+import { UserProfileLocale } from '@island.is/shared/components'
 
+import { Layout } from '../components/Layout/Layout'
 import { Application } from '../routes/Application'
 import { Applications } from '../routes/Applications'
 import { AssignApplication } from '../routes/AssignApplication'
-import { Layout } from '../components/Layout/Layout'
 
 export const BASE_PATH = '/umsoknir'
 

apps/application-system/form/src/main.tsx

@@ -1,14 +1,12 @@
 import '@island.is/api/mocks'
-import React, { StrictMode } from 'react'
+import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 
 import { isRunningOnEnvironment } from '@island.is/shared/utils'
 
-import './auth'
-
-import { environment } from './environments'
-import App from './app/App'
 import { userMonitoring } from '@island.is/user-monitoring'
+import App from './app/App'
+import { environment } from './environments'
 
 if (!isRunningOnEnvironment('local')) {
   userMonitoring.initDdRum({

apps/application-system/form/src/mocks/index.ts

@@ -0,0 +1 @@
+export const isMockMode = process.env.API_MOCKS === 'true'

apps/application-system/form/src/routes/Application.tsx

@@ -1,9 +1,9 @@
 import { useParams } from 'react-router-dom'
 
+import { coreMessages } from '@island.is/application/core'
 import { ApplicationForm, ErrorShell } from '@island.is/application/ui-shell'
 import { useLocale } from '@island.is/localization'
-import { coreMessages } from '@island.is/application/core'
-import { useAuth } from '@island.is/auth/react'
+import { useUserInfo } from '@island.is/react-spa/bff'
 
 type UseParams = {
   slug: string
@@ -12,7 +12,7 @@ type UseParams = {
 
 export const Application = () => {
   const { slug, id } = useParams() as UseParams
-  const { userInfo } = useAuth()
+  const userInfo = useUserInfo()
   const { formatMessage } = useLocale()
   const nationalRegistryId = userInfo?.profile?.nationalId
 

apps/download-service/src/app/modules/documents/document.controller.ts

@@ -67,9 +67,9 @@ export class DocumentController {
         rawDocumentDTO.fileName
       }.pdf`,
     )
-    res.header('Pragma: no-cache')
-    res.header('Cache-Control: no-cache')
-    res.header('Cache-Control: nmax-age=0')
+    res.header('Pragma', 'no-cache')
+    res.header('Cache-Control', 'no-cache')
+    res.header('Cache-Control', 'nmax-age=0')
 
     return res.end(buffer)
   }

apps/portals/admin/infra/portals-admin.ts

@@ -17,11 +17,6 @@ export const serviceSetup = (): ServiceBuilder<'portals-admin'> =>
     })
     .env({
       BASEPATH: '/stjornbord',
-      SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL: {
-        dev: 'https://identity-server.dev01.devland.is',
-        staging: 'https://identity-server.staging01.devland.is',
-        prod: 'https://innskra.island.is',
-      },
       SI_PUBLIC_ENVIRONMENT: ref((h) => h.env.type),
     })
     .secrets({

apps/portals/admin/project.json

@@ -111,7 +111,7 @@
         ]
       }
     },
-    "mockmode": {
+    "mock": {
       "executor": "nx:run-commands",
       "options": {
         "commands": ["API_MOCKS=true yarn start portals-admin"]

apps/portals/admin/src/app/App.tsx

@@ -1,4 +1,5 @@
 import { ApolloProvider } from '@apollo/client'
+import { adminPortalScopes } from '@island.is/auth/scopes'
 import { LocaleProvider } from '@island.is/localization'
 import {
   ApplicationErrorBoundary,
@@ -13,7 +14,6 @@ import { client } from '../graphql'
 import { modules } from '../lib/modules'
 import { AdminPortalPaths } from '../lib/paths'
 import { createRoutes } from '../lib/routes'
-import { adminPortalScopes } from '@island.is/auth/scopes'
 
 const mockedInitialState = isMockMode
   ? createMockedInitialState({
@@ -27,6 +27,7 @@ export const App = () => (
       <ApplicationErrorBoundary>
         <BffProvider
           applicationBasePath={AdminPortalPaths.Base}
+          bffGlobalPrefix={`${AdminPortalPaths.Base}/bff`}
           mockedInitialState={mockedInitialState}
         >
           <FeatureFlagProvider sdkKey={environment.featureFlagSdkKey}>

apps/portals/admin/src/environments/environment.ts

@@ -2,9 +2,6 @@ import { getStaticEnv } from '@island.is/shared/utils'
 
 const devConfig = {
   production: false,
-  identityServer: {
-    authority: 'https://identity-server.dev01.devland.is',
-  },
   featureFlagSdkKey: 'YcfYCOwBTUeI04mWOWpPdA/KgCHhUk0_k2BdiKMaNh3qA',
   DD_RUM_CLIENT_TOKEN: 'unknown',
   DD_RUM_APPLICATION_ID: 'unknown',
@@ -14,9 +11,6 @@ const devConfig = {
 
 const prodConfig = {
   production: true,
-  identityServer: {
-    authority: getStaticEnv('SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL'),
-  },
   featureFlagSdkKey: getStaticEnv('SI_PUBLIC_CONFIGCAT_SDK_KEY'),
   DD_RUM_CLIENT_TOKEN: getStaticEnv('SI_PUBLIC_DD_RUM_CLIENT_TOKEN'),
   DD_RUM_APPLICATION_ID: getStaticEnv('SI_PUBLIC_DD_RUM_APPLICATION_ID'),

apps/portals/my-pages/infra/portals-my-pages.ts

@@ -1,8 +1,6 @@
 import { ref, service, ServiceBuilder } from '../../../../infra/src/dsl/dsl'
 
-export const serviceSetup = (services: {
-  graphql: ServiceBuilder<'api'>
-}): ServiceBuilder<'service-portal'> =>
+export const serviceSetup = (): ServiceBuilder<'service-portal'> =>
   service('service-portal')
     .namespace('service-portal')
     .liveness('/liveness')
@@ -18,18 +16,7 @@ export const serviceSetup = (services: {
     })
     .env({
       BASEPATH: '/minarsidur',
-      SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL: {
-        dev: 'https://identity-server.dev01.devland.is',
-        staging: 'https://identity-server.staging01.devland.is',
-        prod: 'https://innskra.island.is',
-      },
       SI_PUBLIC_ENVIRONMENT: ref((h) => h.env.type),
-      SI_PUBLIC_GRAPHQL_API: {
-        prod: '/api/graphql',
-        staging: '/api/graphql',
-        dev: '/api/graphql',
-        local: ref((h) => `http://${h.svc(services.graphql)}/api/graphql`),
-      },
     })
     .secrets({
       SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY',