daveappserver 0.5.51 → 0.5.54

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.5.51", myProductName = "daveAppServer";  
+var myVersion = "0.5.54", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -1012,6 +1012,16 @@ function startup (options, callback) {
 			}
 		function returnServerHomePage () {
 			function servePage (templatetext) {
+				
+				function arrayToParam (theArray) { //7/21/22 by DW
+					if (theArray === undefined) {
+						return (undefined);
+						}
+					else {
+						return (JSON.stringify (theArray));
+						}
+					}
+				
 				var pagetable = {
 					productName: config.productName, 
 					productNameForDisplay: config.productNameForDisplay, 
@@ -1021,8 +1031,7 @@ function startup (options, callback) {
 					flEnableLogin: config.flEnableLogin,
 					prefsPath: config.prefsPath,
 					docsPath: config.docsPath,
-					idGitHubClient: config.githubClientId, //11/9/21 by DW
-					whitelist: config.whitelist //7/21/22 by DW
+					idGitHubClient: config.githubClientId //11/9/21 by DW
 					};
 				if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
 					for (var x in theRequest.addToPagetable) {
@@ -1030,10 +1039,21 @@ function startup (options, callback) {
 						}
 					}
 				if (config.addMacroToPagetable !== undefined) {
-					config.addMacroToPagetable (pagetable);
+					config.addMacroToPagetable (pagetable, theRequest); //8/10/22 by DW
+					}
+				
+				function replaceAllAndReturnHtml () {
+					var pagetext = utils.multipleReplaceAll (templatetext.toString (), pagetable, false, "[%", "%]");
+					returnHtml (pagetext);
+					}
+				if (config.asyncAddMacroToPagetable !== undefined) { //8/10/22 by DW
+					config.asyncAddMacroToPagetable (pagetable, theRequest, function () {
+						replaceAllAndReturnHtml ();
+						});
+					}
+				else {
+					replaceAllAndReturnHtml ();
 					}
-				var pagetext = utils.multipleReplaceAll (templatetext.toString (), pagetable, false, "[%", "%]");
-				returnHtml (pagetext);
 				}
 			if (config.pathServerHomePageSource !== undefined) {
 				fs.readFile (config.pathServerHomePageSource, function (err, templatetext) {
@@ -1221,6 +1241,19 @@ function startup (options, callback) {
 							getGithubUserInfo (params.username, params.accessToken, httpReturn);
 							});
 						return (true); 
+					case "/useriswhitelisted": //7/21/22 by DW
+						callWithScreenname (function (screenname) {
+							var flWhitelisted = false;
+							if (config.whitelist === undefined) {
+								flWhitelisted = true;
+								}
+							else {
+								flWhitelisted = config.whitelist.includes (screenname);
+								}
+							console.log ("/useriswhitelisted: screenname == " + screenname + ", flWhitelisted == " + flWhitelisted);
+							returnData ({flWhitelisted});
+							});
+						return (true); 
 					
 					}
 				break;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.5.51",
+	"version": "0.5.54",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",