Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
VENKATESHWARAN 2026-02-26 15:45:49 +05:30
commit e3dd26661f
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/RestAuthenticationController.php
View File

@ -648,7 +648,8 @@ class RestAuthenticationController extends AdminController
'function' => $th->getTrace()[0]['function'] ?? null, 'function' => $th->getTrace()[0]['function'] ?? null,
'class' => $th->getTrace()[0]['class'] ?? null, 'class' => $th->getTrace()[0]['class'] ?? null,
]; ];
return $this->respond(['status' => 'failed','code' => 500,'data' => $th, 'error_data' => $errorData],500); log_message('error', 'Error Data: ' . json_encode($errorData));
return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
} }
} }
@ -2345,7 +2346,7 @@ class RestAuthenticationController extends AdminController
} }
$decoded = $result['decoded']; $decoded = $result['decoded'];
$userId = $decoded['id'] ?? null; $userId = $decoded['post_hr_id'] ?? null;
if (!$userId) { if (!$userId) {
return $this->respond([ return $this->respond([

16
app/Filters/AuthJWT.php
View File

@ -115,9 +115,19 @@ class AuthJWT implements FilterInterface
} }
// Refresh sliding expiration // Refresh sliding expiration
$model->update($id, [ $newExpiry = time() + getenv('TOKENTIMEOUT');
'token_time_out' => time() + getenv('TOKENTIMEOUT')
]); if (!isset($decoded['emp_code'])) {
// HR user: refresh token_time_out across all branches (same mobile/email)
// so switching branches doesn't cause an unexpected expiry
$field = !empty($user['mobile']) ? 'mobile' : 'email';
$model->where($field, $user[$field])
->where('contact_type', 'client')
->where('is_active', 1)
->update(null, ['token_time_out' => $newExpiry]);
} else {
$model->update($id, ['token_time_out' => $newExpiry]);
}
return true; return true;
} }

8
app/Helpers/JWTToken.php
View File

@ -136,7 +136,7 @@ class JWTToken
$token = $jwtParts[0]; $token = $jwtParts[0];
try { try {
$decoded = JWT::decode($token, new Key("secret", 'HS512')); $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
return json_encode(['status' => true, 'message' => 'Token is valid', 'data' =>$decoded->data->id ]); return json_encode(['status' => true, 'message' => 'Token is valid', 'data' =>$decoded->data->id ]);
} catch (ExpiredException $e) { } catch (ExpiredException $e) {
return json_encode(['status' => false, 'message' => 'Token has expired']); return json_encode(['status' => false, 'message' => 'Token has expired']);
@ -158,7 +158,7 @@ class JWTToken
$jwtParts = explode(' ', $jwt); $jwtParts = explode(' ', $jwt);
$token = $jwtParts[1]; $token = $jwtParts[1];
$decoded = JWT::decode($token, new Key("secret", 'HS512')); $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
return $decoded->id; return $decoded->id;
} }
@ -169,7 +169,7 @@ class JWTToken
$jwtParts = explode(' ', $jwt); $jwtParts = explode(' ', $jwt);
$token = $jwtParts[1]; $token = $jwtParts[1];
$decoded = JWT::decode($token, new Key("secret", 'HS512')); $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
return $decoded->role; return $decoded->role;
} }
@ -181,7 +181,7 @@ class JWTToken
$jwtParts = explode(' ', $jwt); $jwtParts = explode(' ', $jwt);
$token = $jwtParts[1]; $token = $jwtParts[1];
$decoded = JWT::decode($token, new Key("secret", 'HS512')); $decoded = JWT::decode($token, new Key(env('JWT_SECRET'), 'HS512'));
return $decoded; return $decoded;
} }