tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve github maxi comments.

Browse Source
This commit is contained in:
LautaroCesso 2020-08-18 23:48:06 -03:00
parent e397d45c53
commit e36b984b23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/actions/session-actions.js
View File

@ -54,7 +54,7 @@ export default {
data: { data: {
userId: rememberData.userId, userId: rememberData.userId,
rememberToken: rememberData.token, rememberToken: rememberData.token,
staff: (rememberData.isStaff === "true") ? 1 : 0, staff: rememberData.isStaff,
remember: 1, remember: 1,
} }
}).then((result) => { }).then((result) => {

2
client/src/reducers/session-reducer.js
View File

@ -95,7 +95,7 @@ class SessionReducer extends Reducer {
sessionStore.storeRememberData({ sessionStore.storeRememberData({
token: resultData.rememberToken, token: resultData.rememberToken,
userId: resultData.userId, userId: resultData.userId,
isStaff: resultData.staff, isStaff: resultData.staff ? 1 : 0,
expiration: resultData.rememberExpiration expiration: resultData.rememberExpiration
}); });
} }

13
server/controllers/user/login.php
View File

@ -120,12 +120,15 @@ class LoginController extends Controller {
if($rememberToken) { if($rememberToken) {
$sessionCookie = SessionCookie::getDataStore($rememberToken, 'token'); $sessionCookie = SessionCookie::getDataStore($rememberToken, 'token');
$userId = Controller::request('userId'); $userId = Controller::request('userId');
$isStaff = Controller::request('staff'); $isStaff = !!Controller::request('staff');
$loggedInstance = $isStaff ? $sessionCookie->staff : $sessionCookie->user;
if ((!$sessionCookie->isNull()) && ($userId === $loggedInstance->id) && ($isStaff === $sessionCookie->isStaff)) { if(!$sessionCookie->isNull()) {
$userInstance = $loggedInstance; $loggedInstance = $isStaff ? $sessionCookie->staff : $sessionCookie->user;
$sessionCookie->delete();
if(($userId == $loggedInstance->id) && ($isStaff == $sessionCookie->isStaff)) {
$userInstance = $loggedInstance;
$sessionCookie->delete();
}
} }
} }

1
tests/user/login.rb
View File

@ -89,7 +89,6 @@ describe '/user/login' do
(result['status']).should.equal('success') (result['status']).should.equal('success')
@rememberToken = result['data']['rememberToken'] @rememberToken = result['data']['rememberToken']
puts result['data']
@staffId = result['data']['userId'] @staffId = result['data']['userId']
request('/user/logout', {}) request('/user/logout', {})