From 21c595f475459bd87e08ccdc79fb6fa38e77659d Mon Sep 17 00:00:00 2001 From: Matthew White Date: Tue, 15 Oct 2024 11:59:55 -0400 Subject: [PATCH] Serve local client-config.json if it exists --- .gitignore | 2 ++ main.nginx.conf | 5 ++++- package.json | 1 - src/config.js | 4 +--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 45ccb754a..051020461 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ npm-debug.log* !/.nginx/.gitkeep /.eslintcache + +/client-config.json diff --git a/main.nginx.conf b/main.nginx.conf index 077723efa..9dd7b9668 100644 --- a/main.nginx.conf +++ b/main.nginx.conf @@ -95,7 +95,10 @@ http { } location = /client-config.json { - include ./common-headers.nginx.conf; + root .; + try_files $uri @empty_json; + } + location @empty_json { return 200 "{}"; } diff --git a/package.json b/package.json index 09d165eb2..fe72cd1b1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "private": true, "scripts": { "dev": "nf start", - "dev:oidc": "VUE_APP_OIDC_ENABLED=true npm run dev", "build": "vue-cli-service build", "lint": "eslint --max-warnings 0 --cache --ext .js,.vue src/ bin/ test/ *.js", "lint:fix": "eslint --max-warnings 0 --fix --cache --ext .js,.vue src/ bin/ test/ *.js", diff --git a/src/config.js b/src/config.js index 260450e1a..7f3384286 100644 --- a/src/config.js +++ b/src/config.js @@ -19,8 +19,6 @@ export default { title: null, body: null }, - // VUE_APP_OIDC_ENABLED is not set in production. It can be set during local - // development to facilitate work on SSO. - oidcEnabled: process.env.VUE_APP_OIDC_ENABLED === 'true', + oidcEnabled: false, showsFeedbackButton: false };