Really fixed showing welcome messageon every login

config/models.js

@@ -24,6 +24,7 @@ const userSchema = new mongoose.Schema({
   isPro: {type: Boolean, required: true, default: false},
   created: {type: Date, required: true},
   lastLogin: Date,
+  isNewUser: Boolean,
   settings: {
     units: {type: String, default: 'standard'},
     defaultMap: {type: String, default: 'road'},

config/passport.js

@@ -45,16 +45,16 @@ module.exports = (passport) => {
         debug(`User exists. Checking password...`)
 
         // Check password
-        let res = await user.validPassword(password)
+        let correct_password = await user.validPassword(password)
 
         // Password incorrect
-        if (!res) {
+        if (!correct_password) {
           debug(`Incorrect password`)
           return done(null, false, req.flash('warning', 'Incorrect email or password.'))
 
         // Successful login
         } else {
-          if (!user.lastLogin) req.forNewUser = true
+          user.isNewUser = !Boolean(user.lastLogin)
           user.lastLogin = Date.now()
           user.save()
           return done(null, user)

config/routes/auth.js

@@ -21,7 +21,7 @@ module.exports = (app, passport) => {
     req.flash(req.session.flashType, req.session.flashMessage)
     req.session.flashType = undefined
     req.session.flashMessage = undefined
-    res.redirect('/map'+(req.forNewUser)?'/map?new=1':'')
+    res.redirect('/map')
   }
   const appLoginCallback = (req, res, next) => {
     debug('appLoginCallback called.')

config/routes/map.js

@@ -7,11 +7,7 @@ const User = require('../models.js').user
 
 // Redirect to real slug
 router.get('/', mw.ensureAuth, (req, res) => {
-  res.redirect(
-    (req.forNewUser)?
-      `/map/${req.user.slug}?new=1`:
-      `/map/${req.user.slug}`
-  )
+  res.redirect(`/map/${req.user.slug}`)
 })
 
 // Demo

views/map.html

@@ -6,7 +6,7 @@
 	<link href="/static/css/.map.min.css" rel="stylesheet">
 	<style>/* These styles include values passed from to the template from the server.  Other styles are in map.css */
 		{% if noHeader!='0' %} main { top: 0; } {% endif %}
-		
+
 		{% if mapuser.settings.showStreetview and disp=='2' %}
 		/* show both */
 			@media (orientation: landscape) {
@@ -44,42 +44,42 @@
 
 {% block main %}
 
-	{% if user and newuserurl %}
+	{% if user and user.isNewUser %}
 	<div class='page-mask'></div>
 	<div id='welcome' class='popup'>
-	
+
 		<div class='topbar'>
 			<h2>Welcome!</h2>
 			<div class='close' onclick="$('#welcome').hide();$('.page-mask').hide();">✖️</div>
 		</div>
-		
+
 		<p>This is your map.  It's publicly avaliable at <a href="{{newuserurl}}">{{newuserurl}}</a>.  You can change that URL and other settings in <b><a href="/settings">settings</a></b>.  Set your location by clicking <b>set</b> below.  Clear it by clicking <b>clear</b>.  To track your location, click <b>track</b> or download the <a href="/android">android app</a>.  For more information, see the <b><a href="/help">help</a></b> page.  </p>
-		
+
 		<div class='buttons'>
 			<a class='btn main' onclick="$('#welcome').hide();$('.page-mask').hide();">Got it!</a>
 		</div>
-		
+
 	</div>
 	{% endif %}
-	
+
 	<!-- Map -->
 	{% if disp!='1' %}
 		<div id='map'></div>
 	{% endif %}
-	
+
 	<!-- Streetview -->
 	{% if mapuser.settings.showStreetview and disp!='0' %}
 		<div id='view'><img id='viewImg' alt="Streetview image"/></div>
 	{% endif %}
-	
+
 	<div id='notset' class='centered alert alert-warning'>
 		{% if user.id == mapuser.id %}
 			Your location is unset. You can click 'set' below to set it to your current position.
 		{% else %}
-			This user has no location set.  
+			This user has no location set.
 		{% endif %}
 	</div>
-	
+
 	{% if user.id == mapuser.id and mapuser._id != 'demo' %}
 		<link rel="stylesheet" type="text/css" href="/static/css/.controls.min.css">
 		<div id='controls'>
@@ -90,14 +90,14 @@
 				}
 			</style>
 		{% endif %}
-			
+
 			<button id='set-loc' class='btn set' title="Click here to set your location">Set</button>
 			<button id='track-loc' class='btn track' title="Click here to track your location"><i class='fa fa-crosshairs'></i>Track</button>
 			<button id='clear-loc' class='btn clear' title="Click here to clear your location">Clear</button>
-			
+
 		</div>
 	{% endif %}
-	
+
 {% endblock %}
 
 {% block javascript %}
@@ -112,11 +112,11 @@
 			userid = "{{user._id |safe}}",
 			token = "{{user.sk32 |safe}}";
 	</script>
-	
+
 	<!-- Webpacked bundles -->
 	<script type="application/javascript" src="/static/js/.map.bun.js"></script>
 	<!--{% if user.id == mapuser.id %}-->
 		<!--<script type="application/javascript" src="/static/js/.controls.bun.js"></script>-->
 	<!--{% endif %}-->
-	
+
 {% endblock %}

views/password.html

@@ -33,7 +33,7 @@
 		}
 	</style>
 		
-		<p>Your password must be at least 8 characters long.  You can use any letter, number, symbol, emoji, or spaces.  Your password will be checked using <a href="https://github.com/dropbox/zxcvbn">zxcvbn</a>.  All passwords are stored stored on the server as salted hashes.  </p>
+		<p>Your password must be at least 8 characters long.  You can use any letter, number, symbol, emoji, or spaces.  Your password will be checked using <a href="https://github.com/dropbox/zxcvbn">zxcvbn</a>.  All passwords are stored on the server as salted hashes.  </p>
 		
 		<div class='form-group' style="flex-wrap:wrap">
 			<span title="Enter your new password here" style="flex-grow:1; max-width:70vw">