From e11dd98c9a55cd1742d221e3b1ea90d31e240fa8 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Wed, 27 Jul 2016 21:49:33 -0400
Subject: Fixed another bug

---
 app.js                    |  2 +-
 config/passport.js        |  3 ---
 views/partials/header.hbs | 11 +++++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 0e2a582..9ddf1f9 100644
--- a/app.js
+++ b/app.js
@@ -60,7 +60,7 @@ app.use(function(req, res, next) {
     res.locals.user = req.user;
 
     if (req.user && !req.user.login_info && (req.originalUrl != '/user/verify')
-        && !(req.originalUrl.toString().includes('facebook'))){
+        && (!req.originalUrl.toString().includes('facebook'))){
         req.logout();
     }
     res.locals.messages = req.session.messages;
diff --git a/config/passport.js b/config/passport.js
index 5f2ee94..498e0fd 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -152,7 +152,6 @@ passport.use(new FacebookStrategy({
     function(req, accessToken, refreshToken, profile, done) {
         dbFile.userVerifiedBefore(req.user.user_name, function(err, data) {
             if (err) {
-                req.logout();
                 return done(err);
             } else if (data.length) {
                 if (data[0].facebookID == profile.id) {
@@ -160,7 +159,6 @@ passport.use(new FacebookStrategy({
                     user.login_info = data[0];
                     return done(null, user);
                 } else {
-                    req.logout();
                     return done(null, false, {message: "The verification account doesn't match."});
                 }
             } else {
@@ -172,7 +170,6 @@ passport.use(new FacebookStrategy({
                 }
                 dbFile.addVerification(verification, function (err) {
                     if (err) {
-                        req.logout();
                         return done(err);
                     } else {
                         var user = req.user;
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index 57db052..8931204 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -114,7 +114,11 @@
                 </li>
                 {{# if login }}
                     {{# if user.email }}
+                        {{# if user.login_info}}
                         <li><a href="/user/user_profile">Profile Page</a></li>
+                         {{else}}
+                            <li><a href="/user/signin" >Sign In</a></li>
+                        {{/if}}
                     {{else}}
                         <li><a href="/admin">Admin Panel</a></li>
                     {{/if}}
@@ -124,7 +128,14 @@
 
                 <!--<li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>-->
                 {{# if login }}
+                    {{# if user.login_info}}
                     <li><a href="/user/logout">Logout</a> </li>
+                     {{else if user.email}}
+                        <li><a href="/user/signup" >Sign up</a></li>
+                     {{ else }}
+                        <li><a href="/user/logout">Logout</a> </li>
+
+                    {{/if}}
                 {{ else }}
                     <li><a href="/user/signup" >Sign up</a></li>
                 {{/if}}
-- 
cgit v1.2.3