@nsshunt/stsconfig 1.15.0 → 1.16.0

package/.env-default

@@ -62,14 +62,6 @@ REST01_PROM_CLUSTER_PORT=3013
 REST01_SERVICE_NAME=STSRest01
 # STSREST01 Service Version
 REST01_SERVICE_VERSION=1.0.0
-# STSREST01 Service Credentials
-# -----------------------------
-# STSREST01 Server username email
-REST01_EMAIL=STSREST01ServiceUser@stsmda.com
-# STSREST01 Server username password
-REST01_PASSWORD=STSREST01ServiceUserPassword
-# STSREST01 Server username password file
-#REST01_PASSWORD_FILE
 
 # STS Instrument Manager Service endpoint
 IM_ENDPOINT=http://localhost
@@ -87,14 +79,6 @@ IM_PROM_CLUSTER_PORT=3011
 IM_SERVICE_NAME=STSInstrumentManager
 # STS Instrument Manager Service Version
 IM_SERVICE_VERSION=1.0.0
-# STS Instrument Manager Service Credentials
-# ------------------------------------------
-# STS Instrument Manager Service username email
-IM_EMAIL=STSInstrumentManagerServiceUser@stsmda.com
-# STS Instrument Manager Service username password
-IM_PASSWORD=STSInstrumentManagerServiceUserPassword
-# STS Instrument Manager Service username password file
-#IM_PASSWORD_FILE
 
 # STS Test Orchestrator Service endpoint
 TO_ENDPOINT=http://localhost
@@ -112,14 +96,6 @@ TO_PROM_CLUSTER_PORT=3014
 TO_SERVICE_NAME=STSTestOrchestrator
 # STS Test Orchestrator Service Version
 TO_SERVICE_VERSION=1.0.0
-# STS Test Orchestrator Service Credentials
-# ------------------------------------------
-# STS Test Orchestrator Service username email
-TO_EMAIL=STSTestOrchestratorServiceUser@stsmda.com
-# STS Test Orchestrator Service username password
-TO_PASSWORD=STSTestOrchestratorServiceUserPassword
-# STS Test Orchestrator Service username password file
-#TO_PASSWORD_FILE
 
 # Auth Server endpoint
 AS_ENDPOINT=http://localhost
@@ -137,14 +113,19 @@ AS_PROM_CLUSTER_PORT=3012
 AS_SERVICE_NAME=STSAuth
 # STSAuth Service Version
 AS_SERVICE_VERSION=1.0.0
-# STS Auth Service Credentials
-# ----------------------------
-# Auth Server username email
-AS_EMAIL=STSAuthServiceUser@stsmda.com
-# Auth Server username password
-AS_PASSWORD=STSAuthServiceUserPassword
-# Auth Server username password file
-#AS_PASSWORD_FILE
+# Auth Server - JWKS Public End Point.
+AS_JWKS_JSON_PATH=/.well-known/jwks.json
+# Auth Server - JWKS key rotation time (seconds).
+AS_JWKS_KEY_ROTATION_TIME=86400
+# Auth Server - JWKS key purge time offset (seconds). Old keys (current keys are considered 'old' immediately after a key rotation) will be kept
+# for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before purging from the JWKS.
+AS_JWKS_KEY_PURGE_TIME_OFFSET=300
+# Auth Server - JWKS key count. Defines the number of active keys within the JWKS. Note that the actual key count may be double this value as current
+# keys are rotated to old keys prior to old key purge. Old keys will be kept for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before removal from the JWKS.
+# This is to ensure that any tokens signed by a current key that is then expired can still be validated within the life of the issued token.
+AS_JWKS_KEY_COUNT=4
+# Auth Server - JWKS Access token timeout.
+AS_ACCESS_TOKEN_EXPIRE=43200
 # Auth Server - Private Key (when using JWT)
 AS_PRIVATE_KEY_PATH=/var/lib/sts/stsglobalresources/keys/private.key
 # Auth Server - Public Key (when using JWT)
@@ -158,14 +139,6 @@ TR_PROM_CLUSTER_PORT=3015
 TR_SERVICE_NAME=STSRestRunner
 # STS Test Runner Service Version
 TR_SERVICE_VERSION=1.0.0
-# STS Test Runner Credentials
-# ----------------------------
-# STS Test Runner username email
-TR_EMAIL=STSTestRunnerServiceUser@stsmda.com
-# STS Test Runner password
-TR_PASSWORD=STSTestRunnerServiceUserPassword
-# STS Test Runner password file
-#TR_PASSWORD_FILE
 
 # Duration (in ms) between each publish event.
 PUBLISH_INTERVAL=1000

package/.env-test-file-2

@@ -30,9 +30,12 @@ REST01_PROM_SUPPORT=false
 REST01_PROM_CLUSTER_PORT=30130
 REST01_SERVICE_NAME=STSRest01-c
 REST01_SERVICE_VERSION=1.0.0-c
-REST01_EMAIL=K6TestUser@sts-c
-REST01_PASSWORD=K6TestUserPassword-c
-REST01_PASSWORD_FILE=testpasswordfile
+REST01_API_IDENTIFIER=xyz
+REST01_API_IDENTIFIER_FILE=testapiidentifierFile
+REST01_CLIENT_ID=xyz
+REST01_CLIENT_ID_FILE=testclientidfile
+REST01_CLIENT_SECRET=xyz
+REST01_CLIENT_SECRET_FILE=testclientsecretfile
 
 IM_ENDPOINT=http://localhost-c
 IM_HOST_PORT=30010
@@ -42,9 +45,12 @@ IM_PROM_SUPPORT=false
 IM_PROM_CLUSTER_PORT=30110
 IM_SERVICE_NAME=STSInstrumentManager-c
 IM_SERVICE_VERSION=1.0.0-c
