daveappserver 0.6.12 → 0.6.15

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.12", myProductName = "daveAppServer";  
+var myVersion = "0.6.15", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -21,6 +21,7 @@ const davetwitter = require ("davetwitter");
 const filesystem = require ("davefilesystem"); 
 const folderToJson = require ("foldertojson");
 const zip = require ("davezip");
+const s3 = require ("daves3"); 
 const qs = require ("querystring");
 const mail = require ("davemail");
 const requireFromString = require ("require-from-string"); //2/10/23 by DW
@@ -335,6 +336,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				if (conn.appData !== undefined) { //it's one of ours
 					if (conn != theNewConnection) { //it's not the new one
 						if (conn.appData.screenname == screenname) {
+							console.log ("kissOtherLogonsGoodnight: \"" + conn.appData.screenname + "\" = \"" + screenname + "\""); //2/12/23 by DW
 							conn.sendText ("goodnight");
 							}
 						}
@@ -344,7 +346,6 @@ 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];
@@ -353,17 +354,31 @@ function cleanFileStats (stats) { //4/19/21 by DW
 						conn.appData.urlToWatch = utils.trimWhitespace (words [1]);
 						logToConsole (conn, conn.appData.lastVerb, conn.appData.urlToWatch);
 						break;
-					
 					case "user": //9/29/21 by DW
-						var token = words [1], secret = words [2];
-						conn.appData.twOauthToken = token;
-						conn.appData.twOauthTokenSecret = secret;
-						conn.appData.urlToWatch = "";
-						davetwitter.getScreenName (token, secret, function (screenname) {
-							conn.appData.screenname = screenname;
-							kissOtherLogonsGoodnight (screenname, conn); //12/14/21 by DW
-							logToConsole (conn, conn.appData.lastVerb, conn.appData.screenname);
-							});
+						if (config.flUseTwitterIdentity) { //2/12/23 by DW
+							var token = words [1], secret = words [2];
+							conn.appData.twOauthToken = token;
+							conn.appData.twOauthTokenSecret = secret;
+							conn.appData.urlToWatch = "";
+							davetwitter.getScreenName (token, secret, function (screenname) {
+								conn.appData.screenname = screenname;
+								kissOtherLogonsGoodnight (screenname, conn); //12/14/21 by DW
+								logToConsole (conn, conn.appData.lastVerb, conn.appData.screenname);
+								});
+							}
+						else {
+							var emailAddress = words [1], emailSecret = words [2];
+							config.isUserInDatabase (emailAddress, function (flInDatabase, userRec) {
+								if (flInDatabase) {
+									conn.appData.emailAddress = userRec.emailAddress;
+									conn.appData.screenname = userRec.emailAddress;
+									conn.appData.emailSecret = userRec.emailSecret;
+									conn.appData.urlToWatch = "";
+									kissOtherLogonsGoodnight (conn.appData.screenname, conn); 
+									logToConsole (conn, conn.appData.lastVerb, conn.appData.screenname);
+									}
+								});
+							}
 						break;
 					
 					}
@@ -389,6 +404,21 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			}
 		}
