retold-harness 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-harness",
-    "version": "1.1.3",
+    "version": "1.1.5",
     "description": "Restful API harness.  Serves on 8086.",
     "main": "source/Retold-Harness.js",
     "bin": {
@@ -48,6 +48,7 @@
         "pict-application": "^1.0.33",
         "pict-terminalui": "^0.0.3",
         "pict-view": "^1.0.67",
+        "orator-authentication": "file:../../orator/orator-authentication",
         "retold-data-service": "^2.0.19"
     },
     "devDependencies": {

package/source/providers/Retold-Harness-Service-MeadowProviderConfigurator.js

@@ -146,7 +146,8 @@ class RetoldHarnessMeadowProviderConfigurator extends libFableServiceProviderBas
 	 */
 	serveWebUI(fCallback)
 	{
-		let tmpWebUIPath = libPath.join(__dirname, '..', 'web', 'index.html');
+		let tmpWebFolder = libPath.join(__dirname, '..', 'web');
+		let tmpWebUIPath = libPath.join(tmpWebFolder, 'index.html');
 
 		if (!libFS.existsSync(tmpWebUIPath))
 		{
@@ -156,6 +157,7 @@ class RetoldHarnessMeadowProviderConfigurator extends libFableServiceProviderBas
 
 		let tmpWebUIHTML = libFS.readFileSync(tmpWebUIPath, 'utf8');
 
+		// Serve index.html at the root URL
 		this.fable.OratorServiceServer.server.get('/',
 			(pRequest, pResponse, fNext) =>
 			{
@@ -164,6 +166,51 @@ class RetoldHarnessMeadowProviderConfigurator extends libFableServiceProviderBas
 				return fNext();
 			});
 
+		// Serve static files (JS, CSS, etc.) from the web folder.
+		// Files are served at their plain filename, e.g. /pict.js → source/web/pict.js.
+		// This route is registered after all API routes, so API endpoints take priority.
+		let tmpMimeTypes =
+		{
+			'.js': 'application/javascript',
+			'.css': 'text/css',
+			'.html': 'text/html',
+			'.json': 'application/json',
+			'.map': 'application/json',
+			'.png': 'image/png',
+			'.jpg': 'image/jpeg',
+			'.svg': 'image/svg+xml',
+			'.ico': 'image/x-icon'
+		};
+
+		this.fable.OratorServiceServer.server.get('/:filename',
+			(pRequest, pResponse, fNext) =>
+			{
+				let tmpRequestedFile = pRequest.params.filename;
+
+				// Only serve files with recognized extensions
+				let tmpExt = libPath.extname(tmpRequestedFile).toLowerCase();
+				if (!tmpMimeTypes[tmpExt])
+				{
+					return fNext();
+				}
+
+				// Prevent directory traversal
+				let tmpSafeName = libPath.basename(tmpRequestedFile);
+				let tmpFilePath = libPath.join(tmpWebFolder, tmpSafeName);
+
+				if (!libFS.existsSync(tmpFilePath) || !libFS.statSync(tmpFilePath).isFile())
+				{
+					return fNext();
+				}
+
+				let tmpContentType = tmpMimeTypes[tmpExt];
+				let tmpFileContent = libFS.readFileSync(tmpFilePath);
+
+				pResponse.writeHead(200, { 'Content-Type': tmpContentType });
+				pResponse.end(tmpFileContent);
+				return fNext();
+			});
+
 		return fCallback();
 	}
 
@@ -189,6 +236,7 @@ class RetoldHarnessMeadowProviderConfigurator extends libFableServiceProviderBas
 				let tmpPort = this.fable.settings.APIServerPort || 8086;
 				this.log.info(`Retold Harness running on port ${tmpPort}`);
 				this.log.info(`Web UI available at http://localhost:${tmpPort}/`);
+				this.log.info(`Authentication:  http://localhost:${tmpPort}/1.0/Authenticate/{user}/{pass}`);
 				return fStepComplete();
 			});
 

package/source/schemas/Retold-Harness-Service-Schema-Bookstore.js

