mirror of
https://github.com/archtechx/tenancy.git
synced 2026-02-04 22:04:03 +00:00
[4.x] Clean up expired impersonation tokens instead of just aborting, add command for cleaning up expired tokens (#1387)
This PR makes the expired/invalid tenant impersonation tokens get deleted instead of just aborting with 403. The PR also adds a command (ClearExpiredImpersonationTokens) used like `php artisan tenants:purge-impersonation-tokens`. As the name suggests, it clears all expired impersonation tokens (= tokens older than `UserImpersonation::$ttl`). Resolves #1348 --------- Co-authored-by: Samuel Štancl <samuel@archte.ch>
This commit is contained in:
parent
469595534e
commit
0dc187510b
4 changed files with 161 additions and 2 deletions
|
|
@ -44,12 +44,20 @@ class UserImpersonation implements Feature
|
|||
|
||||
$tokenExpired = $token->created_at->diffInSeconds(now()) > $ttl;
|
||||
|
||||
abort_if($tokenExpired, 403);
|
||||
if ($tokenExpired) {
|
||||
$token->delete();
|
||||
|
||||
abort(403);
|
||||
}
|
||||
|
||||
$tokenTenantId = (string) $token->getAttribute(Tenancy::tenantKeyColumn());
|
||||
$currentTenantId = (string) tenant()->getTenantKey();
|
||||
|
||||
abort_unless($tokenTenantId === $currentTenantId, 403);
|
||||
if ($tokenTenantId !== $currentTenantId) {
|
||||
$token->delete();
|
||||
|
||||
abort(403);
|
||||
}
|
||||
|
||||
Auth::guard($token->auth_guard)->loginUsingId($token->user_id, $token->remember);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue