From a2978c8ca477963e3765edaecca7dd214cbeddbb Mon Sep 17 00:00:00 2001
From: gfredtech <gfredtech@gmail.com>
Date: Fri, 11 Oct 2019 16:06:42 +0000
Subject: [PATCH 1/4] merge from upstream

---
 src/controllers/urlController.js | 7 ++++---
 src/middlewares/validateUrl.js   | 4 ++--
 src/views/index.ejs              | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/controllers/urlController.js b/src/controllers/urlController.js
index 8d7c7ff..93aac09 100644
--- a/src/controllers/urlController.js
+++ b/src/controllers/urlController.js
@@ -27,18 +27,19 @@ export const trimUrl = async(req, res) => {
         long_url: req.strippedUrl,
         clipped_url: `${DOMAIN_NAME}/${newUrlCode}`,
         urlCode: newUrlCode,
-        created_by: userID,
+        createdBy: userID,
         click_count: 0
       });
-  
+
       // console.log("short code", newUrlCode);
       newTrim.save((err, newTrim) => {
         if (err) {
+            console.log(err);
           res.status(500);
           return res.render("index", {
             userClips: [],
             success: false,
-            created_by: req.cookies.userID,
+            createdBy: req.cookies.userID,
             error: "Server error"
           });
         }
diff --git a/src/middlewares/validateUrl.js b/src/middlewares/validateUrl.js
index 0eb0a6e..4b2adf0 100644
--- a/src/middlewares/validateUrl.js
+++ b/src/middlewares/validateUrl.js
@@ -31,7 +31,7 @@ export const stripUrl = (req, res, next) => {
 export const validateOwnDomain = (req, res, next) => {
   if (req.strippedUrl.startsWith(DOMAIN_NAME)) {
     res.status(400);
-    res.render('../src/views/index', { userClips: [], success: false, error: 'Cannot trim an already generated URL' });
+    res.render('index', { userClips: [], success: false, error: 'Cannot trim an already generated URL' });
   }
   next();
 };
@@ -58,7 +58,7 @@ export const urlAlreadyTrimmedByUser = (req, res, next) => {
       created_by: req.cookies.userId //Find all clips created by this user.
     })
       .then((clips) => {
-        res.render('../src/views/index', { userClips: clips, success: true });
+        res.render('index', { userClips: clips, success: true });
       });
   });
 };
diff --git a/src/views/index.ejs b/src/views/index.ejs
index 1968dc9..0909b21 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -27,7 +27,7 @@
               name="long_url"
               required
             />
-            <input type="hidden" name="created_by" value="<%= created_by %>"/>
+            <input type="hidden" name="created_by" value=""/>
             <div class="input-group-append">
               <button
                 type="submit"

From ca76be16925e19f328d91110f3dde0cbc5284b48 Mon Sep 17 00:00:00 2001
From: gfredtech <gfredtech@gmail.com>
Date: Fri, 25 Oct 2019 09:56:09 +0000
Subject: [PATCH 2/4] added tsserver log files to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 43130a8..55d7f7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ coverage/
 npm-debug.log
 .idea/
 .jshintrc
+.log/

From 3674c1cb574fc824be3b383a46b8d8520b8c0a9d Mon Sep 17 00:00:00 2001
From: gfredtech <gfredtech@gmail.com>
Date: Fri, 25 Oct 2019 10:54:05 +0000
Subject: [PATCH 3/4] Fixes Custom URLs restricted to alphanumeric characters
 issue #176 According to
 https://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters the
 character set [A-Za-z0-9_.~\-] are the only non-alphanumeric characters that
 are not percent-encoded, making them desirable for specifying custom URLs for
 our URL shortener.

---
 src/middlewares/validateUrl.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/middlewares/validateUrl.js b/src/middlewares/validateUrl.js
index c3d7a6e..549f604 100644
--- a/src/middlewares/validateUrl.js
+++ b/src/middlewares/validateUrl.js
@@ -11,13 +11,13 @@ import { respondWithWarning } from '../helpers/responseHandler';
  */
 export const stripUrl = async (req, res, next) => {
   const { long_url, expiry_date, custom_url } = req.body;
-  
+
   const schema = Joi.object({
     url: Joi.string().regex(
       /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/
     ).error(new Error('Enter a valid URL')),
     expiry: Joi.date().iso().greater(new Date()).allow('').error(new Error('Expiry date must be in the future')),
-    custom_url: Joi.string().alphanum().allow(''),
+      custom_url: Joi.string().regex(/^[A-Za-z0-9_.\-~]$/).error(new Error('custom URL must contain only alphanumeric, period(.), hyphen(-), underscore(_) and tilde(~) characters')),
   });
   const validationOptions = {
     allowUnknown: true, // allow unknown keys that will be ignored
@@ -76,11 +76,11 @@ export const urlAlreadyTrimmedByUser = (req, res, next) => {
 
 export const customUrlExists = async(req, res, next) => {
 	const customUrl = req.body.custom_url;
-	
+
 	if(customUrl) {
 		//Search the db for this custom url.
 		let retrievedClip = await UrlShorten.findOne({urlCode: customUrl});
-		
+
 		//If an existing clip already has the same custom url code....
 		if (retrievedClip) {
 			//If the existing clip has expired...
@@ -93,6 +93,6 @@ export const customUrlExists = async(req, res, next) => {
 				return respondWithWarning(res, 409, "Custom URL already in use. Please try another");
 		}
 	};
-	
+
   next()
 };

From 2208785779b33083eb7f950f704b78126cc9e824 Mon Sep 17 00:00:00 2001
From: gfredtech <gfredtech@gmail.com>
Date: Fri, 25 Oct 2019 11:02:08 +0000
Subject: [PATCH 4/4] allow zero-length custom-urls

---
 src/middlewares/validateUrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middlewares/validateUrl.js b/src/middlewares/validateUrl.js
index 549f604..48c08f8 100644
--- a/src/middlewares/validateUrl.js
+++ b/src/middlewares/validateUrl.js
@@ -17,7 +17,7 @@ export const stripUrl = async (req, res, next) => {
       /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/
     ).error(new Error('Enter a valid URL')),
     expiry: Joi.date().iso().greater(new Date()).allow('').error(new Error('Expiry date must be in the future')),
-      custom_url: Joi.string().regex(/^[A-Za-z0-9_.\-~]$/).error(new Error('custom URL must contain only alphanumeric, period(.), hyphen(-), underscore(_) and tilde(~) characters')),
+      custom_url: Joi.string().regex(/^[A-Za-z0-9_.\-~]{0,}$/).error(new Error('custom URL must contain only alphanumeric, period(.), hyphen(-), underscore(_) and tilde(~) characters')),
   });
   const validationOptions = {
     allowUnknown: true, // allow unknown keys that will be ignored