daveappserver 0.6.0 → 0.6.2

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.0", myProductName = "daveAppServer";  
+var myVersion = "0.6.2", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -934,71 +934,94 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			});
 		}
 //email registration -- 12/7/22 by DW
-	function sendConfirmingEmail (email, screenname, callback) {
-		const magicString = utils.getRandomPassword (10);
-		const urlWebApp = "http://" + config.myDomain + "/";
-		console.log ("sendConfirmingEmail: email == " + email + ", urlWebApp == " + urlWebApp);
-		var obj = {
-			magicString: magicString,
-			email: email,
-			flDeleted: false,
-			screenname,
-			when: new Date ()
-			};
-		stats.pendingConfirmations.push (obj);
-		statsChanged ();
-		console.log ("sendConfirmingEmail: obj == " + utils.jsonStringify (obj));
-		var params = {
-			title: config.confirmEmailSubject,
-			operationToConfirm: config.operationToConfirm,
-			confirmationUrl: urlWebApp + "userconfirms?emailConfirmCode=" + encodeURIComponent (magicString)
-			};
-		fs.readFile (config.fnameEmailTemplate, function (err, emailTemplate) {
+	function sendConfirmingEmail (email, screenname, flNewUser=false, callback) {
+		function getScreenname (callback) {
+			if (flNewUser) { //the caller had to provide it
+				callback (undefined, screenname);
+				}
+			else { //we have to look it up
+				config.getScreenNameFromEmail (email, callback);
+				}
+			}
+		getScreenname (function (err, screenname) {
 			if (err) {
-				const message = "Error reading email template.";
-				console.log ("sendConfirmingEmail: err.message == " + err.message);
-				callback ({message});
+				callback (err);
 				}
 			else {
-				var mailtext = utils.multipleReplaceAll (emailTemplate.toString (), params, false, "[%", "%]");
-				mail.send (email, params.title, mailtext, config.mailSender, function (err, data) {
+				const magicString = utils.getRandomPassword (10);
+				const urlWebApp = "http://" + config.myDomain + "/";
+				console.log ("sendConfirmingEmail: email == " + email + ", urlWebApp == " + urlWebApp);
+				var obj = {
+					magicString: magicString,
+					email: email,
+					flDeleted: false,
+					screenname,
+					flNewUser, //1/7/23 by DW
+					when: new Date ()
+					};
+				stats.pendingConfirmations.push (obj);
+				statsChanged ();
+				console.log ("sendConfirmingEmail: obj == " + utils.jsonStringify (obj));
+				var params = {
+					title: config.confirmEmailSubject,
+					operationToConfirm: config.operationToConfirm,
+					confirmationUrl: urlWebApp + "userconfirms?emailConfirmCode=" + encodeURIComponent (magicString)
+					};
+				fs.readFile (config.fnameEmailTemplate, function (err, emailTemplate) {
 					if (err) {
-						callback (err);
+						const message = "Error reading email template.";
+						console.log ("sendConfirmingEmail: err.message == " + err.message);
+						callback ({message});
 						}
 					else {
-						callback (undefined, obj);
+						var mailtext = utils.multipleReplaceAll (emailTemplate.toString (), params, false, "[%", "%]");
+						mail.send (email, params.title, mailtext, config.mailSender, function (err, data) {
+							if (err) {
+								callback (err);
+								}
+							else {
+								callback (undefined, {message: "Please check your email."});
+								}
+							});
+						const f = config.dataFolder + "lastmail.html";
+						utils.sureFilePath (f, function () {
+							fs.writeFile (f, mailtext, function (err) {
+								});
+							});
 						}
 					});
-				const f = config.dataFolder + "lastmail.html";
-				utils.sureFilePath (f, function () {
-					fs.writeFile (f, mailtext, function (err) {
-						});
-					});
 				}
 			});
 		}
 	function receiveConfirmation (emailConfirmCode, callback) {
 		const urlWebApp = "http://" + config.myDomain + "/";
-		var urlRedirect = undefined;
+		var urlRedirect = undefined, flFoundConfirm = false;
+		function encode (s) {
+			return (encodeURIComponent (s));
+			}
 		stats.pendingConfirmations.forEach (function (item) {
 			if (item.magicString == emailConfirmCode) {
-				console.log (utils.jsonStringify (item));
-				
-				
 				if (config.addEmailToUserInDatabase !== undefined) { 
-					config.addEmailToUserInDatabase (item.screenname, item.email, item.magicString);
+					config.addEmailToUserInDatabase (item.screenname, item.email, item.magicString, item.flNewUser, function (err, emailSecret) {
+						if (err) {
+							urlRedirect = urlWebApp + "?failedLogin=true&message=" + encode (err.message); 
+							}
+						else {
+							urlRedirect = urlWebApp + "?emailconfirmed=true&email=" + item.email + "&code=" + encode (emailSecret) + "&screenname=" + encode (item.screenname);
+							item.flDeleted = true; 
+							}
+						callback (urlRedirect);
+						});
 					}
-				
-				urlRedirect = urlWebApp + "?emailconfirmed=true&email=" + item.email + "&code=" + item.magicString;
-				
-				item.flDeleted = true; 
+				flFoundConfirm = true;
 				}
 			});
-		if (urlRedirect === undefined) {
-			urlRedirect = urlWebApp + "?failedLogin=true"; //add an error message here
+		if (!flFoundConfirm) {
+			if (urlRedirect === undefined) {
+				urlRedirect = urlWebApp + "?failedLogin=true&message=" + encode ("Can't find the pending confirmation."); 
+				}
+			callback (urlRedirect);
 			}
-		console.log ("receiveConfirmation: urlRedirect == " + urlRedirect);
-		callback (urlRedirect);
 		}
 	function checkPendingConfirmations () {
 		var flChanged = false;
@@ -1375,9 +1398,10 @@ function startup (options, callback) {
 							});
 						return (true); 
 					case "/sendconfirmingemail": //12/7/22 by DW
-						callWithScreenname (function (screenname) {
-							sendConfirmingEmail (params.email, screenname, httpReturn);
-							});
+						sendConfirmingEmail (params.email, undefined, false, httpReturn);
+						return (true);
+					case "/createnewuser": //1/7/23 by DW
+						sendConfirmingEmail (params.email, params.name, true, httpReturn);
 						return (true);
 					case "/userconfirms": //12/7/22 by DW
 						receiveConfirmation (params.emailConfirmCode, httpReturnRedirect);

package/package.json

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