Fixed Logout issue reported in issue mrvautin#154 (mrvautin#155)

Co-authored-by: Mark Moffat <hi@markmoffat.com>
capgemini-na-devops · Oct 21, 2020 · fc8d63d · fc8d63d
1 parent c2cee9f
commit fc8d63d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/lib/cart.js b/lib/cart.js
@@ -109,24 +109,8 @@ const emptyCart = async (req, res, type, customMessage) => {
     res.redirect('/');
 };
 
-const clearCustomer = (req) => {
-    // Clear our session
-    req.session.customerPresent = null;
-    req.session.customerEmail = null;
-    req.session.customerFirstname = null;
-    req.session.customerLastname = null;
-    req.session.customerAddress1 = null;
-    req.session.customerAddress2 = null;
-    req.session.customerCountry = null;
-    req.session.customerState = null;
-    req.session.customerPostcode = null;
-    req.session.customerPhone = null;
-    req.session.orderComment = null;
-};
-
 module.exports = {
     updateTotalCart,
     updateSubscriptionCheck,
-    emptyCart,
-    clearCustomer
+    emptyCart
 };
diff --git a/lib/common.js b/lib/common.js
@@ -268,6 +268,21 @@ const cleanAmount = (amount) => {
     return amount;
 };
 
+const clearCustomer = (req) => {
+    // Clear our session
+    req.session.customerPresent = null;
+    req.session.customerEmail = null;
+    req.session.customerFirstname = null;
+    req.session.customerLastname = null;
+    req.session.customerAddress1 = null;
+    req.session.customerAddress2 = null;
+    req.session.customerCountry = null;
+    req.session.customerState = null;
+    req.session.customerPostcode = null;
+    req.session.customerPhone = null;
+    req.session.orderComment = null;
+};
+
 module.exports = {
     allowedMimeType,
     fileSizeLimit,
@@ -287,6 +302,7 @@ module.exports = {
     newId,
     hooker,
     getCountryList,
-    getCountryNameToCode,
-    cleanAmount
+    cleanAmount,
+    clearCustomer,
+    getCountryNameToCode
 };
diff --git a/routes/order.js b/routes/order.js
@@ -4,14 +4,14 @@ const {
     getCountryList,
     getId,
     sendEmail,
-    getEmailTemplate
+    getEmailTemplate,
+    clearCustomer
 } = require('../lib/common');
 const {
-    paginateData
+    paginateData,
 } = require('../lib/paginate');
 const {
-    emptyCart,
-    clearCustomer
+    emptyCart
 } = require('../lib/cart');
 const { restrict, checkAccess } = require('../lib/auth');
 const { indexOrders } = require('../lib/indexing');