diff --git a/.run/DESIGNER No AUTH.run.xml b/.run/DESIGNER.run.xml similarity index 92% rename from .run/DESIGNER No AUTH.run.xml rename to .run/DESIGNER.run.xml index 44a165b2..e342ce64 100644 --- a/.run/DESIGNER No AUTH.run.xml +++ b/.run/DESIGNER.run.xml @@ -11,7 +11,7 @@ <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement" /> <env name="ALLOW_USER_TEMPLATES" value="true" /> <env name="AUTH_COOKIE_NAME" value="fsd_user_token" /> - <env name="AUTH_ENABLED" value="false" /> + <env name="AUTH_ENABLED" value="true" /> <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" /> <env name="AWS_BUCKET_NAME" value="fsd-bucket" /> <env name="AWS_DEFAULT_REGION" value="eu-west-2" /> @@ -30,6 +30,8 @@ <env name="REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out" /> <env name="RSA256_PUBLIC_KEY_BASE64" value=""LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHZU1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTUFEQ0JpQUtCZ0hHYnRGMXlWR1crckNBRk9JZGFrVVZ3Q2Z1dgp4SEUzOGxFL2kwS1dwTXdkU0haRkZMWW5IakJWT09oMTVFaWl6WXphNEZUSlRNdkwyRTRRckxwcVlqNktFNnR2CkhyaHlQL041ZnlwU3p0OHZDajlzcFo4KzBrRnVjVzl6eU1rUHVEaXNZdG1rV0dkeEJta2QzZ3RZcDNtT0k1M1YKVkRnS2J0b0lGVTNzSWs1TkFnTUJBQUU9Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQ\=\="" /> <env name="SERVICE_START_PAGE" value="http://localhost:3008/account" /> + <env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/> + <env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/> </envs> <method v="2"> <option name="NpmBeforeRunTask" enabled="true"> @@ -44,4 +46,4 @@ </option> </method> </configuration> -</component> \ No newline at end of file +</component> diff --git a/.run/RUNNER TEST.run.xml b/.run/RUNNER TEST.run.xml deleted file mode 100644 index af76646c..00000000 --- a/.run/RUNNER TEST.run.xml +++ /dev/null @@ -1,24 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="RUNNER TEST" type="js.build_tools.npm"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="unit-test-cov"/> - <node-interpreter value="project"/> - <envs/> - <method v="2"> - <option name="NpmBeforeRunTask" enabled="true"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="build"/> - <node-interpreter value="project"/> - <envs/> - </option> - </method> - </configuration> -</component> diff --git a/.run/RUNNER No AUTH NO REDIS.run.xml b/.run/RUNNER No AUTH NO REDIS.run.xml deleted file mode 100644 index 76c63f63..00000000 --- a/.run/RUNNER No AUTH NO REDIS.run.xml +++ /dev/null @@ -1,49 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="RUNNER No AUTH NO REDIS" type="js.build_tools.npm"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="dev"/> - <node-interpreter value="project"/> - <envs> - <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/> - <env name="ALLOW_USER_TEMPLATES" value="true"/> - <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/> - <env name="AWS_BUCKET_NAME" value="fsd-bucket"/> - <env name="AWS_DEFAULT_REGION" value="eu-west-2"/> - <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/> - <env name="AWS_REGION" value="eu-west-2"/> - <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/> - <env name="AWS_SIGNATURE_VERSION" value="v4"/> - <env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/> - <env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/> - <env name="E2E_MODE_ENABLED" value="false"/> - <env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/> - <env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/> - <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/> - <env name="JWT_AUTH_ENABLED" value="false"/> - <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/> - <env name="LOG_LEVEL" value="debug"/> - <env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/> - <env name="MULTIFUND_URL" value="http://localhost:3008/account"/> - <env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/> - <env name="RSA256_PUBLIC_KEY_BASE64" - value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/> - <env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/> - </envs> - <method v="2"> - <option name="NpmBeforeRunTask" enabled="true"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="build"/> - <node-interpreter value="project"/> - <envs/> - </option> - </method> - </configuration> -</component> diff --git a/.run/RUNNER No AUTH.run.xml b/.run/RUNNER No AUTH.run.xml deleted file mode 100644 index 8185a159..00000000 --- a/.run/RUNNER No AUTH.run.xml +++ /dev/null @@ -1,51 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="RUNNER No AUTH" type="js.build_tools.npm"> - <package-json value="$PROJECT_DIR$/package.json" /> - <command value="run" /> - <scripts> - <script value="runner" /> - </scripts> - <arguments value="dev" /> - <node-interpreter value="project" /> - <envs> - <env name="ACCESSIBILITY_STATEMENT_URL" value="https://frontend.levellingup.gov.localhost:3008/accessibility_statement" /> - <env name="ALLOW_USER_TEMPLATES" value="true" /> - <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE" /> - <env name="AWS_BUCKET_NAME" value="fsd-bucket" /> - <env name="AWS_DEFAULT_REGION" value="eu-west-2" /> - <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566" /> - <env name="AWS_REGION" value="eu-west-2" /> - <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" /> - <env name="AWS_SIGNATURE_VERSION" value="v4" /> - <env name="CONTACT_US_URL" value="https://frontend.levellingup.gov.localhost:3008/contact_us" /> - <env name="COOKIE_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/cookie_policy" /> - <env name="E2E_MODE_ENABLED" value="false" /> - <env name="ELIGIBILITY_RESULT_URL" value="https://frontend.levellingup.gov.localhost:3008/eligibility-result" /> - <env name="FEEDBACK_LINK" value="https://frontend.levellingup.gov.localhost:3008/feedback" /> - <env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379" /> - <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token" /> - <env name="JWT_AUTH_ENABLED" value="false" /> - <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" /> - <env name="LOG_LEVEL" value="debug" /> - <env name="LOGOUT_URL" value="https://authenticator.levellingup.gov.localhost:3004/sessions/sign-out" /> - <env name="MULTIFUND_URL" value="https://frontend.levellingup.gov.localhost:3008/account" /> - <env name="PREVIEW_MODE" value="true" /> - <env name="PRIVACY_POLICY_URL" value="https://frontend.levellingup.gov.localhost:3008/privacy" /> - <env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" /> - <env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" /> - <env name="SINGLE_REDIS" value="true" /> - </envs> - <method v="2"> - <option name="NpmBeforeRunTask" enabled="true"> - <package-json value="$PROJECT_DIR$/package.json" /> - <command value="run" /> - <scripts> - <script value="runner" /> - </scripts> - <arguments value="build" /> - <node-interpreter value="project" /> - <envs /> - </option> - </method> - </configuration> -</component> diff --git a/.run/RUNNER-prod mode.run.xml b/.run/RUNNER-prod mode.run.xml deleted file mode 100644 index 3c29b6e0..00000000 --- a/.run/RUNNER-prod mode.run.xml +++ /dev/null @@ -1,52 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="RUNNER-prod mode" type="js.build_tools.npm"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="dev"/> - <node-interpreter value="project"/> - <envs> - <env name="ACCESSIBILITY_STATEMENT_URL" value="http://localhost:3008/accessibility_statement"/> - <env name="ALLOW_USER_TEMPLATES" value="true"/> - <env name="AWS_ACCESS_KEY_ID" value="FSDIOSFODNN7EXAMPLE"/> - <env name="AWS_BUCKET_NAME" value="fsd-bucket"/> - <env name="AWS_DEFAULT_REGION" value="eu-west-2"/> - <env name="AWS_ENDPOINT_OVERRIDE" value="http://s3.localhost.localstack.cloud:4566"/> - <env name="AWS_REGION" value="eu-west-2"/> - <env name="AWS_SECRET_ACCESS_KEY" value="fsdlrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"/> - <env name="AWS_SIGNATURE_VERSION" value="v4"/> - <env name="CONTACT_US_URL" value="http://localhost:3008/contact_us"/> - <env name="COOKIE_POLICY_URL" value="http://localhost:3008/cookie_policy"/> - <env name="E2E_MODE_ENABLED" value="false"/> - <env name="ELIGIBILITY_RESULT_URL" value="http://localhost:3008/eligibility-result"/> - <env name="FEEDBACK_LINK" value="http://localhost:3008/feedback"/> - <env name="FORM_RUNNER_ADAPTER_REDIS_INSTANCE_URI" value="redis://localhost:6379"/> - <env name="JWT_AUTH_COOKIE_NAME" value="fsd_user_token"/> - <env name="JWT_AUTH_ENABLED" value="true"/> - <env name="JWT_REDIRECT_TO_AUTHENTICATION_URL" value="http://localhost:3004/sessions/sign-out"/> - <env name="LOG_LEVEL" value="debug"/> - <env name="LOGOUT_URL" value="http://localhost:3004/sessions/sign-out"/> - <env name="MULTIFUND_URL" value="http://localhost:3008/account"/> - <env name="PRIVACY_POLICY_URL" value="http://localhost:3008/privacy"/> - <env name="RSA256_PUBLIC_KEY_BASE64" - value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC"/> - <env name="SERVICE_START_PAGE" value="http://localhost:3008/account"/> - <env name="SINGLE_REDIS" value="true"/> - <env name="PREVIEW_MODE" value="false"/> - </envs> - <method v="2"> - <option name="NpmBeforeRunTask" enabled="true"> - <package-json value="$PROJECT_DIR$/package.json"/> - <command value="run"/> - <scripts> - <script value="runner"/> - </scripts> - <arguments value="build"/> - <node-interpreter value="project"/> - <envs/> - </option> - </method> - </configuration> -</component> diff --git a/.run/RUNNER.run.xml b/.run/RUNNER.run.xml index 001ef914..8628d842 100644 --- a/.run/RUNNER.run.xml +++ b/.run/RUNNER.run.xml @@ -34,6 +34,8 @@ <env name="RSA256_PUBLIC_KEY_BASE64" value="TUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdUZBL2xrczcwM2JEeDZYN0duUVIwVlVSOAp6eW8yUEJ6L2E2MVd0TjJCUitYWlV5cjlGaHc4K3E4YVRsbzZ0K2VJa3hENjE4eWpaQkx0cGhZVjUwcTAvOW1OCkk0QStPSURhQ1J0aWd0NDJ4ZUlrbmpydWZ5a280Q0xjV3BFc1dzSkZWSnJnR2xQTHZrMzJHMVJ5WFErOGY1dWsKVmlKbjBKbGlzbWo4bGtzc2pRSURBUUFC" /> <env name="SERVICE_START_PAGE" value="https://frontend.levellingup.gov.localhost:3008/account" /> <env name="SINGLE_REDIS" value="true" /> + <env name="SSL_CERT" value="$PROJECT_DIR$/../../certs/cert.pem"/> + <env name="SSL_KEY" value="$PROJECT_DIR$/../../certs/key.pem"/> </envs> <method v="2"> <option name="NpmBeforeRunTask" enabled="true"> diff --git a/runner/package.json b/runner/package.json index 0966259c..a6ce6cb8 100644 --- a/runner/package.json +++ b/runner/package.json @@ -11,7 +11,8 @@ "scss:build": "node compile-scss.js", "copy-forms": "node copy-form-json.js", "clean:build": "rm -rf dist", - "dev": "NODE_ENV=development nodemon --inspect=0.0.0.0:9228 --watch src --ext js,json,ts,html,scss --exec 'yarn build && yarn start:server'", + "dev": "yarn build && yarn start:local", + "start:local": "NODE_ENV=development nodemon --inspect=0.0.0.0:9228 --watch src --ext js,json,ts,html,scss dist/digital-form-builder-adapter/runner/index.js", "start:server": "node dist/digital-form-builder-adapter/runner/index.js", "production": "NODE_ENV=production npm run start:server", "start:test": "NODE_ENV=development npm run start:server", @@ -50,7 +51,6 @@ "@types/hoek": "^4.1.4", "babel-eslint": "^10.1.0", "babel-plugin-module-name-mapper": "^1.2.0", - "concurrently": "^7.0.0", "hapi-auth-jwt2": "10.2.0", "prisma": "^5.1.1", "sass": "^1.49.9",