daveappserver 0.5.35 → 0.5.39

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.5.35", myProductName = "daveAppServer";  
+var myVersion = "0.5.39", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -17,6 +17,7 @@ const davetwitter = require ("davetwitter");
 const filesystem = require ("davefilesystem"); 
 const folderToJson = require ("foldertojson");
 const zip = require ("davezip");
+const qs = require ("querystring");
 
 const whenStart = new Date ();
 
@@ -42,7 +43,9 @@ var config = {
 	privateFilesPath: "privateFiles/users/",
 	publicFilesPath: "publicFiles/users/",
 	
-	defaultContentType: "text/plain" //8/3/21 by DW
+	defaultContentType: "text/plain", //8/3/21 by DW
+	
+	userAgent: myProductName + " v" + myVersion //11/8/21 by DW
 	};
 const fnameConfig = "config.json";
 
@@ -56,7 +59,6 @@ var stats = {
 const fnameStats = "stats.json";
 
 
-
 function statsChanged () {
 	flStatsChanged = true;
 	}
@@ -93,6 +95,9 @@ function httpReadUrl (url, callback) {
 	}
 function httpFullRequest (jsontext, callback) { //11/5/21 by DW
 	var theRequest;
+	function isErrorStatusCode (theCode) { //11/8/21 by DW
+		return ((theCode < 200) || (theCode > 299));
+		}
 	try {
 		theRequest = JSON.parse (jsontext);
 		}
@@ -105,10 +110,11 @@ function httpFullRequest (jsontext, callback) { //11/5/21 by DW
 			callback (err);
 			}
 		else {
-			if (response.statusCode != 200) {
+			if (isErrorStatusCode (response.statusCode)) { //11/8/21 by DW
 				const errstruct = {
-					message: "Can't read the URL, \"" + url + "\" because we received a status code of " + response.statusCode + ".",
-					statusCode: response.statusCode
+					message: "Can't read the URL, \"" + theRequest.url + "\" because we received a status code of " + response.statusCode + ".",
+					statusCode: response.statusCode,
+					data //11/8/21 by DW
 					};
 				callback (errstruct);
 				}
@@ -434,6 +440,12 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			});
 		}
+	
+	function getPublicFileUrl (screenname, relpath) { //12/4/21 by DW
+		var urlpublic = config.urlServerForClient + screenname + "/" + relpath;
+		return (urlpublic);
+		}
+	
 	function makeFilePublic (screenname, relpath, callback) { //2/20/21 by DW
 		console.log ("makeFilePublic: relpath == " + relpath);
 		getFile (screenname, relpath, false, function (err, data) {
@@ -470,7 +482,21 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			else {
 				folderToJson.getObject (config.publicFilesPath + screenname + "/", function (err, publicSubs) {
-					if (err) {
+					function legitError (err) {
+						if (err) {
+							if (err.code == "ENOENT") {
+								publicSubs = new Object ();
+								return (false);
+								}
+							else {
+								return (true);
+								}
+							}
+						else {
+							return (false);
+							}
+						}
+					if (legitError (err)) {
 						callback (err);
 						}
 					else {
@@ -639,6 +665,216 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				});
 			});
 		}
+//github -- 11/8/21 by DW
+	function handleGithubOauthCallback (theCode, callback) { //11/8/21 by DW
+		var params = {
+			client_id: config.githubClientId,
+			client_secret: config.githubClientSecret,
+			code: theCode
+			};
+		var apiUrl = "https://github.com/login/oauth/access_token?" + utils.buildParamList (params);
+		var githubRequest = {
+			method: "POST",
+			url: apiUrl
+			};
+		console.log ("handleGithubOauthCallback: githubRequest === " + utils.jsonStringify (githubRequest));
+		request (githubRequest, function (err, response, body) {
+			if (err) {
+				console.log ("handleGithubOauthCallback: err.message == " + err.message);
+				callback (err);
+				}
+			else {
+				var postbody = qs.parse (body);
+				var urlRedirect = "/?githubaccesstoken=" + postbody.access_token;
+				console.log ("handleGithubOauthCallback: urlRedirect = " + urlRedirect);
+				callback (undefined, urlRedirect);
+				}
+			});
+		}
+	function downloadFromGithub (username, repository, path, accessToken, callback) { //calls back with the JSON structure GitHub returns
+		if (!utils.beginsWith (path, "/")) {
+			path = "/" + path;
+			}
+		var url = "https://api.github.com/repos/" + username + "/" + repository + "/contents" + path;
+		var theRequest = {
+			url: url,
+			jar: true, //"remember cookies for future use"
+			maxRedirects: 5,
+			headers: {
+				"User-Agent": config.userAgent,
+				"Authorization": "token " + accessToken
+				}
+			};
+		request (theRequest, function (err, response, jsontext) {
+			if (err) {
+				callback (err);
+				}
+			else {
+				if (response.statusCode == 404) {
+					callback ({message: "The file \"" + path + "\" was not found."});
+					}
+				else {
+					if (response.headers ["x-ratelimit-remaining"] == 0) {
+						var theLimit = response.headers ["x-ratelimit-limit"];
+						callback ({"message": "GitHub reported a rate limit error. You are limited to " + theLimit + " calls per hour."});
+						}
+					else {
+						try {
+							var jstruct = JSON.parse (jsontext);
+							callback (undefined, jstruct);
+							}
+						catch (err) {
+							callback (err);
+							}
+						}
+					}
+				}
+			});
+		}
+	function uploadToGithub (jsontext, data, callback) {
+		var options;
+		try {
+			options = JSON.parse (jsontext);
+			}
+		catch (err) {
+			callback (err);
+			return;
+			}
+		options.data = data;
+		if (options.userAgent === undefined) {
+			options.userAgent = config.userAgent;
+			}
+		if (options.type === undefined) {
+			options.type = utils.httpExt2MIME (options.path);
+			}
+		if (options.message === undefined) {
+			options.message = utils.getRandomSnarkySlogan ();
+			}
+		
+		var bodyStruct = { 
+			message: options.message,
+			committer: options.committer,
+			content: Buffer.from (options.data).toString ("base64")
+			};
+		downloadFromGithub (options.username, options.repository, options.path, options.accessToken, function (err, jstruct) {
+			if (jstruct !== undefined) {
+				bodyStruct.sha = jstruct.sha;
+				}
+			var url = "https://api.github.com/repos/" + options.username + "/" + options.repository + "/contents/" + options.path;
+			var theRequest = {
+				method: "PUT",
+				url,
+				body: JSON.stringify (bodyStruct),
+				headers: {
+					"User-Agent": options.userAgent,
+					"Authorization": "token " + options.accessToken,
+					"Content-Type": options.type
+					}
+				};
+			request (theRequest, function (err, response, body) { 
+				if (err) {
+					callback (err);
+					}
+				else {
+					var rateLimitMessage;
+					if (response.headers ["x-ratelimit-remaining"] == 0) {
+						var theLimit = response.headers ["x-ratelimit-limit"];
+						rateLimitMessage = "GitHub reported a rate limit error. You are limited to " + theLimit + " calls per hour.";
+						}
+					var returnedStruct = JSON.parse (body);
+					returnedStruct.statusCode = response.statusCode;
+					returnedStruct.rateLimitMessage = rateLimitMessage;
+					callback (undefined, returnedStruct);
+					}
+				});
+			});
+		}
+	function getGithubDirectory (username, repository, path, accessToken, callback) {
+		function loadDirectory (theArray, parentpath, callback) {
+			function nextFile (ix) {
+				if (ix < theArray.length) {
+					var item = theArray [ix];
+					if (item.type == "dir") {
+						getGithubDirectory (username, repository, item.path, accessToken, function (err, jstruct) {
+							if (jstruct !== undefined) { //no error
+								item.subs = jstruct;
+								}
+							nextFile (ix + 1);
+							});
+						}
+					else {
+						nextFile (ix + 1);
+						}
+					}
+				else {
+					callback ();
+					}
+				}
+			nextFile (0);
+			}
+		if (utils.beginsWith (path, "/")) {
+			path = utils.stringDelete (path, 1, 1);
+			}
+		var theRequest = {
+			method: "GET",
+			url: "https://api.github.com/repos/" + username + "/" + repository + "/contents/" + path,
+			headers: {
+				"User-Agent": config.userAgent,
+				"Authorization": "token " + accessToken,
+				}
+			};
+		request (theRequest, function (err, response, body) { 
+			if (err) {
+				callback (err);
+				}
+			else {
+				try {
+					var jstruct = JSON.parse (body);
+					if (Array.isArray (jstruct)) { //it's a directory
+						loadDirectory (jstruct, path, function () {
+							callback (undefined, jstruct);
+							});
+						}
+					else {
+						callback (undefined, jstruct);
+						}
+					}
+				catch (err) {
+					if (callback !== undefined) {
+						callback (err);
+						}
+					}
+				}
+			});
+		}
+	function getGithubUserInfo (username, accessToken, callback) {
+		var url = "https://api.github.com/user";
+		if (username !== undefined) {
+			url += "s/" + username
+			}
+		var theRequest = {
+			method: "GET",
+			url,
+			headers: {
+				"User-Agent": config.userAgent,
+				"Authorization": "token " + accessToken
+				}
+			};
+		request (theRequest, function (err, response, body) { 
+			if (err) {
+				callback (err);
+				}
+			else {
+				try {
+					var jstruct = JSON.parse (body);
+					callback (undefined, jstruct);
+					}
+				catch (err) {
+					callback (err);
+					}
+				}
+			});
+		}
 
 function startup (options, callback) {
 	function readConfig (f, theConfig, flReportError, callback) { 
@@ -720,6 +956,16 @@ function startup (options, callback) {
 				returnData (jstruct);
 				}
 			}
+		function httpReturnRedirect (url, code) { //9/30/20 by DW
+			var headers = {
+				location: url
+				};
+			if (code === undefined) {
+				code = 302;
+				}
+			theRequest.httpReturn (code, "text/plain", code + " REDIRECT", headers);
+			}
+			
 		function httpReturnObject (err, jstruct) {
 			if (err) {
 				returnError (err);
@@ -749,7 +995,8 @@ function startup (options, callback) {
 						urlWebsocketServerForClient: config.urlWebsocketServerForClient,
 						flEnableLogin: config.flEnableLogin,
 						prefsPath: config.prefsPath,
-						docsPath: config.docsPath
+						docsPath: config.docsPath,
+						idGitHubClient: config.githubClientId //11/9/21 by DW
 						};
 					if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
 						for (var x in theRequest.addToPagetable) {
@@ -790,6 +1037,11 @@ function startup (options, callback) {
 									returnError (err);
 									}
 								else { //quirk in API, it wants a string, not a JSON struct
+									if (!flprivate) {
+										if (config.publicFileSaved !== undefined) {
+											config.publicFileSaved (token, secret, getPublicFileUrl (screenname, params.relpath));
+											}
+										}
 									returnPlainText (utils.jsonStringify (data));
 									}
 								});
@@ -800,6 +1052,9 @@ function startup (options, callback) {
 							writeWholeFile (screenname, params.relpath, theRequest.postBody.toString (), httpReturn);
 							});
 						return (true);
+					case "/uploadtogithub":  //11/9/21 by DW
+						uploadToGithub (params.options, theRequest.postBody, httpReturn);
+						return (true); 
 					}
 				break;
 			case "get":
@@ -903,6 +1158,28 @@ function startup (options, callback) {
 							getFileInfo (screenname, params.relpath, httpReturn);
 							});
 						return (true); 
+					case "/githuboauthcallback": //11/8/21 by DW
+						handleGithubOauthCallback (params.code, function (err, urlRedirect) {
+							if (err) {
+								returnError (err);
+								}
+							else {
+								httpReturnRedirect (urlRedirect);
+								}
+							});
+						return (true); 
+					case "/downloadfromgithub":  //11/8/21 by DW
+						downloadFromGithub (params.username, params.repository, params.path, params.accessToken, httpReturn);
+						return (true); 
+					case "/githubgetdirectory":  //11/10/21 by DW
+						getGithubDirectory (params.username, params.repository, params.path, params.accessToken, httpReturn);
+						return (true); 
+					case "/githubgetuserinfo":  //11/10/21 by DW
+						callWithScreenname (function (screenname) {
+							getGithubUserInfo (params.username, params.accessToken, httpReturn);
+							});
+						return (true); 
+					
 					}
 				break;
 			}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.5.35",
+	"version": "0.5.39",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",
@@ -12,6 +12,7 @@
 		"appserver.js"
 		],
 	"dependencies" : {
+		"querystring": "*",
 		"request": "*",
 		"nodejs-websocket": "*",
 		"daveutils": "*",

package/readme.md

@@ -52,6 +52,12 @@ The second section configures the HTTP server and the connection to Twitter for
 
 ### Updates
 
+#### v0.5.32 -- 12/4/21 by DW
+
+Added a new callback, publicFileSaved, which is called when the user updates a public file. 
+
+Fixed a bug where a user couldn't create a new file if their public files folder was empty. 
+
 #### v0.5.32 -- 9/26/21 by DW
 
 Fixed the example app to require "../appserver.js" instead of "lib/daveappserver.js" which only exists on my development machine. 

package/readme.opml

@@ -45,6 +45,10 @@
 				</outline>
 			</outline>
 		<outline created="Wed, 15 Sep 2021 14:19:02 GMT" text="### Updates">
+			<outline created="Sat, 04 Dec 2021 21:29:57 GMT" text="#### v0.5.32 -- 12/4/21 by DW">
+				<outline created="Sat, 04 Dec 2021 21:30:33 GMT" text="Added a new callback, publicFileSaved, which is called when the user updates a public file. "></outline>
+				<outline created="Sat, 04 Dec 2021 21:29:58 GMT" text="Fixed a bug where a user couldn't create a new file if their public files folder was empty. "></outline>
+				</outline>
 			<outline created="Wed, 15 Sep 2021 14:19:10 GMT" text="#### v0.5.32 -- 9/26/21 by DW">
 				<outline created="Wed, 15 Sep 2021 14:19:12 GMT" text="Fixed the example app to require &quot;../appserver.js&quot; instead of &quot;lib/daveappserver.js&quot; which only exists on my development machine. "></outline>
 				</outline>