FLS-1452 - Retrieve forms from Pre-Award API

.run/RUNNER.run.xml

@@ -29,7 +29,6 @@
       <env name="LOG_LEVEL" value="debug" />
       <env name="LOGOUT_URL" value="https://authenticator.communities.gov.localhost:3004/sessions/sign-out" />
       <env name="MULTIFUND_URL" value="https://frontend.communities.gov.localhost:3008/account" />
-      <env name="PREVIEW_MODE" value="true" />
       <env name="PRIVACY_POLICY_URL" value="https://frontend.communities.gov.localhost:3008/privacy" />
       <env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" />
       <env name="SERVICE_START_PAGE" value="https://frontend.communities.gov.localhost:3008/account" />

copilot/fsd-form-runner-adapter/manifest.yml

@@ -78,13 +78,13 @@ secrets:
   RSA256_PUBLIC_KEY_BASE64: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/RSA256_PUBLIC_KEY_BASE64
   SESSION_COOKIE_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/SESSION_COOKIE_PASSWORD
   INITIALISED_SESSION_KEY: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/SECRET_KEY
+  FORM_STORE_API_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/FSD_PRE_AWARD_FORM_STORE_API_HOST
 
 # You can override any of the values defined above by environment.
 environments:
   dev:
     variables:
       JWT_AUTH_ENABLED: false
-      PREVIEW_MODE: true
     count:
       spot: 2
     sidecars:
@@ -107,7 +107,6 @@ environments:
   test:
     variables:
       JWT_AUTH_ENABLED: false
-      PREVIEW_MODE: true
     count:
       spot: 2
     sidecars:
@@ -130,7 +129,6 @@ environments:
   uat:
     variables:
       JWT_AUTH_ENABLED: false
-      PREVIEW_MODE: true
     count:
       range: 2-4
       cooldown:
@@ -174,7 +172,6 @@ environments:
       SERVICE_START_PAGE: "https://apply.access-funding.communities.gov.uk/account"
       ELIGIBILITY_RESULT_URL: "https://apply.access-funding.communities.gov.uk/eligibility-result"
       SENTRY_TRACES_SAMPLE_RATE: 0.1
-      PREVIEW_MODE: false
     count:
       range: 2-4
       cooldown:

docker-compose.e2e.yml

@@ -25,7 +25,6 @@ services:
       - "3009:3009"
     environment:
       - CHOKIDAR_USEPOLLING=true
-      - PREVIEW_MODE=true
       - LAST_COMMIT
       - LAST_TAG
       - ACCESSIBILITY_STATEMENT_URL=http://localhost:3008/accessibility_statement
@@ -43,7 +42,6 @@ services:
       - SERVICE_START_PAGE=http://localhost:3008/account
       - SINGLE_REDIS=true
       - FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI=redis://redis-data:6379
-      - PREVIEW_MODE=true
       - ENABLE_VIRUS_SCAN=true
     command: yarn runner start:test
     logging:

docker-compose.yml

@@ -33,7 +33,6 @@ services:
       - "3009:3009"
     environment:
       - CHOKIDAR_USEPOLLING=true
-      - PREVIEW_MODE=true
       - LAST_COMMIT
       - LAST_TAG
       - JWT_AUTH_ENABLED=false

runner/config/custom-environment-variables.json

@@ -45,7 +45,6 @@
   "authClientAuthUrl": "AUTH_CLIENT_AUTH_URL",
   "authClientTokenUrl": "AUTH_CLIENT_TOKEN_URL",
   "authClientProfileUrl": "AUTH_CLIENT_PROFILE_URL",
-  "previewMode": "PREVIEW_MODE",
   "enforceCsrf": "ENFORCE_CSRF",
   "savePerPage": "SAVE_PER_PAGE",
   "awsBucketName": "AWS_BUCKET_NAME",
@@ -70,5 +69,6 @@
   "sentryDsn": "SENTRY_DSN",
   "sentryTracesSampleRate": "SENTRY_TRACES_SAMPLE_RATE",
   "copilotEnv": "COPILOT_ENV",
