fixed error on admin/login

sails/Vagrantfile

@@ -17,4 +17,6 @@ Vagrant.configure(2) do |config|
   config.vm.provision "shell", path: "install.sh"
   config.vm.provision "shell", path: "install.sh"
   config.vm.provision "shell", path: "pictoload.sh"
   config.vm.provision "shell", path: "pictoload.sh"
   config.vm.provision "shell", path: "bootstrap.sh", run: "always"
   config.vm.provision "shell", path: "bootstrap.sh", run: "always"
+
+  config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
 end
 end

sails/src/api/controllers/AdminController.js

@@ -23,13 +23,13 @@ module.exports = {
       // if found, check password in encrypted form
       // if found, check password in encrypted form
 	    bcrypt.compare(password, admin.password, function (err, match) {
 	    bcrypt.compare(password, admin.password, function (err, match) {
       	if (err)
       	if (err)
-          	return res.serverError('Server error' + err);
+      	  return res.serverError('Server error' + err);
         if (!match) // password do not match
         if (!match) // password do not match
-  	        return res.unauthorized('Invalid password');
+  	      return res.unauthorized('Invalid password');
 
 
     	  // credentials are valid, return token with max life span
     	  // credentials are valid, return token with max life span
-		var returned_admin = (JSON.parse(JSON.stringify(admin)));
-		delete returned_admin.password;
+		    var returned_admin = (JSON.parse(JSON.stringify(admin)));
+		    delete returned_admin.password;
       	return res.ok({
       	return res.ok({
       		token: sailsTokenAuth.issueToken({'isAdmin': true, 'email': email}, sails.config.jwt.expiresInMinutes),
       		token: sailsTokenAuth.issueToken({'isAdmin': true, 'email': email}, sails.config.jwt.expiresInMinutes),
           user: returned_admin
           user: returned_admin

sails/src/assets/scripts/modules/admin/controllers/login.js

@@ -3,7 +3,7 @@
 //------------------
 //------------------
 // Login Controller
 // Login Controller
 //------------------
 //------------------
-dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope, $http, $window, $translate, $location, config, ngToast) {
+dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope, $rootScope, $http, $window, $translate, $location, config, ngToast) {
   // The last parameter, config, is injected from config.js (defined in dashboardConfig module)
   // The last parameter, config, is injected from config.js (defined in dashboardConfig module)
 
 
   $scope.credentials = {
   $scope.credentials = {
@@ -18,6 +18,7 @@ dashboardControllers.controller('LoginAdminCtrl', function LoginAdminCtrl($scope
       // Save token, user data in sessionStorage
       // Save token, user data in sessionStorage
       $window.sessionStorage.token = data.token;
       $window.sessionStorage.token = data.token;
       $window.sessionStorage.user = JSON.stringify(data.user);
       $window.sessionStorage.user = JSON.stringify(data.user);
+      $rootScope.user = data.user;
 
 
       // Redirect to admin panel
       // Redirect to admin panel
       $location.path('/admin/licenses');
       $location.path('/admin/licenses');