Apartment and Personal transfer

lib/oauth2.js

@@ -76,9 +76,9 @@ router.get(
     next();
   } ,
   passport.authenticate('google', {
-    hd: 'ligercambodia.org', //hd = host domain 
+    hd: 'ligercambodia.org', //hd = host domain
     scope: ['email', 'profile']
-  })   
+  })
 );
 // [END authorize]
 
@@ -99,15 +99,15 @@ router.get(
       } else {
         if (result.rows.length != 0) {
           var userRole = result.rows[0].role;
-          var userApartment = result.rows[0].role;
+          var userApartment = result.rows[0].apartment;
           req.session.passport.user.role = userRole;
           req.session.passport.user.apartment = userApartment;
           next()
         } else {
           res.send("Sorry " + req.user.displayName + "! We couldn't find your account in our database! Please contact our adminstrator to add you in!")
         }
-        
-      } 
+
+      }
     })
   },
 
@@ -137,10 +137,10 @@ router.get(
       link = '/'
     }
 
-  
+
     const redirect = req.session.returnTo || link;
     console.log("redirect " + redirect)
-   
+
     delete req.session.returnTo;
     res.redirect(redirect);
   }
@@ -154,4 +154,4 @@ router.get('/logout', (req, res) => {
   res.redirect('/');
 });
 
-module.exports = router;
+module.exports = router;

package.json

@@ -24,6 +24,7 @@
     "gmail-send": "^1.2.11",
     "handlebars": "^4.1.1",
     "handlebars.moment": "^1.0.4",
+    "moment": "^2.24.0",
     "moment-timezone": "^0.5.13",
     "passport": "^0.3.2",
     "passport-google-oauth20": "^1.0.0",