@nsshunt/stsconfig 1.17.1 → 1.17.2

package/.env-default

@@ -104,7 +104,7 @@ AS_HOST_PORT=3002
 # Auth Server port (client port to access the service)
 AS_PORT=3002
 # Auth Server endpoint
-AS_APIROOT=/stsauth/v1
+AS_API_ROOT=/stsauth/v1
 # Auth Server Prometheus metric support
 AS_PROM_SUPPORT=true
 # Auth Prometheus Cluster Server port (port used for cluster prometheus scrapes)

package/.env-test-file-2

@@ -70,7 +70,7 @@ TO_CLIENT_SECRET_FILE=testclientsecretfile
 AS_ENDPOINT=http://localhost-c
 AS_HOST_PORT=30020
 AS_PORT=30020
-AS_APIROOT=/stsauth/v1-c
+AS_API_ROOT=/stsauth/v1-c
 AS_API_IDENTIFIER=xyz
 AS_API_IDENTIFIER_FILE=testapiidentifierFile
 AS_PROM_SUPPORT=false

package/package.json

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

package/stsconfig-01.test.js

@@ -122,14 +122,14 @@ describe("Test implicit config settings", () =>
 		expect(goptions.asendpoint).toEqual('http://localhost');
 		expect(goptions.ashostport).toEqual('3002');
 		expect(goptions.asport).toEqual('3002');
-		expect(goptions.asapiroot).toEqual('/stsauth/v1');
+		expect(goptions.asapiroot).toEqual('/stsauth/v1.0');
 		expect(goptions.asprometheussupport).toEqual(true);
 		expect(goptions.asprometheusclusterport).toEqual('3012');
 		expect(goptions.asservicename).toEqual('STSAuth');
 		expect(goptions.asserviceversion).toEqual('1.0.0');
 		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.asapiidentifier).toEqual('https://stsmda.com.au/stsauthapi/v1.0/');
 		expect(goptions.asapiidentifierfile).toEqual(undefined);
 		expect(goptions.asclientid).toEqual(undefined);
 		expect(goptions.asclientidfile).toEqual(undefined);

package/stsconfig-default.test.js

@@ -129,7 +129,7 @@ describe("Test explicit default config settings", () =>
 		expect(goptions.asserviceversion).toEqual('1.0.0');
 		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.asapiidentifier).toEqual('https://stsmda.com.au/stsauthapi/v1.0/');
 		expect(goptions.asapiidentifierfile).toEqual(undefined);
 		expect(goptions.asclientid).toEqual(undefined);
 		expect(goptions.asclientidfile).toEqual(undefined);

package/stsconfig.js

@@ -164,13 +164,23 @@ const defconfig =
 	// Auth Server port (client port to access the service)
 	,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).
-	,asoauthroot: (process.env.AS_OAUTHROOT === undefined ? "/oauth2/v2.0" : process.env.AS_OAUTHROOT)
-	// 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).
+	,asapiroot: (process.env.AS_API_ROOT === undefined ? "/stsauth/v1.0" : process.env.AS_API_ROOT)
+	// Auth Server API Identifier.
+	,asoauthapiroot: (process.env.AS_OAUTH_API_ROOT === undefined ? "/oauth2/v2.0" : process.env.AS_OAUTH_API_ROOT)
+	// Auth Server Admin API Identifier.
+	,asadminapiroot: (process.env.AS_ADMIN_API_ROOT === undefined ? "/admin/v1.0" : process.env.AS_ADMIN_API_ROOT)
+	// Auth Server API Identifier.
+	,asapiidentifier: (process.env.AS_API_IDENTIFIER === undefined ? 'https://stsmda.com.au/stsauthapi/v1.0/' : process.env.AS_API_IDENTIFIER)
+	// Auth Server API Identifier file.
 	,asapiidentifierfile: process.env.AS_API_IDENTIFIER_FILE
+	// Auth Server OAuth API Identifier.
+	,asoauthapiidentifier: (process.env.AS_OAUTH_API_IDENTIFIER === undefined ? 'https://stsmda.com.au/stsauthoauthapi/v2.0/' : process.env.AS_OAUTH_API_IDENTIFIER)
+	// Auth Server OAuth API Identifier file.
+	,asoauthapiidentifierfile: process.env.AS_OAUTH_API_IDENTIFIER_FILE
+	// Auth Server Administration API Identifier.
+	,asadminapiidentifier: (process.env.AS_ADMIN_API_IDENTIFIER === undefined ? 'https://stsmda.com.au/stsauthadminapi/v1.0/' : process.env.AS_ADMIN_API_IDENTIFIER)
+	// Auth Server Administration API Identifier file.
+	,asadminapiidentifierfile: process.env.AS_ADMIN_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)
@@ -340,7 +350,7 @@ const defconfig =
 	,tsjwkskeys: (process.env.TS_JWKS_KEYS === undefined ? 3 : parseInt(process.env.TS_JWKS_KEYS))
 
 	// File path for JWKS store data. This file will contain the public and private keys for the JWKS store.
-	,tsjwksstorepath: process.env.TS_JWKS_STORE_PATH
+	,tsjwksstorepath: (process.env.TS_JWKS_STORE_PATH === undefined ? "/var/lib/sts/stsglobalresources/.stsauthprivate/jwks-private.json" : process.env.TS_JWKS_STORE_PATH)
 	// File path for JWKS store path config setting (tsjwksstorepath). Use this config item with Docker/Kubernetes secrets.
 	,tsjwksstorepathfile: process.env.TS_JWKS_STORE_PATH_FILE
 	// File path for JWKS public store data. This file will contain only the public signing keys for the JWKS store.