Fix admin suspend/unsuspend logic

Author: dansup

app/Http/Controllers/Api/AdminController.php

@@ -235,6 +235,7 @@ public function profileShow(Request $request, $id)
             $res['is_admin'] = (bool) $user->is_admin;
             $res['email'] = $user->email;
             $res['email_verified'] = (bool) $user->email_verified_at;
+            $res['delete_after'] = $user->delete_after;
         }
         $res['comments_count'] = Comment::whereProfileId($profile->id)->count();
         $res['comment_replies_count'] = CommentReply::whereProfileId($profile->id)->count();
@@ -301,6 +302,9 @@ public function profileSuspend(Request $request, $id)
         $profile->update(['status' => 6]);
 
         if ($profile->local) {
+            DB::table('oauth_access_tokens')->where('user_id', $profile->user_id)->delete();
+            DB::table('oauth_auth_codes')->where('user_id', $profile->user_id)->delete();
+            DB::table('sessions')->where('user_id', $profile->user_id)->delete();
             $profile->user->update(['status' => 6]);
         }
 

app/Http/Resources/AdminProfileResource.php

@@ -30,6 +30,12 @@ public function toArray(Request $request): array
             $avatarUrl = AvatarService::remote($this->id);
         }
 
+        $deleteAfter = null;
+
+        if ($this->local && $this->status === 8) {
+            $deleteAfter = $this->user->delete_after;
+        }
+
         return [
             'id' => (string) $this->id,
             'name' => $this->name ?? 'user'.$this->id,
@@ -53,6 +59,7 @@ public function toArray(Request $request): array
             'can_like' => $this->can_like,
             'can_comment' => $this->can_comment,
             'can_follow' => $this->can_follow,
+            'delete_after' => $deleteAfter,
             'created_at' => $this->created_at->format('c'),
         ];
     }

routes/api.php

@@ -251,6 +251,8 @@
         Route::get('/profiles/{id}', [AdminController::class, 'profileShow'])->middleware('auth:web,api');
         Route::post('/profiles/{id}/permissions', [AdminController::class, 'profilePermissionUpdate'])->middleware('auth:web,api');
         Route::post('/profiles/{id}/admin_note', [AdminController::class, 'profileAdminNoteUpdate'])->middleware('auth:web,api');
+        Route::post('/profiles/{id}/suspend', [AdminController::class, 'profileSuspend'])->middleware('auth:web,api');
+        Route::post('/profiles/{id}/unsuspend', [AdminController::class, 'profileUnsuspend'])->middleware('auth:web,api');
         Route::get('/settings', [AdminSettingsController::class, 'index'])->middleware('auth:web,api');
         Route::put('/settings', [AdminSettingsController::class, 'update'])->middleware('auth:web,api');
         Route::post('/settings/update-logo', [AdminSettingsController::class, 'updateLogo'])->middleware('auth:web,api');