-IM_EMAIL=K6TestUser@sts-c
-IM_PASSWORD=K6TestUserPassword-c
-IM_PASSWORD_FILE=testpasswordfile
+IM_API_IDENTIFIER=xyz
+IM_API_IDENTIFIER_FILE=testapiidentifierFile
+IM_CLIENT_ID=xyz
+IM_CLIENT_ID_FILE=testclientidfile
+IM_CLIENT_SECRET=xyz
+IM_CLIENT_SECRET_FILE=testclientsecretfile
 
 TO_ENDPOINT=http://localhost-c
 TO_HOST_PORT=30040
@@ -54,21 +60,32 @@ TO_PROM_SUPPORT=false
 TO_PROM_CLUSTER_PORT=30140
 TO_SERVICE_NAME=STSTestOrchestrator-c
 TO_SERVICE_VERSION=1.0.0-c
-TO_EMAIL=K6TestUser@sts-c
-TO_PASSWORD=K6TestUserPassword-c
-TO_PASSWORD_FILE=testpasswordfile
+TO_API_IDENTIFIER=xyz
+TO_API_IDENTIFIER_FILE=testapiidentifierFile
+TO_CLIENT_ID=xyz
+TO_CLIENT_ID_FILE=testclientidfile
+TO_CLIENT_SECRET=xyz
+TO_CLIENT_SECRET_FILE=testclientsecretfile
 
 AS_ENDPOINT=http://localhost-c
 AS_HOST_PORT=30020
 AS_PORT=30020
 AS_APIROOT=/stsauth/v1-c
+AS_API_IDENTIFIER=xyz
+AS_API_IDENTIFIER_FILE=testapiidentifierFile
 AS_PROM_SUPPORT=false
 AS_PROM_CLUSTER_PORT=30120
 AS_SERVICE_NAME=STSAuth-c
 AS_SERVICE_VERSION=1.0.0-c
-AS_EMAIL=K6TestUser@sts-c
-AS_PASSWORD=K6TestUserPassword-c
-AS_PASSWORD_FILE=testpasswordfile
+AS_CLIENT_ID=xyz
+AS_CLIENT_ID_FILE=testclientidfile
+AS_CLIENT_SECRET=xyz
+AS_CLIENT_SECRET_FILE=testclientsecretfile
+AS_JWKS_JSON_PATH=/.well-known/jwks.json-c
+AS_JWKS_KEY_ROTATION_TIME=864000
+AS_JWKS_KEY_PURGE_TIME_OFFSET=3000
+AS_JWKS_KEY_COUNT=40
+AS_ACCESS_TOKEN_EXPIRE=432000
 AS_PRIVATE_KEY_PATH=/var/lib/sts/stsglobalresources/keys/private.key-c
 AS_PUBLIC_KEY_PATH=/var/lib/sts/stsglobalresources/keys/public.key-c
 
@@ -76,9 +93,10 @@ TR_PROM_SUPPORT=false
 TR_PROM_CLUSTER_PORT=30150
 TR_SERVICE_NAME=STSRestRunner-c
 TR_SERVICE_VERSION=1.0.0-c
