Fix login with rememberToken

client/src/actions/session-actions.js

@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 import API from 'lib-app/api-call';
 import AdminDataActions from 'actions/admin-data-actions';
 import sessionStore from 'lib-app/session-store';
@@ -12,7 +14,7 @@ export default {
                 let loginCall = () => {
                     API.call({
                         path: '/user/login',
-                        data: loginData
+                        data: _.extend(loginData, {remember: loginData.remember * 1})
                     }).then((result) => {
                         store.dispatch(this.getUserData(result.data.userId, result.data.token, result.data.staff)).then(() => {
                             if(result.data.staff) {
@@ -48,7 +50,8 @@ export default {
                 data: {
                     userId: rememberData.userId,
                     rememberToken: rememberData.token,
-                    isAutomatic: true
+                    remember: 1,
+                    isAutomatic: 1
                 }
             }).then((result) => {
                 store.dispatch(this.getUserData(result.data.userId, result.data.token));

client/src/app/admin/panel/tickets/admin-panel-new-tickets.js

@@ -12,13 +12,14 @@ import Message from 'core-components/message';
 class AdminPanelNewTickets extends React.Component {
 
     static defaultProps = {
+        page: 1,
         userId: 0,
         departments: [],
         tickets: []
     };
 
     componentDidMount() {
-        this.retrieveNewTickets()
+        this.retrieveNewTickets();
     }
 
     render() {

client/src/reducers/session-reducer.js

@@ -103,9 +103,9 @@ class SessionReducer extends Reducer {
 
     onUserDataRetrieved(state, payload) {
         let userData = payload.data;
-        
+
         sessionStore.storeUserData(payload.data);
-        
+
         return _.extend({}, state, {
             staff: userData.staff,
             userName: userData.name,
@@ -117,11 +117,11 @@ class SessionReducer extends Reducer {
             userSendEmailOnNewTicket: userData.sendEmailOnNewTicket * 1
         });
     }
-    
+
     onSessionChecked(state) {
         let userData = sessionStore.getUserData();
         let userId = sessionStore.getSessionData().userId;
-        
+
         return _.extend({}, state, {
             initDone: true,
             logged: true,
@@ -144,4 +144,4 @@ class SessionReducer extends Reducer {
     }
 }
 
-export default SessionReducer.getInstance();
+export default SessionReducer.getInstance();

server/controllers/system/get-logs.php

@@ -50,6 +50,8 @@ class GetLogsController extends Controller {
         $removeOlderThanDays = 31;
         $oldDate = floor(Date::getPreviousDate($removeOlderThanDays) / 10000);
 
-        RedBean::exec("DELETE FROM log WHERE date < $oldDate");
+        try {
+            RedBean::exec("DELETE FROM log WHERE date < $oldDate");
+        } catch(Exception $e) {}
     }
 }

server/controllers/user/login.php

@@ -1,4 +1,5 @@
 <?php
+use RedBeanPHP\Facade as RedBean;
 
 /**
  * @api {post} /user/login Login
@@ -39,6 +40,7 @@ class LoginController extends Controller {
 
     private $userInstance;
     private $rememberToken;
+    private $rememberExpiration;
 
     public function validations() {
         return [
@@ -56,6 +58,8 @@ class LoginController extends Controller {
             throw new Exception(ERRORS::SESSION_EXISTS);
         }
 
+        $this->clearOldRememberTokens();
+
         if ($this->checkInputCredentials() || $this->checkRememberToken()) {
             if($this->userInstance->verificationToken !== null) {
                 throw new Exception(ERRORS::UNVERIFIED_USER);
@@ -66,7 +70,7 @@ class LoginController extends Controller {
             }
 
             $this->createUserSession();
-            $this->createSessionCookie();
+            $this->createRememberToken();
             if(Controller::request('staff')) {
                 $this->userInstance->lastLogin = Date::getCurrentDate();
                 $this->userInstance->store();
@@ -106,7 +110,8 @@ class LoginController extends Controller {
             'userEmail' => $userInstance->email,
             'staff' => Controller::request('staff'),
             'token' => Session::getInstance()->getToken(),
-            'rememberToken' => $this->rememberToken
+            'rememberToken' => $this->rememberToken,
+            'rememberExpiration' => $this->rememberExpiration
         );
     }
 
@@ -138,18 +143,30 @@ class LoginController extends Controller {
         return $userInstance;
     }
 
-    private function createSessionCookie() {
+    private function clearOldRememberTokens() {
-        $remember =  Controller::request('remember');
+        $currentDate = Date::getCurrentDate();
+
+        try {
+            RedBean::exec("DELETE FROM sessioncookie WHERE expiration_date < $currentDate");
+        } catch(Exception $e) {}
+    }
+
+    private function createRememberToken() {
+        $remember = Controller::request('remember');
+
         if ($remember) {
             $this->rememberToken = Hashing::generateRandomToken();
+            $this->rememberExpiration = Date::getNextDate(30);
 
             $sessionCookie = new SessionCookie();
             $sessionCookie->setProperties(array(
                 'user' => $this->userInstance,
                 'token' => $this->rememberToken,
                 'ip' => $_SERVER['REMOTE_ADDR'],
-                'creationDate' =>  date('d-m-Y (H:i:s)')
+                'creationDate' =>  Date::getCurrentDate(),
+                'expirationDate' => $this->rememberExpiration
             ));
+
             $sessionCookie->store();
         }
     }

server/libs/Date.php

@@ -7,4 +7,8 @@ class Date {
     public static function getPreviousDate($days = 1) {
         return date('YmdHi', strtotime(" -$days day "));
     }
+
+    public static function getNextDate($days = 1) {
+        return date('YmdHi', strtotime(" +$days day "));
+    }
 }

server/tests/__mocks__/RedBeanMock.php

@@ -10,6 +10,7 @@ namespace RedBeanPHP {
             self::setStatics(array(
                 'trash' => parent::stub(),
                 'store' => parent::stub(),
+                'exec' => parent::stub(),
                 'dispense' => parent::stub()->returns(new \BeanMock())
             ));
         }

server/tests/controllers/user/loginTest.php

@@ -8,6 +8,7 @@ include_once 'tests/__mocks__/SessionMock.php';
 include_once 'tests/__mocks__/UserMock.php';
 include_once 'tests/__mocks__/HashingMock.php';
 include_once 'tests/__mocks__/SessionCookieMock.php';
+include_once 'tests/__mocks__/RedBeanMock.php';
 include_once 'data/ERRORS.php';
 
 use PHPUnit\Framework\TestCase;
@@ -43,7 +44,8 @@ class LoginControllerTest extends TestCase {
             'userEmail' => 'MOCK_EMAIL',
             'staff' => false,
             'token' => 'TEST_TOKEN',
-            'rememberToken' => null
+            'rememberToken' => null,
+            'rememberExpiration' => Date::getNextDate(30)
         )));
     }
 

tests/user/login.rb

@@ -44,28 +44,38 @@ describe '/user/login' do
         (result['data']['staff']).should.equal('true')
     end
 
-    it 'should return remember token' do
+    it 'should work with remember token' do
         request('/user/logout', {})
         result = request('/user/login', {
             email: @loginEmail,
             password: @loginPass,
-            remember: true
+            remember: 1
         })
 
         (result['status']).should.equal('success')
 
         @rememberToken = result['data']['rememberToken']
-        @userid = result['data']['userId']
+        @userId = result['data']['userId']
-    end
 
-    it 'should login with token' do
         request('/user/logout', {})
         result = request('/user/login', {
-            rememberToken: @rememberToken,
+            userId: @userId,
-            userId: @userid
+            rememberToken: '12abc',
+            remember: 1
         })
+        (result['status']).should.equal('fail')
+        result = request('/user/login', {
+            userId: 1,
+            rememberToken: @rememberToken,
+            remember: 1
+        })
+        (result['status']).should.equal('fail')
 
+        result = request('/user/login', {
+            userId: @userId,
+            rememberToken: @rememberToken,
+            remember: 1
+        })
         (result['status']).should.equal('success')
-        (result['data']['userId']).should.equal(@userid)
     end
 end