daveappserver 0.6.0 → 0.6.1

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.0", myProductName = "daveAppServer";  
+var myVersion = "0.6.1", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -979,26 +979,30 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		}
 	function receiveConfirmation (emailConfirmCode, callback) {
 		const urlWebApp = "http://" + config.myDomain + "/";
-		var urlRedirect = undefined;
+		var urlRedirect = undefined, flFoundConfirm = false;
 		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, function (err, emailSecret) {
+						if (err) {
+							urlRedirect = urlWebApp + "?failedLogin=true&message=" + encodeURIComponent (err.message); 
+							}
+						else {
+							urlRedirect = urlWebApp + "?emailconfirmed=true&email=" + item.email + "&code=" + encodeURIComponent (emailSecret);
+							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=" + encodeURIComponent ("Can't find the pending confirmation."); 
+				}
+			callback (urlRedirect);
 			}
-		console.log ("receiveConfirmation: urlRedirect == " + urlRedirect);
-		callback (urlRedirect);
 		}
 	function checkPendingConfirmations () {
 		var flChanged = false;

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.1",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",