-TR_EMAIL=K6TestUser@sts-c
-TR_PASSWORD=K6TestUserPassword-c
-TR_PASSWORD_FILE=testpasswordfile
+TR_CLIENT_ID=xyz
+TR_CLIENT_ID_FILE=testclientidfile
+TR_CLIENT_SECRET=xyz
+TR_CLIENT_SECRET_FILE=testclientsecretfile
 
 PUBLISH_INTERVAL=10000
 PUBLISH_TIMEOUT=7500

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsconfig",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "",
   "main": "stsconfig.js",
   "dependencies": {

package/stsconfig-01.test.js

@@ -45,7 +45,7 @@ describe("Test implicit config settings", () =>
 
 	test('Checking default rest01 service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -58,14 +58,17 @@ describe("Test implicit config settings", () =>
 		expect(goptions.rest01prometheusclusterport).toEqual('3013');
 		expect(goptions.rest01servicename).toEqual('STSRest01');
 		expect(goptions.rest01serviceversion).toEqual('1.0.0');
-		expect(goptions.rest01email).toEqual('STSREST01ServiceUser@stsmda.com');
-		expect(goptions.rest01password).toEqual('STSREST01ServiceUserPassword');
-		expect(goptions.rest01passwordfile).toEqual(undefined);
+		expect(goptions.rest01apiidentifier).toEqual(undefined);
+		expect(goptions.rest01apiidentifierfile).toEqual(undefined);
+		expect(goptions.rest01clientid).toEqual(undefined);
+		expect(goptions.rest01clientidfile).toEqual(undefined);
+		expect(goptions.rest01clientsecret).toEqual(undefined);
+		expect(goptions.rest01clientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default instrument manager service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -78,14 +81,17 @@ describe("Test implicit config settings", () =>
 		expect(goptions.imprometheusclusterport).toEqual('3011');
 		expect(goptions.imservicename).toEqual('STSInstrumentManager');
 		expect(goptions.imserviceversion).toEqual('1.0.0');
-		expect(goptions.imemail).toEqual('STSInstrumentManagerServiceUser@stsmda.com');
-		expect(goptions.impassword).toEqual('STSInstrumentManagerServiceUserPassword');
-		expect(goptions.impasswordfile).toEqual(undefined);
+		expect(goptions.imapiidentifier).toEqual(undefined);
+		expect(goptions.imapiidentifierfile).toEqual(undefined);
+		expect(goptions.imclientid).toEqual(undefined);
+		expect(goptions.imclientidfile).toEqual(undefined);
+		expect(goptions.imclientsecret).toEqual(undefined);
+		expect(goptions.imclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default test orchestrator service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -98,14 +104,17 @@ describe("Test implicit config settings", () =>
 		expect(goptions.toprometheusclusterport).toEqual('3014');
 		expect(goptions.toservicename).toEqual('STSTestOrchestrator');
 		expect(goptions.toserviceversion).toEqual('1.0.0');
-		expect(goptions.toemail).toEqual('STSTestOrchestratorServiceUser@stsmda.com');
-		expect(goptions.topassword).toEqual('STSTestOrchestratorServiceUserPassword');
-		expect(goptions.topasswordfile).toEqual(undefined);
+		expect(goptions.toapiidentifier).toEqual(undefined);
+		expect(goptions.toapiidentifierfile).toEqual(undefined);
+		expect(goptions.toclientid).toEqual(undefined);
+		expect(goptions.toclientidfile).toEqual(undefined);
+		expect(goptions.toclientsecret).toEqual(undefined);
+		expect(goptions.toclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default authentication service config', async () => 
 	{
-		expect.assertions(13);
+		expect.assertions(21);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -118,16 +127,24 @@ describe("Test implicit config settings", () =>
 		expect(goptions.asprometheusclusterport).toEqual('3012');
 		expect(goptions.asservicename).toEqual('STSAuth');
 		expect(goptions.asserviceversion).toEqual('1.0.0');
-		expect(goptions.asemail).toEqual('STSAuthServiceUser@stsmda.com');
-		expect(goptions.aspassword).toEqual('STSAuthServiceUserPassword');
-		expect(goptions.aspasswordfile).toEqual(undefined);
 		expect(goptions.asprivatekeypath).toEqual('/var/lib/sts/stsglobalresources/keys/private.key');
 		expect(goptions.aspublickeypath).toEqual('/var/lib/sts/stsglobalresources/keys/public.key');
+		expect(goptions.asapiidentifier).toEqual(undefined);
+		expect(goptions.asapiidentifierfile).toEqual(undefined);
+		expect(goptions.asclientid).toEqual(undefined);
+		expect(goptions.asclientidfile).toEqual(undefined);
+		expect(goptions.asclientsecret).toEqual(undefined);
+		expect(goptions.asclientsecretfile).toEqual(undefined);
+		expect(goptions.asjwksjsonpath).toEqual('/.well-known/jwks.json');
+		expect(goptions.asjwkskeyrotationtime).toEqual(86400);
+		expect(goptions.asjwkskeypurgetimeoffset).toEqual(300);
+		expect(goptions.asjwkskeycount).toEqual(4);
+		expect(goptions.asaccesstokenexpire).toEqual(43200);
 	});
 
 	test('Checking default test runner service config', async () => 
 	{
-		expect.assertions(7);
+		expect.assertions(8);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -136,9 +153,10 @@ describe("Test implicit config settings", () =>
 		expect(goptions.trprometheusclusterport).toEqual('3015');
 		expect(goptions.trservicename).toEqual('STSRestRunner');
 		expect(goptions.trserviceversion).toEqual('1.0.0');
-		expect(goptions.tremail).toEqual('STSTestRunnerServiceUser@stsmda.com');
-		expect(goptions.trpassword).toEqual('STSTestRunnerServiceUserPassword');
-		expect(goptions.trpasswordfile).toEqual(undefined);
+		expect(goptions.trclientid).toEqual(undefined);
+		expect(goptions.trclientidfile).toEqual(undefined);
+		expect(goptions.trclientsecret).toEqual(undefined);
+		expect(goptions.trclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default additional config items', async () => 

package/stsconfig-02.test.js

@@ -45,7 +45,7 @@ describe("Test configured settings", () =>
 
 	test('Checking default rest01 service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-2'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -58,14 +58,17 @@ describe("Test configured settings", () =>
 		expect(goptions.rest01prometheusclusterport).toEqual('30130');
 		expect(goptions.rest01servicename).toEqual('STSRest01-c');
 		expect(goptions.rest01serviceversion).toEqual('1.0.0-c');
-		expect(goptions.rest01email).toEqual('K6TestUser@sts-c');
-		expect(goptions.rest01password).toEqual('testfilepassword');
-		expect(goptions.rest01passwordfile).toEqual('testpasswordfile');
+		expect(goptions.rest01apiidentifier).toEqual('testapiidentifierfilecontents');
+		expect(goptions.rest01apiidentifierfile).toEqual('testapiidentifierFile');
+		expect(goptions.rest01clientid).toEqual('testclientidfilecontents');
+		expect(goptions.rest01clientidfile).toEqual('testclientidfile'); // testclientidfile
+		expect(goptions.rest01clientsecret).toEqual('testclientsecretfilecontents');
+		expect(goptions.rest01clientsecretfile).toEqual('testclientsecretfile');
 	});
 
 	test('Checking default instrument manager service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-2'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -78,14 +81,17 @@ describe("Test configured settings", () =>
 		expect(goptions.imprometheusclusterport).toEqual('30110');
 		expect(goptions.imservicename).toEqual('STSInstrumentManager-c');
 		expect(goptions.imserviceversion).toEqual('1.0.0-c');
-		expect(goptions.imemail).toEqual('K6TestUser@sts-c');
-		expect(goptions.impassword).toEqual('testfilepassword');
-		expect(goptions.impasswordfile).toEqual('testpasswordfile');
+		expect(goptions.imapiidentifier).toEqual('testapiidentifierfilecontents');
+		expect(goptions.imapiidentifierfile).toEqual('testapiidentifierFile');
+		expect(goptions.imclientid).toEqual('testclientidfilecontents');
+		expect(goptions.imclientidfile).toEqual('testclientidfile'); // testclientidfile
+		expect(goptions.imclientsecret).toEqual('testclientsecretfilecontents');
+		expect(goptions.imclientsecretfile).toEqual('testclientsecretfile');
 	});
 
 	test('Checking default test orchestrator service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -98,14 +104,17 @@ describe("Test configured settings", () =>
 		expect(goptions.toprometheusclusterport).toEqual('30140');
 		expect(goptions.toservicename).toEqual('STSTestOrchestrator-c');
 		expect(goptions.toserviceversion).toEqual('1.0.0-c');
-		expect(goptions.toemail).toEqual('K6TestUser@sts-c');
-		expect(goptions.topassword).toEqual('testfilepassword');
-		expect(goptions.topasswordfile).toEqual('testpasswordfile');
+		expect(goptions.toapiidentifier).toEqual('testapiidentifierfilecontents');
+		expect(goptions.toapiidentifierfile).toEqual('testapiidentifierFile');
+		expect(goptions.toclientid).toEqual('testclientidfilecontents');
+		expect(goptions.toclientidfile).toEqual('testclientidfile'); // testclientidfile
+		expect(goptions.toclientsecret).toEqual('testclientsecretfilecontents');
+		expect(goptions.toclientsecretfile).toEqual('testclientsecretfile');
 	});
 
 	test('Checking default authentication service config', async () => 
 	{
-		expect.assertions(13);
+		expect.assertions(21);
 
 		process.env.STSENVFILE = './.env-test-file-2'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -118,16 +127,24 @@ describe("Test configured settings", () =>
 		expect(goptions.asprometheusclusterport).toEqual('30120');
 		expect(goptions.asservicename).toEqual('STSAuth-c');
 		expect(goptions.asserviceversion).toEqual('1.0.0-c');
-		expect(goptions.asemail).toEqual('K6TestUser@sts-c');
-		expect(goptions.aspassword).toEqual('testfilepassword');
-		expect(goptions.aspasswordfile).toEqual('testpasswordfile');
 		expect(goptions.asprivatekeypath).toEqual('/var/lib/sts/stsglobalresources/keys/private.key-c');
 		expect(goptions.aspublickeypath).toEqual('/var/lib/sts/stsglobalresources/keys/public.key-c');
+		expect(goptions.asapiidentifier).toEqual('testapiidentifierfilecontents');
+		expect(goptions.asapiidentifierfile).toEqual('testapiidentifierFile');
+		expect(goptions.asclientid).toEqual('testclientidfilecontents');
+		expect(goptions.asclientidfile).toEqual('testclientidfile'); // testclientidfile
+		expect(goptions.asclientsecret).toEqual('testclientsecretfilecontents');
+		expect(goptions.asclientsecretfile).toEqual('testclientsecretfile');
+		expect(goptions.asjwksjsonpath).toEqual('/.well-known/jwks.json-c');
+		expect(goptions.asjwkskeyrotationtime).toEqual(864000);
+		expect(goptions.asjwkskeypurgetimeoffset).toEqual(3000);
+		expect(goptions.asjwkskeycount).toEqual(40);
+		expect(goptions.asaccesstokenexpire).toEqual(432000);
 	});
 
 	test('Checking default test runner service config', async () => 
 	{
-		expect.assertions(7);
+		expect.assertions(8);
 
 		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -136,9 +153,10 @@ describe("Test configured settings", () =>
 		expect(goptions.trprometheusclusterport).toEqual('30150');
 		expect(goptions.trservicename).toEqual('STSRestRunner-c');
 		expect(goptions.trserviceversion).toEqual('1.0.0-c');
-		expect(goptions.tremail).toEqual('K6TestUser@sts-c');
-		expect(goptions.trpassword).toEqual('testfilepassword');
-		expect(goptions.trpasswordfile).toEqual('testpasswordfile');
+		expect(goptions.trclientid).toEqual('testclientidfilecontents');
+		expect(goptions.trclientidfile).toEqual('testclientidfile'); // testclientidfile
+		expect(goptions.trclientsecret).toEqual('testclientsecretfilecontents');
+		expect(goptions.trclientsecretfile).toEqual('testclientsecretfile');
 	});
 
 	test('Checking default additional config items', async () => 

package/stsconfig-default.test.js

@@ -45,7 +45,7 @@ describe("Test explicit default config settings", () =>
 
 	test('Checking default rest01 service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-default'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -58,14 +58,17 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.rest01prometheusclusterport).toEqual('3013');
 		expect(goptions.rest01servicename).toEqual('STSRest01');
 		expect(goptions.rest01serviceversion).toEqual('1.0.0');
-		expect(goptions.rest01email).toEqual('STSREST01ServiceUser@stsmda.com');
-		expect(goptions.rest01password).toEqual('STSREST01ServiceUserPassword');
-		expect(goptions.rest01passwordfile).toEqual(undefined);
+		expect(goptions.rest01apiidentifier).toEqual(undefined);
+		expect(goptions.rest01apiidentifierfile).toEqual(undefined);
+		expect(goptions.rest01clientid).toEqual(undefined);
+		expect(goptions.rest01clientidfile).toEqual(undefined);
+		expect(goptions.rest01clientsecret).toEqual(undefined);
+		expect(goptions.rest01clientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default instrument manager service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-default'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -78,14 +81,17 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.imprometheusclusterport).toEqual('3011');
 		expect(goptions.imservicename).toEqual('STSInstrumentManager');
 		expect(goptions.imserviceversion).toEqual('1.0.0');
-		expect(goptions.imemail).toEqual('STSInstrumentManagerServiceUser@stsmda.com');
-		expect(goptions.impassword).toEqual('STSInstrumentManagerServiceUserPassword');
-		expect(goptions.impasswordfile).toEqual(undefined);
+		expect(goptions.imapiidentifier).toEqual(undefined);
+		expect(goptions.imapiidentifierfile).toEqual(undefined);
+		expect(goptions.imclientid).toEqual(undefined);
+		expect(goptions.imclientidfile).toEqual(undefined);
+		expect(goptions.imclientsecret).toEqual(undefined);
+		expect(goptions.imclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default test orchestrator service config', async () => 
 	{
-		expect.assertions(11);
+		expect.assertions(14);
 
 		process.env.STSENVFILE = './.env-default'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -98,14 +104,17 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.toprometheusclusterport).toEqual('3014');
 		expect(goptions.toservicename).toEqual('STSTestOrchestrator');
 		expect(goptions.toserviceversion).toEqual('1.0.0');
-		expect(goptions.toemail).toEqual('STSTestOrchestratorServiceUser@stsmda.com');
-		expect(goptions.topassword).toEqual('STSTestOrchestratorServiceUserPassword');
-		expect(goptions.topasswordfile).toEqual(undefined);
+		expect(goptions.toapiidentifier).toEqual(undefined);
+		expect(goptions.toapiidentifierfile).toEqual(undefined);
+		expect(goptions.toclientid).toEqual(undefined);
+		expect(goptions.toclientidfile).toEqual(undefined);
+		expect(goptions.toclientsecret).toEqual(undefined);
+		expect(goptions.toclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default authentication service config', async () => 
 	{
-		expect.assertions(13);
+		expect.assertions(21);
 
 		process.env.STSENVFILE = './.env-default'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -118,16 +127,24 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.asprometheusclusterport).toEqual('3012');
 		expect(goptions.asservicename).toEqual('STSAuth');
 		expect(goptions.asserviceversion).toEqual('1.0.0');
-		expect(goptions.asemail).toEqual('STSAuthServiceUser@stsmda.com');
-		expect(goptions.aspassword).toEqual('STSAuthServiceUserPassword');
-		expect(goptions.aspasswordfile).toEqual(undefined);
 		expect(goptions.asprivatekeypath).toEqual('/var/lib/sts/stsglobalresources/keys/private.key');
 		expect(goptions.aspublickeypath).toEqual('/var/lib/sts/stsglobalresources/keys/public.key');
+		expect(goptions.asapiidentifier).toEqual(undefined);
+		expect(goptions.asapiidentifierfile).toEqual(undefined);
+		expect(goptions.asclientid).toEqual(undefined);
+		expect(goptions.asclientidfile).toEqual(undefined);
+		expect(goptions.asclientsecret).toEqual(undefined);
+		expect(goptions.asclientsecretfile).toEqual(undefined);
+		expect(goptions.asjwksjsonpath).toEqual('/.well-known/jwks.json');
+		expect(goptions.asjwkskeyrotationtime).toEqual(86400);
+		expect(goptions.asjwkskeypurgetimeoffset).toEqual(300);
+		expect(goptions.asjwkskeycount).toEqual(4);
+		expect(goptions.asaccesstokenexpire).toEqual(43200);
 	});
 
 	test('Checking default test runner service config', async () => 
 	{
-		expect.assertions(7);
+		expect.assertions(8);
 
 		process.env.STSENVFILE = './.env-default'; // Empty environment file
 		let goptions = require('./stsconfig.js').$options;
@@ -136,9 +153,10 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.trprometheusclusterport).toEqual('3015');
 		expect(goptions.trservicename).toEqual('STSRestRunner');
 		expect(goptions.trserviceversion).toEqual('1.0.0');
-		expect(goptions.tremail).toEqual('STSTestRunnerServiceUser@stsmda.com');
-		expect(goptions.trpassword).toEqual('STSTestRunnerServiceUserPassword');
-		expect(goptions.trpasswordfile).toEqual(undefined);
+		expect(goptions.trclientid).toEqual(undefined);
+		expect(goptions.trclientidfile).toEqual(undefined);
+		expect(goptions.trclientsecret).toEqual(undefined);
+		expect(goptions.trclientsecretfile).toEqual(undefined);
 	});
 
 	test('Checking default additional config items', async () => 

package/stsconfig.js

@@ -76,8 +76,6 @@ const defconfig =
 	,rest01apiidentifier: process.env.REST01_API_IDENTIFIER
 	// STSREST01 API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	,rest01apiidentifierfile: process.env.REST01_API_IDENTIFIER_FILE
-	// STSREST01 API Permissions file. These are all the permissions (scopes) that this API uses. Format is JSON.
-	,rest01apipermissionsfile: process.env.REST01_API_PERMISSIONS_FILE
 	// STSREST01 Prometheus metric support
 	,rest01prometheussupport: (process.env.REST01_PROM_SUPPORT === undefined ? true : (process.env.REST01_PROM_SUPPORT === "true" ? true : false))
 	// STSREST01 Cluster Server port (port used for cluster prometheus scrapes). Service will listen on this port at mount point /metrics
@@ -86,22 +84,16 @@ const defconfig =
 	,rest01servicename: (process.env.REST01_SERVICE_NAME === undefined ? "STSRest01" : process.env.REST01_SERVICE_NAME)
 	// STSREST01 Service Version
 	,rest01serviceversion: (process.env.REST01_SERVICE_VERSION === undefined ? "1.0.0" : process.env.REST01_SERVICE_VERSION)
-	// STSREST01 Service Credentials
-	// -----------------------------
-	// STSREST01 Server username email
-	,rest01email: (process.env.REST01_EMAIL === undefined ? "STSREST01ServiceUser@stsmda.com" : process.env.REST01_EMAIL)
-	// STSREST01 Server username password
-	,rest01password: (process.env.REST01_PASSWORD === undefined ? "STSREST01ServiceUserPassword" : process.env.REST01_PASSWORD)
-	// STSREST01 Server username password file
-	,rest01passwordfile: process.env.REST01_PASSWORD_FILE
 	// STSREST01 Server client ID. Used for oauth2 client credentials flow.
 	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/client-credentials-flow
 	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-client-credentials-flow
 	,rest01clientid: process.env.REST01_CLIENT_ID
 	// STSREST01 Server client ID file. Used for oauth2 client credentials flow.
 	,rest01clientidfile: process.env.REST01_CLIENT_ID_FILE
+	// STSREST01 Server client secret. Used for oauth2 client credentials flow.
+	,rest01clientsecret: process.env.REST01_CLIENT_SECRET
 	// STSREST01 Server client secret file. Used for oauth2 client credentials flow.
-	,rest01clientsecretfile: process.env.REST01_CLIENT_SECRET_PASSWORD_FILE
+	,rest01clientsecretfile: process.env.REST01_CLIENT_SECRET_FILE
 	
 	// STS Instrument Manager Service endpoint
 	,imendpoint: (process.env.IM_ENDPOINT === undefined ? "http://localhost" : process.env.IM_ENDPOINT)
@@ -111,6 +103,10 @@ const defconfig =
 	,import: (process.env.IM_PORT === undefined ? "3001" : process.env.IM_PORT)
 	// STS Instrument Manager Service endpoint
 	,imapiroot: (process.env.IM_APIROOT === undefined ? "/stsinstrumentmanager/v1" : process.env.IM_APIROOT)
+	// Instrument Manager API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,imapiidentifier: process.env.IM_API_IDENTIFIER
+	//  Instrument Manager API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,imapiidentifierfile: process.env.IM_API_IDENTIFIER_FILE
 	// STS Instrument Manager Prometheus metric support
 	,imprometheussupport: (process.env.IM_PROM_SUPPORT === undefined ? true : (process.env.IM_PROM_SUPPORT === "true" ? true : false ))
 	// STS Instrument Manager Cluster Server port (port used for cluster prometheus scrapes)
@@ -119,14 +115,14 @@ const defconfig =
 	,imservicename: (process.env.IM_SERVICE_NAME === undefined ? "STSInstrumentManager" : process.env.IM_SERVICE_NAME)
 	// STS Instrument Manager Service Version
 	,imserviceversion: (process.env.IM_SERVICE_VERSION === undefined ? "1.0.0" : process.env.IM_SERVICE_VERSION)
-	// STS Instrument Manager Service Credentials
-	// ------------------------------------------
-	// STS Instrument Manager Service username email
-	,imemail: (process.env.IM_EMAIL === undefined ? "STSInstrumentManagerServiceUser@stsmda.com" : process.env.IM_EMAIL)
-	// STS Instrument Manager Service username password
-	,impassword: (process.env.IM_PASSWORD === undefined ? "STSInstrumentManagerServiceUserPassword" : process.env.IM_PASSWORD)
-	// STS Instrument Manager Service username password file
-	,impasswordfile: process.env.IM_PASSWORD_FILE
+	// STS Instrument Manager Server client ID. Used for oauth2 client credentials flow.
+	,imclientid: process.env.IM_CLIENT_ID
+	// STS Instrument Manager Server client ID file. Used for oauth2 client credentials flow.
+	,imclientidfile: process.env.IM_CLIENT_ID_FILE
+	// STS Instrument Manager Server client secret. Used for oauth2 client credentials flow.
+	,imclientsecret: process.env.IM_CLIENT_SECRET
+	// STS Instrument Manager Server client secret file. Used for oauth2 client credentials flow.
+	,imclientsecretfile: process.env.IM_CLIENT_SECRET_FILE
 
 	// STS Test Orchestrator Service endpoint
 	,toendpoint: (process.env.TO_ENDPOINT === undefined ? "http://localhost" : process.env.TO_ENDPOINT)
@@ -136,6 +132,10 @@ const defconfig =
 	,toport: (process.env.TO_PORT === undefined ? "3004" : process.env.TO_PORT)
 	// STS Test Orchestrator Service endpoint
 	,toapiroot: (process.env.TO_APIROOT === undefined ? "/ststestorchestrator/v1" : process.env.TO_APIROOT)
+	// Test Orchestrator API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,toapiidentifier: process.env.TO_API_IDENTIFIER
+	// Test Orchestrator API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,toapiidentifierfile: process.env.TO_API_IDENTIFIER_FILE
 	// STS Test Orchestrator Prometheus metric support
 	,toprometheussupport: (process.env.TO_PROM_SUPPORT === undefined ? true : (process.env.TO_PROM_SUPPORT === "true" ? true : false ))
 	// STS Test Orchestrator Cluster Server port (port used for cluster prometheus scrapes)
@@ -144,14 +144,14 @@ const defconfig =
 	,toservicename: (process.env.TO_SERVICE_NAME === undefined ? "STSTestOrchestrator" : process.env.TO_SERVICE_NAME)
 	// STS Test Orchestrator Service Version
 	,toserviceversion: (process.env.TO_SERVICE_VERSION === undefined ? "1.0.0" : process.env.TO_SERVICE_VERSION)
-	// STS Test Orchestrator Service Credentials
-	// ------------------------------------------
-	// STS Test Orchestrator Service username email
-	,toemail: (process.env.TO_EMAIL === undefined ? "STSTestOrchestratorServiceUser@stsmda.com" : process.env.TO_EMAIL)
-	// STS Test Orchestrator Service username password
-	,topassword: (process.env.TO_PASSWORD === undefined ? "STSTestOrchestratorServiceUserPassword" : process.env.TO_PASSWORD)
-	// STS Test Orchestrator Service username password file
-	,topasswordfile: process.env.TO_PASSWORD_FILE
+	// STS Test Orchestrator Server client ID. Used for oauth2 client credentials flow.
+	,toclientid: process.env.TO_CLIENT_ID
+	// STS Test Orchestrator Server client ID file. Used for oauth2 client credentials flow.
+	,toclientidfile: process.env.TO_CLIENT_ID_FILE
+	// STS Test Orchestrator Server client secret. Used for oauth2 client credentials flow.
+	,toclientsecret: process.env.TO_CLIENT_SECRET
+	// STS Test Orchestrator Server client secret file. Used for oauth2 client credentials flow.
+	,toclientsecretfile: process.env.TO_CLIENT_SECRET_FILE
 	
 	// STS Auth Server
 	// ---------------
@@ -165,6 +165,10 @@ const defconfig =
 	,asport: (process.env.AS_PORT === undefined ? "3002" : process.env.AS_PORT)
 	// Auth Server endpoint
 	,asapiroot: (process.env.AS_APIROOT === undefined ? "/stsauth/v1" : process.env.AS_APIROOT)
+	// Auth Server API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,asapiidentifier: process.env.AS_API_IDENTIFIER
+	// Auth Server API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,asapiidentifierfile: process.env.AS_API_IDENTIFIER_FILE
 	// Auth Server Prometheus metric support
 	,asprometheussupport: (process.env.AS_PROM_SUPPORT === undefined ? true : (process.env.AS_PROM_SUPPORT === "true" ? true : false ))
 	// Auth Prometheus Cluster Server port (port used for cluster prometheus scrapes)
@@ -173,40 +177,27 @@ const defconfig =
 	,asservicename: (process.env.AS_SERVICE_NAME === undefined ? "STSAuth" : process.env.AS_SERVICE_NAME)
 	// STSAuth Service Version
 	,asserviceversion: (process.env.AS_SERVICE_VERSION === undefined ? "1.0.0" : process.env.AS_SERVICE_VERSION)
-	// STS Auth Service Credentials
-	// ----------------------------
-	// Auth Server username email
-	,asemail: (process.env.AS_EMAIL === undefined ? "STSAuthServiceUser@stsmda.com" : process.env.AS_EMAIL)
-	// Auth Server username password
-	,aspassword: (process.env.AS_PASSWORD === undefined ? "STSAuthServiceUserPassword" : process.env.AS_PASSWORD)
-	// Auth Server username password file
-	,aspasswordfile: process.env.AS_PASSWORD_FILE
-
-	// Auth Server client ID. Used for oauth2 client credentials flow.
-	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/client-credentials-flow
-	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-client-credentials-flow
+	// STS Auth Server client ID. Used for oauth2 client credentials flow.
 	,asclientid: process.env.AS_CLIENT_ID
-	// Auth Server client ID file. Used for oauth2 client credentials flow.
+	// STS Auth Server client ID file. Used for oauth2 client credentials flow.
 	,asclientidfile: process.env.AS_CLIENT_ID_FILE
-	// Auth Server client secret file. Used for oauth2 client credentials flow.
-	,asclientsecretfile: process.env.AS_CLIENT_SECRET_PASSWORD_FILE
-
+	// STS Auth Server client secret. Used for oauth2 client credentials flow.
+	,asclientsecret: process.env.AS_CLIENT_SECRET
+	// STS Auth Server client secret file. Used for oauth2 client credentials flow.
+	,asclientsecretfile: process.env.AS_CLIENT_SECRET_FILE
 	// Auth Server - JWKS Public End Point.
 	,asjwksjsonpath: (process.env.AS_JWKS_JSON_PATH === undefined ? "/.well-known/jwks.json" : process.env.AS_JWKS_JSON_PATH)
-	// Auth Server - JWKS File Store. Auth server side private JWKS storage file.
-	,asjwksfilestore: (process.env.AS_JWKS_FILE_STORE === undefined ? "/run/secrets/jwks_store" : process.env.AS_JWKS_FILE_STORE)
 	// Auth Server - JWKS key rotation time (seconds).
-	,asjwkskeyrotationtime: (process.env.AS_JWKS_KEY_ROTATION_TIME === undefined ? 86400 : process.env.AS_JWKS_KEY_ROTATION_TIME) // 24 Hour default
+	,asjwkskeyrotationtime: (process.env.AS_JWKS_KEY_ROTATION_TIME === undefined ? 86400 : parseInt(process.env.AS_JWKS_KEY_ROTATION_TIME)) // 24 Hour default
 	// Auth Server - JWKS key purge time offset (seconds). Old keys (current keys are considered 'old' immediately after a key rotation) will be kept
 	// for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before purging from the JWKS.
-	,asjwkskeypurgetimeoffset: (process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET === undefined ? 300 : process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET) // 5 Minutes
+	,asjwkskeypurgetimeoffset: (process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET === undefined ? 300 : parseInt(process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET)) // 5 Minutes
 	// Auth Server - JWKS key count. Defines the number of active keys within the JWKS. Note that the actual key count may be double this value as current
 	// keys are rotated to old keys prior to old key purge. Old keys will be kept for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before removal from the JWKS.
 	// This is to ensure that any tokens signed by a current key that is then expired can still be validated within the life of the issued token.
-	,asjwkskeycount: (process.env.AS_JWKS_KEY_COUNT === undefined ? 4 : process.env.AS_JWKS_KEY_COUNT)
+	,asjwkskeycount: (process.env.AS_JWKS_KEY_COUNT === undefined ? 4 : parseInt(process.env.AS_JWKS_KEY_COUNT))
 	// Auth Server - JWKS Access token timeout.
-	,asaccesstokenexpire: (process.env.AS_ACCESS_TOKEN_EXPIRE === undefined ? 43200 : process.env.AS_ACCESS_TOKEN_EXPIRE) // 12 Hour default
-
+	,asaccesstokenexpire: (process.env.AS_ACCESS_TOKEN_EXPIRE === undefined ? 43200 : parseInt(process.env.AS_ACCESS_TOKEN_EXPIRE)) // 12 Hour default
 	// Auth Server - [DEPRECATED] Private Key (when using JWT)
 	,asprivatekeypath: (process.env.AS_PRIVATE_KEY_PATH === undefined ? "/var/lib/sts/stsglobalresources/keys/private.key" : process.env.AS_PRIVATE_KEY_PATH)
 	// Auth Server - [DEPRECATED] Public Key (when using JWT)
@@ -220,14 +211,14 @@ const defconfig =
 	,trservicename: (process.env.TR_SERVICE_NAME === undefined ? "STSRestRunner" : process.env.TR_SERVICE_NAME)
 	// STS Test Runner Service Version
 	,trserviceversion: (process.env.TR_SERVICE_VERSION === undefined ? "1.0.0" : process.env.TR_SERVICE_VERSION)
-	// STS Test Runner Credentials
-	// ----------------------------
-	// STS Test Runner username email
-	,tremail: (process.env.TR_EMAIL === undefined ? "STSTestRunnerServiceUser@stsmda.com" : process.env.TR_EMAIL)
-	// STS Test Runner password
-	,trpassword: (process.env.TR_PASSWORD === undefined ? "STSTestRunnerServiceUserPassword" : process.env.TR_PASSWORD)
-	// STS Test Runner password file
-	,trpasswordfile: process.env.TR_PASSWORD_FILE
+	// STS Test Runner Server client ID. Used for oauth2 client credentials flow.
+	,trclientid: process.env.TR_CLIENT_ID
+	// STS Test Runner Server client ID file. Used for oauth2 client credentials flow.
+	,trclientidfile: process.env.TR_CLIENT_ID_FILE
+	// STS Test Runner Server client secret. Used for oauth2 client credentials flow.
+	,trclientsecret: process.env.TR_CLIENT_SECRET
+	// STS Test Runner Server client secret file. Used for oauth2 client credentials flow.
+	,trclientsecretfile: process.env.TR_CLIENT_SECRET_FILE
 
 	// Duration (in ms) between each publish event.
 	,publishinterval: (process.env.PUBLISH_INTERVAL === undefined ? 1000 : parseInt(process.env.PUBLISH_INTERVAL))
@@ -334,7 +325,7 @@ const defconfig =
 	*/
 }
 
-const ReadPasswordFile = (passwordFile) => {
+const ReadFile = (passwordFile) => {
 	try {
 		accessSync(passwordFile, constants.R_OK);
 		const data = readFileSync(passwordFile, 'utf8');
@@ -347,36 +338,32 @@ const ReadPasswordFile = (passwordFile) => {
 }
 
 // File based configuration settings. If a file is specified for a setting, this will be used. The non file version (if specified) will be ignored.
-
-// Database password file
-if (defconfig.dbpasswordfile !== undefined) {
-	defconfig.dbpassword = ReadPasswordFile(defconfig.dbpasswordfile);
-}
-
-// Auth Server username password file
-if (defconfig.aspasswordfile !== undefined) {
-	defconfig.aspassword = ReadPasswordFile(defconfig.aspasswordfile);
-}
-
-// STSREST01 Server username password file
-if (defconfig.rest01passwordfile !== undefined) {
-	defconfig.rest01password = ReadPasswordFile(defconfig.rest01passwordfile);
-}
-
-// STS Test Runner password file
-if (defconfig.trpasswordfile !== undefined) {
-	defconfig.trpassword = ReadPasswordFile(defconfig.trpasswordfile);
-}
-
-// STS Test Orchestrator Service username password file
-if (defconfig.topasswordfile !== undefined) {
-	defconfig.topassword = ReadPasswordFile(defconfig.topasswordfile);
-}
-
-// STS Instrument Manager Service username password file
-if (defconfig.impasswordfile !== undefined) {
-	defconfig.impassword = ReadPasswordFile(defconfig.impasswordfile);
-}
+const fileconfig = [
+	{ fileprop: 'dbpasswordfile', prop: 'dbpassword' },
+	// API identifier file processing
+	{ fileprop: 'asapiidentifierfile', prop: 'asapiidentifier' },
+	{ fileprop: 'rest01apiidentifierfile', prop: 'rest01apiidentifier' },
+	{ fileprop: 'toapiidentifierfile', prop: 'toapiidentifier' },
+	{ fileprop: 'imapiidentifierfile', prop: 'imapiidentifier' },
+	// Client ID file processing
+	{ fileprop: 'asclientidfile', prop: 'asclientid' },
+	{ fileprop: 'rest01clientidfile', prop: 'rest01clientid' },
+	{ fileprop: 'toclientidfile', prop: 'toclientid' },
+	{ fileprop: 'imclientidfile', prop: 'imclientid' },
+	{ fileprop: 'trclientidfile', prop: 'trclientid' },
+	// Client secret file processing
+	{ fileprop: 'asclientsecretfile', prop: 'asclientsecret' },
+	{ fileprop: 'rest01clientsecretfile', prop: 'rest01clientsecret' },
+	{ fileprop: 'toclientsecretfile', prop: 'toclientsecret' },
+	{ fileprop: 'imclientsecretfile', prop: 'imclientsecret' },
+	{ fileprop: 'trclientsecretfile', prop: 'trclientsecret' },
+]
+
+fileconfig.forEach((v) => {
+	if (defconfig[v.fileprop] !== undefined) {
+		defconfig[v.prop] = ReadFile(defconfig[v.fileprop]);
+	}
+});
 
 // Preference order is YAML file then .env file
 const $options = {

package/testapiidentifierFile

@@ -0,0 +1 @@
+testapiidentifierfilecontents

package/testclientidfile

@@ -0,0 +1 @@
+testclientidfilecontents

package/testclientsecretfile

@@ -0,0 +1 @@
+testclientsecretfilecontents