+//s3 storage -- 2/14/23 by DW
+	
+	function getS3FilePath (screenname, relpath, flprivate) {
+		const folder = (flprivate) ? config.privateFilesPath : config.publicFilesPath;
+		const f = folder + screenname + "/" + relpath;
+		const s3path = config.s3PathForStorage + f;
+		return (s3path);
+		}
+	
+	function getFileFromS3 (screenname, relpath, flprivate, callback) {
+		s3.getObject (getS3FilePath (screenname, relpath, flprivate), callback);
+		}
+	function saveFileToS3 (screenname, relpath, type, flprivate, filetext, callback) {
+		s3.newObject (getS3FilePath (screenname, relpath, flprivate), filetext, type, acl, callback);
+		}
 //storage functions
 	function getFilePath (screenname, relpath, flprivate) {
 		const folder = (flprivate) ? config.privateFilesPath : config.publicFilesPath;
@@ -418,35 +448,40 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		}
 	function publishFile (screenname, relpath, type, flprivate, filetext, callback) {
 		if (config.flStorageEnabled) {
-			var f = getFilePath (screenname, relpath, flprivate);
-			utils.sureFilePath (f, function () {
-				var now = new Date ();
-				fs.writeFile (f, filetext, function (err) {
-					if (err) {
-						callback (err);
-						}
-					else {
-						var url = (flprivate) ? undefined : config.urlServerForClient + screenname + "/" + relpath;
-						if (config.publishFile !== undefined) { //3/18/22 by DW
-							config.publishFile (f, screenname, relpath, type, flprivate, filetext, url);
+			if (config.flUseS3ForStorage) { 
+				saveFileToS3 (screenname, relpath, type, flprivate, filetext, callback);
+				}
+			else {
+				var f = getFilePath (screenname, relpath, flprivate);
+				utils.sureFilePath (f, function () {
+					var now = new Date ();
+					fs.writeFile (f, filetext, function (err) {
+						if (err) {
+							callback (err);
 							}
-						if (!flprivate) {
-							notifySocketSubscribers ("update", filetext, true, function (conn) { //3/6/2 by DW -- payload is a string
-								if (conn.appData.urlToWatch == url) {
-									return (true);
-									}
-								else {
-									return (false);
-									}
+						else {
+							var url = (flprivate) ? undefined : config.urlServerForClient + screenname + "/" + relpath;
+							if (config.publishFile !== undefined) { //3/18/22 by DW
+								config.publishFile (f, screenname, relpath, type, flprivate, filetext, url);
+								}
+							if (!flprivate) {
+								notifySocketSubscribers ("update", filetext, true, function (conn) { //3/6/2 by DW -- payload is a string
+									if (conn.appData.urlToWatch == url) {
+										return (true);
+										}
+									else {
+										return (false);
+										}
+									});
+								}
+							callback (undefined, {
+								url,
+								whenLastUpdate: now
 								});
 							}
-						callback (undefined, {
-							url,
-							whenLastUpdate: now
-							});
-						}
+						});
 					});
-				});
+				}
 			}
 		else {
 			callback ({message: "Can't publish the file because the feature is not enabled on the server."});
@@ -461,26 +496,31 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			callback (err);
 			}
 		if (config.flStorageEnabled) {
-			var f = getFilePath (screenname, relpath, flprivate);
-			fs.readFile (f, function (err, filetext) {
-				if (err) {
-					errcallback (err);
-					}
-				else {
-					fs.stat (f, function (err, stats) {
-						if (err) {
-							errcallback (err);
-							}
-						else {
-							var data = {
-								filedata: filetext.toString (),
-								filestats: cleanFileStats (stats)
-								};
-							callback (undefined, data);
-							}
-						});
-					}
-				});
+			if (config.flUseS3ForStorage) {
+				getFileFromS3 (screenname, relpath, flprivate, callback);
+				}
+			else {
+				var f = getFilePath (screenname, relpath, flprivate);
+				fs.readFile (f, function (err, filetext) {
+					if (err) {
+						errcallback (err);
+						}
+					else {
+						fs.stat (f, function (err, stats) {
+							if (err) {
+								errcallback (err);
+								}
+							else {
+								var data = {
+									filedata: filetext.toString (),
+									filestats: cleanFileStats (stats)
+									};
+								callback (undefined, data);
+								}
+							});
+						}
+					});
+				}
 			}
 		else {
 			callback ({message: "Can't publish the file because the feature is not enabled on the server."});
@@ -1305,7 +1345,21 @@ function startup (options, callback) {
 				}
 			else {
 				if ((params.emailaddress !== undefined) && (params.emailcode !== undefined)) { 
-					callback (params.emailaddress);  //obviously we have to check if it's valid
+					config.isUserInDatabase (params.emailaddress, function (flInDatabase, userRec) {
+						if (flInDatabase) {
+							if (params.emailcode == userRec.emailSecret) {
+								callback (params.emailaddress);  
+								}
+							else {
+								const message = "Can't do what you wanted the correct email authentication wasn't provided.";
+								returnError ({message});
+								}
+							}
+						else {
+							const message = "Can't do what you wanted because the email address isn't in the database.";
+							returnError ({message});
+							}
+						});
 					}
 				else {
 					const message = "Can't do what you wanted because the call is missing email authentication.";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.6.12",
+	"version": "0.6.15",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",
@@ -21,6 +21,7 @@
 		"foldertojson": "*",
 		"davetwitter": "*",
 		"davezip": "*",
+		"daves3": "*",
 		"davehttp": "*",
 		"davemail": "*"
 		}