email verification review

app/Http/Controllers/User/AccountController.php

@@ -1,11 +1,14 @@
 <?php
+
 namespace App\Http\Controllers\User;
 
 use App\Models\User;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use App\Services\DemoService;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\UserResource;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Resources\InvoiceCollection;
 use Illuminate\Support\Facades\Validator;
@@ -13,6 +16,7 @@ use App\Http\Resources\UserStorageResource;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use App\Http\Requests\User\UpdateUserPasswordRequest;
 use App\Http\Requests\User\UserCreateAccessTokenRequest;
+use Illuminate\Support\Str;
 use Laravel\Sanctum\PersonalAccessToken;
 
 class AccountController extends Controller
@@ -73,8 +77,8 @@ class AccountController extends Controller
         // TODO: pridat validator do requestu
         $validator = Validator::make($request->all(), [
             'avatar' => 'sometimes|file',
-            'name' => 'string',
-            'value' => 'string',
+            'name'   => 'string',
+            'value'  => 'string',
         ]);
 
         // Return error
@@ -131,10 +135,8 @@ class AccountController extends Controller
 
     /**
      * Get all user tokens
-     * 
-     * @return Collection
      */
-    public function tokens_index()
+    public function tokens(): Response
     {
         return response(
             Auth::user()->tokens()->get(),
@@ -142,35 +144,30 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * Create token
-     * 
-     * @param Request $request
-     * @return Collection
-     */
-    public function create_token(UserCreateAccessTokenRequest $request)
+    public function create_token(UserCreateAccessTokenRequest $request): Response
     {
         // Check if is demo
-        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
+        abort_if(is_demo_account('howdy@hi5ve.digital'), 201, [
+            "name"           => "token",
+            "token"          => Str::random(40),
+            "abilities"      => '["*"]',
+            "tokenable_id"   => Str::uuid(),
+            "updated_at"     => now(),
+            "created_at"     => now(),
+            "id"             => Str::random(40),
+        ]);
 
-        return response(
-            Auth::user()->createToken($request->input('name')),
-            201
-        );
+        $token = Auth::user()->createToken($request->input('name'));
+
+        return response($token, 201);
     }
 
-     /**
-     * Revoke token
-     * 
-     * @param $id
-     * @return  ResponseFactory|\Illuminate\Http\Response
-     */
-    public function revoke_token(PersonalAccessToken $token)
+    public function revoke_token(PersonalAccessToken $token): Response
     {
         // Check if is demo
-        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
+        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Deleted!');
 
-        if(Auth::user()->id !== $token->tokenable_id) {
+        if (Auth::id() !== $token->tokenable_id) {
             return response('Unauthorized', 401);
         }
 
@@ -179,43 +176,31 @@ class AccountController extends Controller
         return response('Deleted!', 204);
     }
 
-    /**
-     * Email verification
-     *
-     * @param Request $request
-     * @param User $user
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    public function email_verify($id, Request $request)
+    public function email_verification(string $id, Request $request): RedirectResponse|Response
     {
         if (!$request->hasValidSignature()) {
-            return response("Invalid/Expired url provided.", 401);
+            return response("Invalid or expired url provided.", 401);
         }
 
         $user = User::find($id);
-        
+
         if (!$user->hasVerifiedEmail()) {
             $user->markEmailAsVerified();
         }
-    
+
         return redirect()->to('/successfully-verified');
     }
 
-     /**
-     * Resend verification email
-     *
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    public function resend_verify_email(Request $request) 
+    public function resend_verification_email(Request $request): Response
     {
         $user = User::whereEmail($request->input('email'))->first();
 
         if ($user->hasVerifiedEmail()) {
-            return response("Email already verified.", 204);
+            return response("Email was already verified.", 204);
         }
-    
+
         $user->sendEmailVerificationNotification();
-    
-        return response("Email verification link sent on your email", 200);
+
+        return response("Email verification link sent to your email", 204);
     }
 }