Merge pull request #416 from not-an-aardvark/session_state_info

Improved logging and add correct timezone

api/controllers/AuthController.js

@@ -46,17 +46,18 @@ module.exports = {
   },
 
   callback: function (req, res) {
-    if (req.query.state !== req.session.state) {
-      console.log("Warning: A user was redirected to the reddit callback, but did not have a valid session state.");
-      return res.forbidden();
-    }
     passport.authenticate('reddit',
       {
         state: req.session.state,
         duration: 'permanent',
         failureRedirect: '/login'
       },
       function (err, user) {
+        if (req.query.state !== req.session.state) {
+          console.log("Warning: A user was redirected to the reddit callback, but does not have a valid session state.");
+          console.log("The code in the request belongs to /u/" + user.name + '.');
+          return res.forbidden();
+        }
         var url = req.session.redirectUrl ? req.session.redirectUrl : '/';
         req.session.redirectUrl = "";
         req.logIn(user, function (err) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "FlairHQ",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A project to allow easy adding of flair applications for subreddits (focusing initially on /r/pokemontrades) and easy moderation for moderators.",
   "scripts": {
     "start": "node ./node_modules/sails/bin/sails.js lift"

views/search/logs.ejs

@@ -30,7 +30,7 @@
                 /u/{{result.user}}
               </h4>
               <p class="list-group-iitem-text">
-                {{result.content}}. {{result.createdAt | date:'yyyy-MM-dd HH:mm:ss'}} UTC
+                {{result.content}}. {{result.createdAt | date:'yyyy-MM-dd HH:mm:ss UTCZ'}}
               </p>
             </a>
             <a class="list-group-item" ng-if="!searching"