@nsshunt/stsdatamanagement 1.10.3 → 1.11.0

package/blcauth.js

@@ -152,11 +152,32 @@ class BLCAuth
 		}
 	}
 
+	#ValidateApplication = async (apiPermissions, app) => {
+		const { clientId, clientName, permissions } = app;
+
+		let applicationResource = null;
+		try {
+			applicationResource = await this.GetApplication(clientId)
+		} catch (error) {
+			return { status: status.notfound , error: 'Cannot find client application.', detail: { message: error.message }};
+		}
+		if (applicationResource.clientName.localeCompare(clientName) !== 0) {
+			return { status: status.error, error: 'clientName mismatch.', detail: { message: `clientName mismatch: Value: [${clientName}], Expecting: [${applicationResource.clientName}]` }};
+		}
+		for (let j=0; j < permissions.length; j++) {
+			const permission = permissions[j];
+			if (!apiPermissions.includes(permission)) {
+				return { status: status.error, error: 'M2M permission not found within API available permission list.', detail: { message: `Permission not found within API available permission list: [${permission}]` }};
+			}
+		}
+		return null;
+	}
+
 	async AddAPI(api)
 	{
 		try 
 		{
-			const { M2MApplications, permissions, identifier } = api;
+			const { M2MApplications, apiPermissions, identifier, SPA } = api;
 			let APIidentifier = BLCAuth.API_ID_PREFIX + identifier;
 			let existingAPI = await this.#accessLayer.getLatestResource(APIidentifier);
 			if (existingAPI.status === 200) {
@@ -164,26 +185,26 @@ class BLCAuth
 			}
 
 			// Validate M2MApplications
-			for (let i=0; i < M2MApplications.length; i++) {
-				const m2mapplication = M2MApplications[i];
-				let appid = BLCAuth.APPLICATION_ID_PREFIX + m2mapplication.clientId;
-				let retVal = await this.#accessLayer.getLatestResource(appid);
-				if (retVal.status !== 200) {
-					return { status: status.notfound , error: 'Cannot find client application.', detail: { message: `Cannot find client application: [${appid}].` }};
-				}
-				let applicationResource = JSON.parse(retVal.detail.resdesc);
-				if (applicationResource.clientName.localeCompare(m2mapplication.clientName) !== 0) {
-					return { status: status.error, error: 'clientName mismatch.', detail: { message: `clientName mismatch: Value: [${m2mapplication.clientName}], Expecting: [${applicationResource.clientName}]` }};
+			if (M2MApplications) {
+				for (let i=0; i < M2MApplications.length; i++) {
+					let retVal = await this.#ValidateApplication(apiPermissions, M2MApplications[i]);
+					if (retVal !== null) {
+						return retVal;
+					}
 				}
-				for (let j=0; j < m2mapplication.permissions.length; j++) {
-					const permission = m2mapplication.permissions[j];
-					if (!permissions.includes(permission)) {
-						return { status: status.error, error: 'M2M permission not found within API available permission list.', detail: { message: `M2M permission not found within API available permission list: [${permission}]` }};
+			}
+
+			// Validate SPA
+			if (SPA) {
+				for (let i=0; i < SPA.length; i++) {
+					let retVal = await this.#ValidateApplication(apiPermissions, SPA[i]);
+					if (retVal !== null) {
+						return retVal;
 					}
 				}
 			}
-	
-			// Client Secret is not returned. Seperate function used to display this field.
+			
+			// Client Secret is not returned. Separate function used to display this field.
 			let payload = 
 			{
 				APIidentifier: APIidentifier,
@@ -204,18 +225,20 @@ class BLCAuth
 		let clientIdentifier = BLCAuth.APPLICATION_ID_PREFIX + clientId;
 		let application = await this.#accessLayer.getLatestResource(clientIdentifier);
 		if (application.status !== 200) {
-			return { status: status.notfound, error: 'Application not found.', detail: { message: `Application not found: [${clientId}]` }};
+			throw new Error(`Application not found: [${clientId}]`);
 		}
-		return application;
+		let applicationResource = JSON.parse(application.detail.resdesc);
+		return applicationResource;
 	}
 
 	async GetAPI(identifier) {
 		let APIidentifier = BLCAuth.API_ID_PREFIX + identifier;
 		let api = await this.#accessLayer.getLatestResource(APIidentifier);
 		if (api.status !== 200) {
-			return { status: status.notfound, error: 'API not found.', detail: { message: `API not found: [${identifier}]` }};
+			throw new Error(`API not found: [${identifier}]`);
 		}
-		return api;
+		let apiResource = JSON.parse(api.detail.resdesc);
+		return apiResource;
 	}
 }
 

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@nsshunt/stsdatamanagement",
-  "version": "1.10.3",
+  "version": "1.11.0",
   "description": "STS Data Management Modules, Utilities and Services",
   "main": "dbaccess.js",
   "dependencies": {
-    "@nsshunt/stsconfig": "^1.19.0",
+    "@nsshunt/stsconfig": "^1.20.0",
     "@nsshunt/stsinstrumentation": "^6.4.3",
-    "@nsshunt/stsutils": "^1.7.6",
+    "@nsshunt/stsutils": "^1.8.5",
     "axios": "^0.26.0",
     "bcryptjs": "^2.4.3",
     "cli-progress": "^3.10.0",
     "colors": "^1.4.0",
     "debug": "^4.3.4",
-    "ioredis": "^4.28.5",
+    "ioredis": "^5.0.3",
     "pg": "^8.7.3",
     "pg-copy-streams": "^6.0.2",
     "prompts": "^2.4.2",
@@ -31,7 +31,7 @@
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-private-methods": "^7.16.11",
-    "eslint": "^8.11.0",
+    "eslint": "^8.12.0",
     "jest": "^27.5.1"
   },
   "scripts": {

package/pgaccesslayer.js

@@ -332,6 +332,19 @@ class PGAccessLayer
     	}
 	}
 
+	async deleteLatestResource(userid, resid)
+	{
+		const fname = 'deleteLatestResource';
+    	let retVal = await this.getLatestResource(resid);
+    	if (retVal.status !== status.success)
+    	{
+			return { status: retVal.status, error: `[${fname}]: Operation was not successful: [${resid}]`, detail: retVal };
+    	} else {
+    		let vnum = retVal.detail.vnum;
+    		await this.deleteResource(userid, resid, vnum);
+    	}
+	}
+
 	async deleteResource(userid, resourceid, resourcevnum)
 	{
     	const fname = 'deleteResource';