Skip to content

Commit bcdb426

Browse files
committed
Update SettingsController
1 parent b9bfdcd commit bcdb426

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

app/Http/Controllers/Api/SettingsController.php

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use App\Http\Resources\BlockedAccountResource;
1111
use App\Http\Resources\ProfileResource;
1212
use App\Models\Profile;
13+
use App\Models\User;
1314
use App\Models\UserFilter;
1415
use App\Services\AccountService;
1516
use App\Services\AccountSuggestionService;
@@ -22,6 +23,7 @@
2223
use Illuminate\Support\Facades\Hash;
2324
use Illuminate\Support\Str;
2425
use Illuminate\Validation\Rule;
26+
use Laravel\Passport\Token;
2527
use PragmaRX\Google2FA\Google2FA;
2628

2729
class SettingsController extends Controller
@@ -325,12 +327,10 @@ public function confirmDisableAccount(Request $request)
325327
AccountSuggestionService::removeFromAll($user->profile_id);
326328
AccountService::del($user->profile_id);
327329

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+
});
334334
});
335335

336336
if ($request->hasSession()) {
@@ -367,12 +367,10 @@ public function confirmDeleteAccount(Request $request)
367367
AccountSuggestionService::removeFromAll($user->profile_id);
368368
AccountService::del($user->profile_id);
369369

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+
});
376374
});
377375

378376
if ($request->hasSession()) {

0 commit comments

Comments
 (0)