|
10 | 10 | use App\Http\Resources\BlockedAccountResource; |
11 | 11 | use App\Http\Resources\ProfileResource; |
12 | 12 | use App\Models\Profile; |
| 13 | +use App\Models\User; |
13 | 14 | use App\Models\UserFilter; |
14 | 15 | use App\Services\AccountService; |
15 | 16 | use App\Services\AccountSuggestionService; |
|
22 | 23 | use Illuminate\Support\Facades\Hash; |
23 | 24 | use Illuminate\Support\Str; |
24 | 25 | use Illuminate\Validation\Rule; |
| 26 | +use Laravel\Passport\Token; |
25 | 27 | use PragmaRX\Google2FA\Google2FA; |
26 | 28 |
|
27 | 29 | class SettingsController extends Controller |
@@ -325,12 +327,10 @@ public function confirmDisableAccount(Request $request) |
325 | 327 | AccountSuggestionService::removeFromAll($user->profile_id); |
326 | 328 | AccountService::del($user->profile_id); |
327 | 329 |
|
328 | | - $tokenIds = $user->tokens()->pluck('id'); |
329 | | - $user->tokens()->update(['revoked' => true]); |
330 | | - |
331 | | - DB::table('oauth_refresh_tokens') |
332 | | - ->whereIn('access_token_id', $tokenIds) |
333 | | - ->update(['revoked' => true]); |
| 330 | + User::find($user->id)->tokens()->each(function (Token $token) { |
| 331 | + $token->revoke(); |
| 332 | + $token->refreshToken?->revoke(); |
| 333 | + }); |
334 | 334 | }); |
335 | 335 |
|
336 | 336 | if ($request->hasSession()) { |
@@ -367,12 +367,10 @@ public function confirmDeleteAccount(Request $request) |
367 | 367 | AccountSuggestionService::removeFromAll($user->profile_id); |
368 | 368 | AccountService::del($user->profile_id); |
369 | 369 |
|
370 | | - $accessTokenIds = $user->tokens()->pluck('id'); |
371 | | - $user->tokens()->update(['revoked' => true]); |
372 | | - |
373 | | - DB::table('oauth_refresh_tokens') |
374 | | - ->whereIn('access_token_id', $accessTokenIds) |
375 | | - ->update(['revoked' => true]); |
| 370 | + User::find($user->id)->tokens()->each(function (Token $token) { |
| 371 | + $token->revoke(); |
| 372 | + $token->refreshToken?->revoke(); |
| 373 | + }); |
376 | 374 | }); |
377 | 375 |
|
378 | 376 | if ($request->hasSession()) { |
|
0 commit comments