@nsshunt/stsdatamanagement 1.8.0 → 1.10.0

package/blcauth.js

@@ -5,6 +5,7 @@ class BLCAuth
 {
 	static SYSTEM_USER_ID = "STS_SYSTEM";
 	static USER_ID_PREFIX = "USR_";
+	static ROLE_ID_PREFIX = "ROLE_";
 
 	#accessLayer = null;
 
@@ -14,17 +15,15 @@ class BLCAuth
 	}
 
 	// Normally, register would be provided by a hardened dedicated authentication server.
-	async registeruser(user)
+	async AddUser(user)
 	{
-		let { name, password, email } = user;
+		let { name, password, email, roles } = user;
 		const saltRounds = 10;
 		try 
 		{
 			let userid = BLCAuth.USER_ID_PREFIX + email;
 			let existingUser = await this.#accessLayer.getLatestResource(userid);
-			if (existingUser.status === 200)
-			{
-				//@@ should throw exception here
+			if (existingUser.status === 200) {
 				return { status: status.conflict, error: 'User already exists.', detail: { message: 'User already exists.' }};
 			}
 			
@@ -35,14 +34,17 @@ class BLCAuth
 				,name: name
 				,email: email
 				,hash: hashedPassword
+				,roles: roles
 			};
 
 			await this.#accessLayer.saveResource(BLCAuth.SYSTEM_USER_ID, user.id, user);
 
 			let payload = 
 			{
-				name: user.name
-				,email: user.email
+				id: userid
+				,name: name
+				,email: email
+				,roles: roles
 			}
 
 			return { status: status.success, detail: payload };
@@ -52,6 +54,71 @@ class BLCAuth
 			throw new Error({ status: status.error, error: 'Operation was not successful', detail: error });
 		}
 	}
+
+	async AddRolePermissions(rolePermissions)
+	{
+		try 
+		{
+			const { name, permissions } = rolePermissions;
+			let roleId = BLCAuth.ROLE_ID_PREFIX + name;
+			let existingRole = await this.#accessLayer.getLatestResource(roleId);
+			if (existingRole.status === 200) {
+				return { status: status.conflict, error: 'Role already exists.', detail: { message: 'Role already exists.' }};
+			}
+
+			let roleResource = {
+				id: roleId,
+				name: name,
+				permissions: permissions
+			}
+
+			await this.#accessLayer.saveResource(BLCAuth.SYSTEM_USER_ID, roleId, roleResource);
+
+			return { status: status.success, detail: roleResource };
+		} catch (error)
+		{
+			console.error(error);
+			throw new Error({ status: status.error, error: 'Operation was not successful', detail: error });
+		}
+	}
+
+	async GetUserPermissions(email)
+	{
+		try 
+		{
+			let userid = BLCAuth.USER_ID_PREFIX + email;
+			let existingUser = await this.#accessLayer.getLatestResource(userid);
+			if (existingUser.status !== 200) {
+				return { status: status.notfound, error: 'User not found.', detail: { message: 'User not found.' }};
+			}
+
+			let userResource = JSON.parse(existingUser.detail.resdesc);
+
+			let permissions = [ ];
+
+			for (let i=0; i < userResource.roles.length; i++) {
+				let role = userResource.roles[i];
+				let roleId = BLCAuth.ROLE_ID_PREFIX + role;
+				let existingRole = await this.#accessLayer.getLatestResource(roleId);
+				if (existingRole.status !== 200) {
+					return { status: status.notfound, error: 'Role not found.', detail: { message: 'Role not found.' }};
+				}
+				let roleResource = JSON.parse(existingRole.detail.resdesc);
+				for (let j=0; j < roleResource.permissions.length; j++) {
+					let permission = roleResource.permissions[j];
+					if (!permissions.includes(permission)) {
+						permissions.push(permission);
+					}
+				}
+			}
+
+			return { status: status.success, detail: permissions };
+		} catch (error)
+		{
+			console.error(error);
+			throw new Error({ status: status.error, error: 'Operation was not successful', detail: error });
+		}
+	}
 }
 
 module.exports = { BLCAuth };

package/databaseutils.js

@@ -1,7 +1,9 @@
 const prompts = require('prompts');
-const goptions = require('@nsshunt/stsconfig').$options;
+const fs = require('fs');
 require('colors');
 
