Merge pull request #324 from cretueusebiu/next

Next

Author: superdevops233

.github/workflows/tests.yml

@@ -63,7 +63,7 @@ jobs:
         run: npm install --no-audit --no-progress --silent
 
       - name: Build client
-        run: npm run production
+        run: npm run build
 
       - name: Upgrade Chrome driver
         run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.0.0 - 2021-08-14
+
+- Upgrade to Bootstrap 5
+- Upgrade to Mix 6
+- Update dependencies
+
 ## 5.0.3 - 2021-05-13
 
 - Added modal with server error.

README.md

@@ -18,7 +18,7 @@
 - Login, register, email verification and password reset
 - Authentication with JWT
 - Socialite integration
-- Bootstrap 4 + Font Awesome 5
+- Bootstrap 5 + Font Awesome 5
 
 ## Installation
 
@@ -33,17 +33,13 @@
 #### Development
 
 ```bash
-# Build and watch
-npm run watch
-
-# Serve with hot reloading (not working)
-npm run hot
+npm run dev
 ```
 
 #### Production
 
 ```bash
-npm run production
+npm run build
 ```
 
 ## Socialite

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -12,8 +12,6 @@ class ForgotPasswordController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -22,24 +20,16 @@ public function __construct()
 
     /**
      * Get the response for a successful password reset link.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetLinkResponse(Request $request, $response)
+    protected function sendResetLinkResponse(Request $request, string $response)
     {
-        return ['status' => trans($response)];
+        return response()->json(['status' => trans($response)]);
     }
 
     /**
      * Get the response for a failed password reset link.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetLinkFailedResponse(Request $request, $response)
+    protected function sendResetLinkFailedResponse(Request $request, string $response)
     {
         return response()->json(['email' => trans($response)], 400);
     }

app/Http/Controllers/Auth/LoginController.php

@@ -15,8 +15,6 @@ class LoginController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -25,11 +23,8 @@ public function __construct()
 
     /**
      * Attempt to log the user into the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return bool
      */
-    protected function attemptLogin(Request $request)
+    protected function attemptLogin(Request $request): bool
     {
         $token = $this->guard()->attempt($this->credentials($request));
 
@@ -49,9 +44,6 @@ protected function attemptLogin(Request $request)
 
     /**
      * Send the response after the user was authenticated.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\JsonResponse
      */
     protected function sendLoginResponse(Request $request)
     {
@@ -69,15 +61,11 @@ protected function sendLoginResponse(Request $request)
 
     /**
      * Get the failed login response instance.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\JsonResponse
-     *
-     * @throws \Illuminate\Validation\ValidationException
      */
     protected function sendFailedLoginResponse(Request $request)
     {
         $user = $this->guard()->user();
+
         if ($user instanceof MustVerifyEmail && ! $user->hasVerifiedEmail()) {
             throw VerifyEmailException::forUser($user);
         }
@@ -89,12 +77,11 @@ protected function sendFailedLoginResponse(Request $request)
 
     /**
      * Log the user out of the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
     public function logout(Request $request)
     {
         $this->guard()->logout();
+
+        return response()->json(null, 204);
     }
 }

app/Http/Controllers/Auth/OAuthController.php

@@ -7,6 +7,7 @@
 use App\Models\OAuthProvider;
 use App\Models\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Laravel\Socialite\Contracts\User as SocialiteUser;
 use Laravel\Socialite\Facades\Socialite;
 
 class OAuthController extends Controller
@@ -15,8 +16,6 @@ class OAuthController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -27,24 +26,18 @@ public function __construct()
 
     /**
      * Redirect the user to the provider authentication page.
-     *
-     * @param  string $provider
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function redirect($provider)
+    public function redirect(string $provider)
     {
-        return [
+        return response()->json([
             'url' => Socialite::driver($provider)->stateless()->redirect()->getTargetUrl(),
-        ];
+        ]);
     }
 
     /**
      * Obtain the user information from the provider.
-     *
-     * @param  string $driver
-     * @return \Illuminate\Http\Response
      */
-    public function handleCallback($provider)
+    public function handleCallback(string $provider)
     {
         $user = Socialite::driver($provider)->stateless()->user();
         $user = $this->findOrCreateUser($provider, $user);
@@ -61,11 +54,9 @@ public function handleCallback($provider)
     }
 
     /**
-     * @param  string $provider
-     * @param  \Laravel\Socialite\Contracts\User $sUser
-     * @return \App\Models\User
+     * Find or create a user.
      */
-    protected function findOrCreateUser($provider, $user)
+    protected function findOrCreateUser(string $provider, SocialiteUser $user): User
     {
         $oauthProvider = OAuthProvider::where('provider', $provider)
             ->where('provider_user_id', $user->getId())
@@ -88,11 +79,9 @@ protected function findOrCreateUser($provider, $user)
     }
 
     /**
-     * @param  string $provider
-     * @param  \Laravel\Socialite\Contracts\User $sUser
-     * @return \App\Models\User
+     * Create a new user.
      */
-    protected function createUser($provider, $sUser)
+    protected function createUser(string $provider, SocialiteUser $sUser): User
     {
         $user = User::create([
             'name' => $sUser->getName(),

app/Http/Controllers/Auth/RegisterController.php

@@ -15,8 +15,6 @@ class RegisterController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -25,10 +23,6 @@ public function __construct()
 
     /**
      * The user has been registered.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\User  $user
-     * @return \Illuminate\Http\JsonResponse
      */
     protected function registered(Request $request, User $user)
     {
@@ -41,9 +35,6 @@ protected function registered(Request $request, User $user)
 
     /**
      * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
     {
@@ -56,11 +47,8 @@ protected function validator(array $data)
 
     /**
      * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return \App\User
      */
-    protected function create(array $data)
+    protected function create(array $data): User
     {
         return User::create([
             'name' => $data['name'],

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -12,8 +12,6 @@ class ResetPasswordController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -22,24 +20,16 @@ public function __construct()
 
     /**
      * Get the response for a successful password reset.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetResponse(Request $request, $response)
+    protected function sendResetResponse(Request $request, string $response)
     {
         return ['status' => trans($response)];
     }
 
     /**
      * Get the response for a failed password reset.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetFailedResponse(Request $request, $response)
+    protected function sendResetFailedResponse(Request $request, string $response)
     {
         return response()->json(['email' => trans($response)], 400);
     }

app/Http/Controllers/Auth/UserController.php

@@ -9,9 +9,6 @@ class UserController extends Controller
 {
     /**
      * Get authenticated user.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse
      */
     public function current(Request $request)
     {

app/Http/Controllers/Auth/VerificationController.php

@@ -13,8 +13,6 @@ class VerificationController extends Controller
 {
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -23,10 +21,6 @@ public function __construct()
 
     /**
      * Mark the user's email address as verified.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \App\User $user
-     * @return \Illuminate\Http\JsonResponse
      */
     public function verify(Request $request, User $user)
     {
@@ -53,9 +47,6 @@ public function verify(Request $request, User $user)
 
     /**
      * Resend the email verification notification.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse
      */
     public function resend(Request $request)
     {