email verification review

app/Actions/Fortify/CreateNewUser.php

@@ -1,106 +0,0 @@
-<?php
-namespace App\Actions\Fortify;
-
-use App\Models\User;
-use App\Models\Setting;
-use App\Models\UserSettings;
-use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Contracts\Auth\StatefulGuard;
-use Laravel\Fortify\Contracts\CreatesNewUsers;
-use Laravel\Fortify\Contracts\RegisterResponse;
-
-class CreateNewUser implements CreatesNewUsers
-{
-    use PasswordValidationRules;
-
-    /**
-     * The guard implementation.
-     *
-     * @var \Illuminate\Contracts\Auth\StatefulGuard
-     */
-    protected $guard;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @param  \Illuminate\Contracts\Auth\StatefulGuard  $guard
-     * @return void
-     */
-    public function __construct(StatefulGuard $guard)
-    {
-        $this->guard = $guard;
-    }
-
-    /**
-     * Validate and create a newly registered user.
-     *
-     * @param array $input
-     * @return \App\Models\User
-     */
-    public function create(array $input)
-    {
-        $settings = Setting::whereIn('name', ['storage_default', 'registration'])
-            ->pluck('value', 'name');
-
-        // Check if account registration is enabled
-        if (! intval($settings['registration'])) {
-            abort(401);
-        }
-
-        Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => [
-                'required',
-                'string',
-                'email',
-                'max:255',
-                Rule::unique(User::class),
-            ],
-            'password' => $this->passwordRules(),
-        ])->validate();
-
-        $user = User::create([
-            'email' => $input['email'],
-            'password' => bcrypt($input['password']),
-        ]);
-
-        UserSettings::unguard();
-
-        $user
-            ->settings()
-            ->create([
-                'name' => $input['name'],
-                'storage_capacity' => $settings['storage_default'],
-            ]);
-
-        if(!get_setting('user_verification')) {
-            $user->markEmailAsVerified();
-        }
-        
-        UserSettings::reguard();
-
-        return $user;
-    }
-    
-    /**
-     * Create a new registered user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Laravel\Fortify\Contracts\CreatesNewUsers  $creator
-     * @return \Laravel\Fortify\Contracts\RegisterResponse
-     */
-    public function store(Request $request,
-                          CreatesNewUsers $creator): RegisterResponse
-    {
-        event(new Registered($user = $creator->create($request->all())));
-
-        if(! get_setting('user_verification')) {
-            $this->guard->login($user);
-        };
-
-        return app(RegisterResponse::class);
-    }
-}

app/Actions/Fortify/CreateNewUserAction.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Models\Setting;
+use App\Models\UserSettings;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Validation\Rule;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Contracts\Auth\StatefulGuard;
+
+class CreateNewUserAction extends Controller
+{
+    use PasswordValidationRules;
+
+    public function __construct(
+        protected StatefulGuard $guard
+    ) {}
+
+    /**
+     * Validate and create a newly registered user.
+     */
+    public function __invoke(Request $request): Response
+    {
+        $settings = Setting::whereIn('name', [
+            'storage_default', 'registration'
+        ])
+            ->pluck('value', 'name');
+
+        // Check if account registration is enabled
+        if (!intval($settings['registration'])) {
+            abort(401);
+        }
+
+        Validator::make($request->all(), [
+            'name'     => ['required', 'string', 'max:255'],
+            'email'    => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique(User::class),
+            ],
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        $user = User::create([
+            'email'    => $request->email,
+            'password' => bcrypt($request->password),
+        ]);
+
+        UserSettings::unguard();
+
+        $user
+            ->settings()
+            ->create([
+                'name'             => $request->name,
+                'storage_capacity' => $settings['storage_default'],
+            ]);
+
+        if (!get_setting('user_verification')) {
+            $user->markEmailAsVerified();
+        }
+
+        UserSettings::reguard();
+
+        event(new Registered($user));
+
+        if (!get_setting('user_verification')) {
+            $this->guard->login($user);
+        }
+
+        return response('User registered successfully', 201);
+    }
+}

app/Console/Kernel.php

@@ -43,7 +43,7 @@ class Kernel extends ConsoleKernel
 
         $schedule->call(function () use ($scheduler) {
             $scheduler->delete_unverified_users();
-        })->everySixHours();
+        })->daily();
 
         // Run queue jobs every minute
         $schedule->command('queue:work --stop-when-empty')

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 class ForgotPasswordController extends Controller
 {

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);
     }
 }

app/Providers/FortifyServiceProvider.php

@@ -3,7 +3,7 @@ namespace App\Providers;
 
 use Illuminate\Http\Request;
 use Laravel\Fortify\Fortify;
-use App\Actions\Fortify\CreateNewUser;
+use App\Actions\Fortify\CreateNewUserAction;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Cache\RateLimiting\Limit;
 use App\Actions\Fortify\ResetUserPassword;
@@ -29,7 +29,6 @@ class FortifyServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Fortify::createUsersUsing(CreateNewUser::class);
         Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);
         Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
         Fortify::resetUserPasswordsUsing(ResetUserPassword::class);

app/Providers/RouteServiceProvider.php

@@ -13,7 +13,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $namespace = 'App\Http\Controllers';
+    protected $namespace = null;
 
     /**
      * The path to the "home" route for your application.
@@ -22,16 +22,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     public const HOME = '/home';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
-    }
-
     /**
      * Define the routes for the application.
      *

app/Services/SchedulerService.php

@@ -77,17 +77,13 @@ class SchedulerService
     }
 
     /**
-     * Delete unverified users older as 30 days
+     * Delete unverified users older than 30 days
      */
     public function delete_unverified_users(): void
     {
-        User::where('created_at', '<=', now()->subDay(30)->toDateString())
+        User::where('created_at', '<=', now()->subDays(30)->toDateString())
             ->where('email_verified_at', null)
             ->get()
-            ->each(function ($user) {
-
-                // Delete users
-                $user->delete();
-            });
+            ->each(fn ($user) => $user->delete());
     }
 }