+const goptions = require('@nsshunt/stsconfig').$options;
+
 const { PGPoolManager } = require('./pgpoolmanager');
 const { PGAccessLayer } = require('./pgaccesslayer');
 const { PGUtils } = require('./pgutils');
@@ -27,7 +29,7 @@ class DatabaseUtils
 		let ns = `proc:${process.pid}:DatabaseUtils`; // namespace for debug
 		let debug = require('debug')(ns);
 		let fname = 'createfreshdatabase';
-		const { start, entries, minextradata, maxextradata, user } = options;
+		const { start, entries, minextradata, maxextradata } = options;
 		let builddbscript = goptions.databasescriptfolder + '/builddb.sql'
 		debug(`Database Build Script: [${builddbscript}]`.yellow);
 
@@ -62,10 +64,41 @@ class DatabaseUtils
 
 			const blcauth = new BLCAuth(localAccesslayer);
 
-			// Now register a new K6 test user
-			debug(`Registering test users.`.yellow);
-			let retVal = await blcauth.registeruser(user);
-			console.log(`User registered: ${JSON.stringify(retVal)}`);
+			/*
+			debug(`Registering Users.`.yellow);
+			console.log(`Registering Users.`.yellow);
+			const userFile = goptions.databasescriptfolder + '/users.json'
+			let rawdata = fs.readFileSync(userFile);
+			let users = JSON.parse(rawdata);
+			for (const [, user] of Object.entries(users)) {
+				let retVal = await blcauth.registeruser(user);
+				console.log(`User registered: ${JSON.stringify(retVal)}`);
+			}
+			*/
+
+			debug(`Registering Users and Roles.`.yellow);
+			console.log(`Registering Users and Roles.`.yellow);
+			const roleFile = goptions.databasescriptfolder + '/user-role.json'
+			let rawdata = fs.readFileSync(roleFile);
+			let userroles = JSON.parse(rawdata);
+			for (const [, user] of Object.entries(userroles)) {
+				let retVal = await blcauth.AddUser(user);
+				console.log(`Role registered: ${JSON.stringify(retVal)}`);
+			}
+
+			debug(`Registering Roles and Role Permissions.`.yellow);
+			console.log(`Registering Roles and Role Permissions.`.yellow);
+			const rolePermissionFile = goptions.databasescriptfolder + '/role-permission.json'
+			rawdata = fs.readFileSync(rolePermissionFile);
+			let rolePermissions = JSON.parse(rawdata);
+			for (const [, rolePermission] of Object.entries(rolePermissions)) {
+				let retVal = await blcauth.AddRolePermissions(rolePermission);
+				console.log(`Role Permission registered: ${JSON.stringify(retVal)}`);
+			}
+
+			let retVal = await blcauth.GetUserPermissions('STSREST01ServiceUser@stsmda.com');
+			console.log(`User Permissions: ${JSON.stringify(retVal)}`);
+			
 
 			localAccesslayer.enddatabase();
 			debug(`Database successfully initiailized.`.green);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nsshunt/stsdatamanagement",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "STS Data Management Modules, Utilities and Services",
   "main": "dbaccess.js",
   "dependencies": {
-    "@nsshunt/stsconfig": "^1.9.0",
-    "@nsshunt/stsinstrumentation": "^6.4.0",
-    "@nsshunt/stsutils": "^1.7.0",
-    "axios": "^0.25.0",
+    "@nsshunt/stsconfig": "^1.14.0",
+    "@nsshunt/stsinstrumentation": "^6.4.2",
+    "@nsshunt/stsutils": "^1.7.3",
+    "axios": "^0.26.0",
     "bcryptjs": "^2.4.3",
     "cli-progress": "^3.10.0",
     "colors": "^1.4.0",
@@ -27,11 +27,11 @@
     "parser": "@babel/eslint-parser"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.2",
+    "@babel/core": "^7.17.5",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-private-methods": "^7.16.11",
-    "eslint": "^8.8.0",
+    "eslint": "^8.10.0",
     "jest": "^27.5.1"
   },
   "scripts": {

package/pgaccesslayer.js

@@ -154,7 +154,7 @@ class PGAccessLayer
     		try {
     			const { rows } = await client.query(createQuery);
     			const dbResponse = rows[0];
-    			return { status: status.created, detail: dbResponse };
+    			return { status: status.success, detail: dbResponse };
     		} catch (error) {
     			return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error }; // Set default
     		} finally {