daveappserver 0.6.18 → 0.6.21

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.18", myProductName = "daveAppServer";  
+var myVersion = "0.6.21", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -1006,18 +1006,37 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			});
 		}
 //email registration -- 12/7/22 by DW
-	function sendConfirmingEmail (email, screenname, flNewUser=false, callback) {
+	function sendConfirmingEmail (email, screenname, flNewUser=false, urlRedirect, callback) {
+		email = utils.stringLower (email); //3/8/23 by DW
 		function getScreenname (callback) {
-			if (flNewUser) { //the caller had to provide it
-				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);
+			function containsIllegalCharacter (name) { //3/17/23 by DW
+				function isLegal (ch) {
+					return (isAlpha (ch) || isNumeric (ch) || (ch == "_"));
+					}
+				for (var i = 0; i < name.length; i++) {
+					let ch = name [i];
+					if (!isLegal (ch)) {
+						return (true);
 						}
-					});
+					}
+				return (false);
+				}
+			if (flNewUser) { //the caller had to provide it
+				if (containsIllegalCharacter (screenname)) { //3/17/23 by DW
+					const message = "Can't create the user \"" + screenname + "\" because only alpha, numeric and underscore characters are allowed in names."
+					callback ({message});
+					}
+				else {
+					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);
@@ -1037,6 +1056,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 					flDeleted: false,
 					screenname,
 					flNewUser, //1/7/23 by DW
+					urlRedirect, //3/3/23 by DW
 					when: new Date ()
 					};
 				stats.pendingConfirmations.push (obj);
@@ -1074,8 +1094,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			});
 		}
 	function receiveConfirmation (emailConfirmCode, callback) {
-		const urlWebApp = config.urlServerForClient; //2/5/23 by DW
-		
+		var urlWebApp = config.urlServerForClient; //2/5/23 by DW
 		var urlRedirect = undefined, flFoundConfirm = false;
 		function encode (s) {
 			return (encodeURIComponent (s));
@@ -1083,6 +1102,9 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		stats.pendingConfirmations.forEach (function (item) {
 			if (item.magicString == emailConfirmCode) {
 				if (config.addEmailToUserInDatabase !== undefined) { 
+					if (item.urlRedirect !== undefined) { //3/3/23 by DW
+						urlWebApp = item.urlRedirect;
+						}
 					config.addEmailToUserInDatabase (item.screenname, item.email, item.magicString, item.flNewUser, function (err, emailSecret) {
 						if (err) {
 							urlRedirect = urlWebApp + "?failedLogin=true&message=" + encode (err.message); 
@@ -1339,7 +1361,6 @@ function startup (options, callback) {
 				}
 			}
 		function callWithScreenname (callback) {
-			
 			if (config.flUseTwitterIdentity) { //2/6/23 by DW
 				if (config.getScreenname === undefined) {
 					davetwitter.getScreenName (token, secret, function (screenname) {
@@ -1364,10 +1385,11 @@ function startup (options, callback) {
 				}
 			else {
 				if ((params.emailaddress !== undefined) && (params.emailcode !== undefined)) { 
-					config.isUserInDatabase (params.emailaddress, function (flInDatabase, userRec) {
+					const email = utils.stringLower (params.emailaddress); //3/8/23 by DW
+					config.isUserInDatabase (email, function (flInDatabase, userRec) {
 						if (flInDatabase) {
 							if (params.emailcode == userRec.emailSecret) {
-								callback (params.emailaddress);  
+								callback (email);  
 								}
 							else {
 								const message = "Can't do what you wanted the correct email authentication wasn't provided.";
@@ -1550,10 +1572,10 @@ function startup (options, callback) {
 							});
 						return (true); 
 					case "/sendconfirmingemail": //12/7/22 by DW
-						sendConfirmingEmail (params.email, undefined, false, httpReturn);
+						sendConfirmingEmail (params.email, undefined, false, params.urlredirect, httpReturn); //3/3/23 by DW
 						return (true);
 					case "/createnewuser": //1/7/23 by DW
-						sendConfirmingEmail (params.email, params.name, true, httpReturn);
+						sendConfirmingEmail (params.email, params.name, true, params.urlredirect, httpReturn); //3/3/23 by DW
 						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.18",
+	"version": "0.6.21",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",