daveappserver 0.6.9 → 0.6.11

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.9", myProductName = "daveAppServer";  
+var myVersion = "0.6.11", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -23,6 +23,7 @@ const folderToJson = require ("foldertojson");
 const zip = require ("davezip");
 const qs = require ("querystring");
 const mail = require ("davemail");
+const requireFromString = require ("require-from-string"); //2/10/23 by DW
 
 const whenStart = new Date ();
 
@@ -41,6 +42,7 @@ var config = {
 	flEnableLogin: true, //user can log in via twitter
 	blockedAddresses: [], 
 	flForceTwitterLogin: true,
+	flUseTwitterIdentity: false, //2/6/23 by DW
 	
 	flStorageEnabled: true,
 	privateFilesPath: "privateFiles/users/",
@@ -57,7 +59,16 @@ var config = {
 	operationToConfirm: "add your email address to your FeedLand user profile",
 	mailSender: "dave@scripting.com",
 	dataFolder: "data/",
-	confirmationExpiresAfter: 60 * 60 //emails expire after an hour
+	confirmationExpiresAfter: 60 * 60, //emails expire after an hour
+	
+	flSecureWebsocket: false, //2/8/23 by DW
+	
+	isUserInDatabase: function (screenname, callback) { //2/6/23 by DW
+		callback (false);
+		},
+	getScreenNameFromEmail: function (screenname, callback) { //2/7/23 by DW
+		callback (undefined, screenname);
+		}
 	};
 const fnameConfig = "config.json";
 
@@ -164,7 +175,7 @@ function checkPathForIllegalChars (path) {
 			return (false);
 			}
 		switch (ch) {
-			case "/": case "_": case "-": case ".":  case " ": case "*":
+			case "/": case "_": case "-": case ".":  case " ": case "*": case "@":
 				return (false);
 			}
 		return (true);
@@ -237,6 +248,10 @@ function cleanFileStats (stats) { //4/19/21 by DW
 //sockets
 	var theWsServer = undefined;
 	
+	function getWsProtocol () { //2/8/23 by DW
+		const protocol = (utils.getBoolean (config.flSecureWebsocket)) ? "wss://" : "ws://";
+		return (protocol);
+		}
 	function notifySocketSubscribers (verb, payload, flPayloadIsString, callbackToQualify) {
 		if (theWsServer !== undefined) {
 			var ctUpdates = 0, now = new Date (), ctTotalSockets = 0;
@@ -329,6 +344,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		
 		conn.on ("text", function (s) {
 			var words = s.split (" ");
+			console.log ("handleWebSocketConnection: s == " + s); //6/7/21 by DW
 			if (words.length > 1) { //new protocol as of 11/29/15 by DW
 				conn.appData.whenLastUpdate = now;
 				conn.appData.lastVerb = words [0];
@@ -934,7 +950,15 @@ function cleanFileStats (stats) { //4/19/21 by DW
 	function sendConfirmingEmail (email, screenname, flNewUser=false, callback) {
 		function getScreenname (callback) {
 			if (flNewUser) { //the caller had to provide it
-				callback (undefined, screenname);
+				config.isUserInDatabase (screenname, function (flInDatabase) {
+					if (flInDatabase) {
+						const message = "Can't create the user \"" + screenname + "\" because there already is a user with that name."
+						callback ({message});
+						}
+					else {
+						callback (undefined, screenname);
+						}
+					});
 				}
 			else { //we have to look it up
 				config.getScreenNameFromEmail (email, callback);
@@ -946,7 +970,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			else {
 				const magicString = utils.getRandomPassword (10);
-				const urlWebApp = "http://" + config.myDomain + "/";
+				const urlWebApp = config.urlServerForEmail; //2/6/23 by DW
 				console.log ("sendConfirmingEmail: email == " + email + ", urlWebApp == " + urlWebApp);
 				var obj = {
 					magicString: magicString,
@@ -991,7 +1015,8 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			});
 		}
 	function receiveConfirmation (emailConfirmCode, callback) {
-		const urlWebApp = "http://" + config.myDomain + "/";
+		const urlWebApp = config.urlServerForClient; //2/5/23 by DW
+		
 		var urlRedirect = undefined, flFoundConfirm = false;
 		function encode (s) {
 			return (encodeURIComponent (s));
@@ -1004,7 +1029,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 							urlRedirect = urlWebApp + "?failedLogin=true&message=" + encode (err.message); 
 							}
 						else {
-							urlRedirect = urlWebApp + "?emailconfirmed=true&email=" + item.email + "&code=" + encode (emailSecret) + "&screenname=" + encode (item.screenname);
+							urlRedirect = urlWebApp + "?emailconfirmed=true&email=" + encode (item.email) + "&code=" + encode (emailSecret) + "&screenname=" + encode (item.screenname);
 							item.flDeleted = true; 
 							}
 						callback (urlRedirect);
@@ -1059,6 +1084,26 @@ function startup (options, callback) {
 			callback ();
 			});
 		}
+	function readConfigJson (callback) { //2/8/23 by DW
+		fs.readFile ("config.js", function (err, scripttext) {
+			var flReadConfigJson = true;
+			if (!err) {
+				try {
+					var jstruct = requireFromString (scripttext);
+					for (var x in configJs) {
+						config [x] = jstruct [x];
+						}
+					flReadConfigJson = false;
+					callback ();
+					}
+				catch (err) {
+					}
+				}
+			if (flReadConfigJson) {
+				readConfig (fnameConfig, config, true, callback);
+				}
+			});
+		}
 	function startDavetwitter (httpRequestCallback) { //patch over a design problem in starting up davetwitter and davehttp -- 7/20/20 by DW 
 		if (config.twitter === undefined) {
 			config.twitter = new Object ();
@@ -1188,7 +1233,9 @@ function startup (options, callback) {
 					flEnableLogin: config.flEnableLogin,
 					prefsPath: config.prefsPath,
 					docsPath: config.docsPath,
-					idGitHubClient: config.githubClientId //11/9/21 by DW
+					flUseTwitterIdentity: config.flUseTwitterIdentity, //2/6/23 by DW
+					idGitHubClient: config.githubClientId, //11/9/21 by DW
+					flWebsocketEnabled: config.flWebsocketEnabled //2/8/23 by DW
 					};
 				if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
 					for (var x in theRequest.addToPagetable) {
@@ -1231,25 +1278,37 @@ function startup (options, callback) {
 				}
 			}
 		function callWithScreenname (callback) {
-			if (config.getScreenname === undefined) {
-				davetwitter.getScreenName (token, secret, function (screenname) {
-					if (screenname === undefined) {
-						returnError ({message: "Can't do the thing you want because the accessToken is not valid."});    
-						}
-					else {
-						callback (screenname);
-						}
-					});
+			
+			if (config.flUseTwitterIdentity) { //2/6/23 by DW
+				if (config.getScreenname === undefined) {
+					davetwitter.getScreenName (token, secret, function (screenname) {
+						if (screenname === undefined) {
+							returnError ({message: "Can't do the thing you want because the accessToken is not valid."});    
+							}
+						else {
+							callback (screenname);
+							}
+						});
+					}
+				else {
+					config.getScreenname (params, function (err, screenname) { //12/23/22 by DW
+						if (err) {
+							returnError (err);
+							}
+						else {
+							callback (screenname);
+							}
+						});
+					}
 				}
 			else {
-				config.getScreenname (params, function (err, screenname) { //12/23/22 by DW
-					if (err) {
-						returnError (err);
-						}
-					else {
-						callback (screenname);
-						}
-					});
+				if ((params.emailaddress !== undefined) && (params.emailcode !== undefined)) { 
+					callback (params.emailaddress);  //obviously we have to check if it's valid
+					}
+				else {
+					const message = "Can't do what you wanted because the call is missing email authentication.";
+					returnError ({message});
+					}
 				}
 			}
 		
@@ -1508,8 +1567,9 @@ function startup (options, callback) {
 			}
 		}
 	
+	
 	utils.copyScalars (options, config); //1/22/21 by DW
-	readConfig (fnameConfig, config, true, function () { //anything can be overridden by config.json
+	readConfigJson (function () { //readConfig (fnameConfig, config, true, function () { //anything can be overridden by config.json
 		readConfig (fnameStats, stats, false, function () {
 			if (process.env.PORT !== undefined) { //8/6/20 by DW
 				config.port = process.env.PORT;
@@ -1530,7 +1590,7 @@ function startup (options, callback) {
 					config.urlServerForClient = "http://" + config.myDomain + "/";
 					}
 				if (config.urlWebsocketServerForClient === undefined) { //1/30/23 by DW
-					config.urlWebsocketServerForClient = "ws://" + utils.stringNthField (config.myDomain, ":", 1) + ":" + config.websocketPort + "/";
+					config.urlWebsocketServerForClient = getWsProtocol () + utils.stringNthField (config.myDomain, ":", 1) + ":" + config.websocketPort + "/";
 					}
 				webSocketStartup (); 
 				setInterval (everySecond, 1000); 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.6.9",
+	"version": "0.6.11",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",
@@ -15,6 +15,7 @@
 		"querystring": "*",
 		"request": "*",
 		"nodejs-websocket": "*",
+		"require-from-string": "*",
 		"daveutils": "*",
 		"davefilesystem": "*",
 		"foldertojson": "*",