@@ -98,6 +98,96 @@ class RetoldHarnessSchemaBookstore extends libRetoldHarnessSchemaProvider
 	{
 		let tmpFable = this.fable;
 
+		// --- Enable body parsing for POST routes ---
+		if (tmpFable.OratorServiceServer && typeof tmpFable.OratorServiceServer.bodyParser === 'function')
+		{
+			tmpFable.OratorServiceServer.server.use(tmpFable.OratorServiceServer.bodyParser());
+		}
+
+		// --- Authentication Setup ---
+		let libOratorAuthentication = require('orator-authentication');
+
+		tmpFable.serviceManager.addServiceType('OratorAuthentication', libOratorAuthentication);
+		tmpFable.serviceManager.instantiateServiceProvider('OratorAuthentication',
+			{
+				DeniedPasswords: ['abc', 'badpassword', '111']
+			});
+
+		// Plug in a fake authenticator that accepts any existing User by LoginID.
+		// Password is ignored — the only failures come from the denied list or
+		// a LoginID that doesn't exist in the database.
+		tmpFable.OratorAuthentication.setAuthenticator(
+			(pUsername, pPassword, fAuthCallback) =>
+			{
+				if (!tmpFable.DAL || !tmpFable.DAL.User)
+				{
+					tmpFable.log.warn('BookStore authenticator: DAL.User not available, allowing login with stub record.');
+					return fAuthCallback(null, { LoginID: pUsername, IDUser: 0 });
+				}
+
+				let tmpQuery = tmpFable.DAL.User.query.addFilter('LoginID', pUsername);
+				tmpFable.DAL.User.doRead(tmpQuery,
+					(pReadError, pReadQuery, pUserRecord) =>
+					{
+						if (pReadError)
+						{
+							tmpFable.log.error(`BookStore authenticator error: ${pReadError}`);
+							return fAuthCallback(pReadError, null);
+						}
+
+						if (!pUserRecord || !pUserRecord.IDUser || pUserRecord.IDUser < 1)
+						{
+							tmpFable.log.info(`BookStore authenticator: User [${pUsername}] not found.`);
+							return fAuthCallback(null, null);
+						}
+
+						tmpFable.log.info(`BookStore authenticator: User [${pUsername}] found (IDUser ${pUserRecord.IDUser}).`);
+						return fAuthCallback(null, pUserRecord);
+					});
+			});
+
+		tmpFable.OratorAuthentication.connectRoutes();
+		this.log.info('BookStore authentication routes registered.');
+
+		// --- Demo-Only Endpoint: list valid LoginIDs without requiring auth ---
+		// This bypasses Meadow's authorization so the web UI can show a
+		// convenient user picker.  Not something you would do in production!
+		tmpFable.Orator.serviceServer.get('/1.0/Demo/Users',
+			(pRequest, pResponse, fNext) =>
+			{
+				if (!tmpFable.DAL || !tmpFable.DAL.User)
+				{
+					pResponse.send({ Users: [] });
+					return fNext();
+				}
+
+				let tmpQuery = tmpFable.DAL.User.query;
+				tmpFable.DAL.User.doReads(tmpQuery,
+					(pReadError, pReadQuery, pUserRecords) =>
+					{
+						if (pReadError || !pUserRecords)
+						{
+							pResponse.send({ Users: [] });
+							return fNext();
+						}
+
+						let tmpUsers = [];
+						for (let i = 0; i < pUserRecords.length; i++)
+						{
+							tmpUsers.push(
+								{
+									IDUser: pUserRecords[i].IDUser,
+									LoginID: pUserRecords[i].LoginID,
+									FullName: pUserRecords[i].FullName || ''
+								});
+						}
+
+						pResponse.send({ Users: tmpUsers });
+						return fNext();
+					});
+			});
+		this.log.info('BookStore demo user list endpoint registered at /1.0/Demo/Users');
+
 		if (!tmpFable.MeadowEndpoints || !tmpFable.MeadowEndpoints.Book)
 		{
 			this.log.warn('BookStore applyBehaviors: MeadowEndpoints.Book not available, skipping author enrichment behavior.');