daveappserver 0.7.6 → 0.7.8

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.7.6", myProductName = "daveAppServer";  
+var myVersion = "0.7.8", myProductName = "daveAppServer";   
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -1276,6 +1276,35 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			});
 		}
+//wordpress -- 10/31/23 by DW
+	function wordpressHandleRequest (theRequest) {
+		function encode (s) {
+			return (encodeURIComponent (s));
+			}
+		function returnRedirect (url, code=302) {
+			var headers = {
+				location: url
+				};
+			theRequest.httpReturn (code, "text/plain", code + " REDIRECT", headers);
+			}
+		function useWordpressAccount (accessToken, theUserInfo) {
+			console.log ("useWordpressAccount: accessToken == " + accessToken);
+			console.log ("useWordpressAccount: theUserInfo == " + utils.jsonStringify (theUserInfo));
+			config.loginWordpressUser (accessToken, theUserInfo, function (err, userRec) {
+				if (err) {
+					returnRedirect (config.urlServerForClient + "?failedLogin=true&message=" + encode (err.message)); 
+					}
+				else {
+					returnRedirect (config.urlServerForClient + "?emailconfirmed=true&email=" + encode (userRec.emailAddress) + "&code=" + encode (userRec.emailSecret) + "&screenname=" + encode (userRec.screenname));
+					}
+				});
+			}
+		const options = {
+			useWordpressAccount
+			};
+		const flHandled = wordpress.handleHttpRequest (theRequest, options);
+		return (flHandled);
+		}
 
 function startup (options, callback) {
 	function readConfig (f, theConfig, flReportError, callback) { 
@@ -1557,7 +1586,7 @@ function startup (options, callback) {
 				}
 			}
 		
-		if (wordpress.handleHttpRequest (theRequest)) { //9/10/23 by DW
+		if (wordpressHandleRequest (theRequest)) { //9/10/23 by DW
 			return (true);
 			}
 		
@@ -1734,14 +1763,14 @@ function startup (options, callback) {
 		return (false);
 		}
 	function http404Callback (theRequest) {
+		function return404 () {
+			theRequest.httpReturn (404, "text/plain", "Not found.");
+			}
+		function returnPlainText (s) {
+			theRequest.httpReturn (200, "text/plain", s.toString ());
+			}
 		if (config.flStorageEnabled) {
 			if (checkPathForIllegalChars (theRequest.path)) {
-				function return404 () {
-					theRequest.httpReturn (404, "text/plain", "Not found.");
-					}
-				function returnPlainText (s) {
-					theRequest.httpReturn (200, "text/plain", s.toString ());
-					}
 				
 				function getFileContent (screenname, relpath, flprivate, callback) { //9/8/21 by DW
 					var f = getFilePath (screenname, relpath, flprivate);

package/package.json

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