"use strict";


/*global nodeca, _*/


var me_in_fields = [
  '_uname',
  'locale'
];


// fetch current user info
// fired before each controllers
nodeca.filters.before('', { weight: -70 }, function load_current_user(params, next) {
  var env = this;

  //
  // fill in default (guest) values
  //

  env.current_user = null;
  env.runtime.user_name = '';
  env.runtime.is_member = false;
  env.runtime.is_guest  = true;

  //
  // if there's no session or session has no user_id, user is guest - skip
  //

  if (!env.session || !env.session.user_id) {
    next();
    return;
  }

  nodeca.models.users.User
    .findOne({ '_id': env.session.user_id })
    .select(me_in_fields.join(' '))
    .setOptions({ lean: true })
    .exec(function(err, user){
      if (err) {
        next(err);
        return;
      }

      // user in session, but db does not know this user
      if (!user) {
        next();
        return;
      }

      env.current_user = user;
      env.runtime.user_name = user._uname;
      env.runtime.is_guest  = false;
      env.runtime.is_member = true;

      // set user's locale
      env.session.locale = user.locale || env.session.locale;

      next();
    });
});

"use strict";


/*global nodeca, _*/


var me_in_fields = [
  '_uname',
  'locale'
];


// fetch current user info
// fired before each controllers
nodeca.filters.before('', { weight: -70 }, function load_current_user(params, next) {
  var env = this;

  //
  // fill in default (guest) values
  //

  env.user = null;
  env.runtime.user_name = '';
  env.runtime.is_member = false;
  env.runtime.is_guest  = true;

  //
  // if there's no session or session has no user_id, user is guest - skip
  //

  if (!env.session || !env.session.user_id) {
    next();
    return;
  }

  nodeca.models.users.User
    .findOne({ '_id': env.session.user_id })
    .select(me_in_fields.join(' '))
    .setOptions({ lean: true })
    .exec(function(err, user){
      if (err) {
        next(err);
        return;
      }

      // user in session, but db does not know this user
      if (!user) {
        next();
        return;
      }

      env.user = user;
      env.runtime.user_name = user._uname;
      env.runtime.is_guest  = false;
      env.runtime.is_member = true;

      next();
    });
});

--- 
+++ 
@@ -19,7 +19,7 @@
   // fill in default (guest) values
   //
 
-  env.current_user = null;
+  env.user = null;
   env.runtime.user_name = '';
   env.runtime.is_member = false;
   env.runtime.is_guest  = true;
@@ -49,14 +49,11 @@
         return;
       }
 
-      env.current_user = user;
+      env.user = user;
       env.runtime.user_name = user._uname;
       env.runtime.is_guest  = false;
       env.runtime.is_member = true;
 
-      // set user's locale
-      env.session.locale = user.locale || env.session.locale;
-
       next();
     });
 });
Rename env.data -> env.current_user; Set locale.