-  "enableVirusScan": "ENABLE_VIRUS_SCAN"
+  "enableVirusScan": "ENABLE_VIRUS_SCAN",
+  "formStoreApiHost": "FORM_STORE_API_HOST"
 }

runner/config/default.js

@@ -21,7 +21,6 @@ module.exports = {
    */
   port: 3009,
   env: "development",
-  previewMode: false,
   enforceCsrf: true,
   singleRedis: false,
   isE2EModeEnabled: false,
@@ -115,4 +114,6 @@ module.exports = {
   copilotEnv: "",
 
   enableVirusScan: false,
+
+  formStoreApiHost: "https://api.communities.gov.localhost:4004/forms"
 };

runner/config/development.json

@@ -1,6 +1,5 @@
 {
   "isTest": true,
-  "previewMode": true,
   "enforceCsrf": false,
   "env": "development"
 }

runner/config/test.json

@@ -1,7 +1,6 @@
 {
   "safelist": ["webho.ok"],
   "isTest": true,
-  "previewMode": true,
   "enforceCsrf": false,
   "initialisedSessionKey": "predictable-key",
   "env": "test"

runner/src/server/index.ts

@@ -40,6 +40,7 @@ import LanguagePlugin from "./plugins/LanguagePlugin";
 import {TranslationLoaderService} from "./services/TranslationLoaderService";
 import {WebhookService} from "./services/WebhookService";
 import {pluginLog} from "./plugins/logging";
+import { PreAwardApiService } from "./services/PreAwardApiService";
 
 const Sentry = require('@sentry/node');
 
@@ -133,6 +134,7 @@ async function createServer(routeConfig: RouteConfig) {
     await server.register(pluginAuth);
     await server.register(LanguagePlugin);
 
+    server.registerService([PreAwardApiService]);
     server.registerService([AdapterCacheService, NotifyService, PayService, WebhookService, AddressService, TranslationLoaderService]);
     if (config.isE2EModeEnabled && config.isE2EModeEnabled == "true") {
         console.log("E2E Mode enabled")

runner/src/server/plugins/ConfigureFormsPlugin.ts

@@ -1,7 +1,6 @@
 import path from "path";
 import {plugin} from "./engine/MainPlugin";
 
-import {loadForms} from "./engine/service/ConfigurationFormsService";
 import {idFromFilename} from "../../../../digital-form-builder/runner/src/server/plugins/engine/helpers";
 import {
     FormConfiguration
@@ -15,7 +14,7 @@ const relativeTo = __dirname;
 
 export const ConfigureFormsPlugin: ConfigureEnginePluginType = (
     formFileName, formFilePath, options?: EngineOptions) => {
-    let configs: FormConfiguration[];
+    let configs: FormConfiguration[] = [];
 
     if (formFileName && formFilePath) {
         configs = [
@@ -24,8 +23,6 @@ export const ConfigureFormsPlugin: ConfigureEnginePluginType = (
                 id: idFromFilename(formFileName)
             }
         ];
-    } else {
-        configs = loadForms();
     }
 
     const modelOptions = {

runner/src/server/plugins/engine/MainPlugin.ts

@@ -1,6 +1,6 @@
 import {Options} from "./types/PluginOptions";
 import {HapiServer} from "../../types";
-import {RegisterFormPublishApi} from "./api";
+import {RegisterFormsApi} from "./api";
 
 
 const LOGGER_DATA = {
@@ -18,7 +18,7 @@ export const plugin = {
         let countError = 0;
         for (const config of configs) {
             try {
-                await adapterCacheService.setFormConfiguration(config.id, config, server);
+                await adapterCacheService.setFormConfiguration(config.id, config);
                 countOk++;
             } catch (e) {
                 countError++;
@@ -32,6 +32,6 @@ export const plugin = {
             ...LOGGER_DATA,
             message: `[FORM-CACHE] number of forms loaded into cache ok[${countOk}] error[${countError}]`
         })
-        new RegisterFormPublishApi().register(server, options);
+        new RegisterFormsApi().register(server);
     }
 };