daveappserver 0.7.8 → 0.7.10

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.7.8", myProductName = "daveAppServer";   
+var myVersion = "0.7.10", myProductName = "daveAppServer";   
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -71,11 +71,22 @@ var config = {
 	
 	flUseDatabaseForConfirmations: false, //8/14/23 by DW
 	
-	isUserInDatabase: function (screenname, callback) { //2/6/23 by DW
+	flAllowWordpressIdentity: true, //10/31/23 by DW
+	
+	flEnableSupervisorMode: false, //11/3/23 by DW
+	
+	findUserWithScreenname: function (screenname, callback) { //2/6/23 by DW
+		callback (false);
+		},
+	findUserWithEmail: function (emailaddress, callback) { //11/4/23 by DW
 		callback (false);
 		},
 	getScreenNameFromEmail: function (screenname, callback) { //2/7/23 by DW
 		callback (undefined, screenname);
+		},
+	
+	isUserAdmin: function (emailaddress, callback) { //11/3/23 by DW
+		callback (false);
 		}
 	};
 const fnameConfig = "config.json";
@@ -90,7 +101,6 @@ var stats = {
 	};
 const fnameStats = "stats.json";
 
-
 function userIsWhitelisted (screenname, callback) { //9/16/22 by DW
 	fs.readFile (fnameConfig, function (err, jsontext) {
 		var flWhitelisted = false; 
@@ -382,7 +392,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 							}
 						else {
 							var emailAddress = words [1], emailSecret = words [2];
-							config.isUserInDatabase (emailAddress, function (flInDatabase, userRec) {
+							config.findUserWithEmail (emailAddress, function (flInDatabase, userRec) {
 								if (flInDatabase) {
 									conn.appData.emailAddress = userRec.emailAddress;
 									conn.appData.screenname = userRec.emailAddress;
@@ -1172,7 +1182,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 					callback ({message});
 					}
 				else {
-					config.isUserInDatabase (screenname, function (flInDatabase) {
+					config.findUserWithScreenname (screenname, function (flInDatabase) {
 						if (flInDatabase) {
 							const message = "Can't create the user \"" + screenname + "\" because there already is a user with that name."
 							callback ({message});
@@ -1299,9 +1309,14 @@ function cleanFileStats (stats) { //4/19/21 by DW
 					}
 				});
 			}
-		const options = {
-			useWordpressAccount
-			};
+		
+		var options = undefined;
+		if (config.flAllowWordpressIdentity) {
+			options = {
+				useWordpressAccount
+				};
+			}
+		
 		const flHandled = wordpress.handleHttpRequest (theRequest, options);
 		return (flHandled);
 		}
@@ -1532,6 +1547,40 @@ function startup (options, callback) {
 				}
 			}
 		function callWithScreenname (callback) {
+			
+			function actingAsFilter (email, callback) { //11/3/23 by DW
+				if (config.flEnableSupervisorMode) {
+					if (params.actingas === undefined) {
+						callback (email);
+						}
+					else {
+						config.isUserAdmin (email, function (flAdmin, userRec) {
+							if (flAdmin) {
+								config.findUserWithScreenname (params.actingas, function (flInDatabase, userRec) {
+									if (flInDatabase) {
+										if (userRec.emailAddress === undefined) {
+											callback (email);
+											}
+										else {
+											callback (userRec.emailAddress);
+											}
+										}
+									else {
+										callback (email); 
+										}
+									});
+								}
+							else {
+								callback (email);
+								}
+							});
+						}
+					}
+				else {
+					callback (email);
+					}
+				}
+			
 			if (config.flUseTwitterIdentity) { //2/6/23 by DW
 				if (config.getScreenname === undefined) {
 					davetwitter.getScreenName (token, secret, function (screenname) {
@@ -1557,10 +1606,13 @@ function startup (options, callback) {
 			else {
 				if ((params.emailaddress !== undefined) && (params.emailcode !== undefined)) { 
 					const email = utils.stringLower (params.emailaddress); //3/8/23 by DW
-					config.isUserInDatabase (email, function (flInDatabase, userRec) {
+					config.findUserWithEmail (email, function (flInDatabase, userRec) {
 						if (flInDatabase) {
 							if (params.emailcode == userRec.emailSecret) {
-								callback (email);  
+								actingAsFilter (email, function (whoActingAs) {
+									console.log ("\nappserver: whoActingAs == " + whoActingAs + "\n");
+									callback (whoActingAs);  
+									});
 								}
 							else {
 								const message = "Can't do what you wanted the correct email authentication wasn't provided.";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.7.8",
+	"version": "0.7.10",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",
@@ -25,6 +25,6 @@
 		"daves3": "*",
 		"davehttp": "*",
 		"davemail": "*",
-		"wpidentity": "*"
+		"wpidentity": "^0.4.11"
 		}
 	}