Changeset 1c25bcf for app

Timestamp:

10/25/21 21:49:53 (3 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

develop, master

Children:

e756bd9

Parents:

05e57e2

Message:

added 2fa, bug fixes, edited blades

Location:

app

Files:

• Http/Controllers/Auth/ForgotPasswordController.php (modified) (2 diffs)
• Http/Controllers/Auth/LoginController.php (modified) (2 diffs)
• Http/Controllers/Auth/VerifyLoginController.php (added)
• Http/Controllers/Auth/VerifyNewEmailController.php (deleted)
• Http/Kernel.php (modified) (1 diff)
• Http/Middleware/CheckVerifyToken.php (added)
• Models/User.php (modified) (2 diffs)
• Notifications/VerifyUser.php (moved) (moved from app/Notifications/VerifyNewEmail.php ) (5 diffs)
• Services/Hashid.php (added)

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Auth;
 
+use App\Helpers\Alert;
 use App\Http\Requests\Auth\ForgotPasswordRequest;
 use App\Models\User;
@@ -33 +34 @@
         $user->notify(new ForgotPassword($user));
 
-        $request->session()->flash("forgotInfo", "We have sent an email to your inbox.");
+        Alert::flash( "We have sent an email to your inbox", "error");
 
         return redirect()->route("auth.forgotShow");

app/Http/Controllers/Auth/LoginController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Auth;
 
+use App\Helpers\Alert;
 use App\Http\Requests\Auth\LoginRequest;
 use App\Models\User;
 use App\Http\Controllers\Controller;
+use App\Notifications\VerifyUser;
+use App\Services\Hashid;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 class LoginController extends Controller
 {
-    protected $redirectTo = '/dashboard';
+    protected $redirectTo = '/';
 
     public function __construct()
@@ -22 +26 @@
     }
 
-    public function login(LoginRequest $request)
+    public function login(LoginRequest $request, Hashid $hashid)
     {
         $user = User::whereUsername($request->username)->first();
 
+        if (is_null($user)) {
+            Alert::flash("Please check your credentials", "error");
+            return redirect()->route("auth.login");
+        }
+
         if (!$user->is_active) {
-            $request->session()->flash("isActiveError", "Your account is blocked or its not confirmed yet. Please contact with your system administrator or check your email.");
-            return redirect()->back();
+            Alert::flash("Your account is blocked or its not confirmed yet. Please contact with your system administrator or check your email.", "error");
+            return redirect()->route("auth.login");
         }
 
         if (!Hash::check($request->password, $user->password)) {
-            $request->session()->flash("passwordError", "Your password is incorrect");
-            return redirect()->back()->withInput($request->input());
+            Alert::flash("Your password is incorrect", "error");
+            return redirect()->route("auth.login");
         }
 
-        if (auth()->attempt([
-            "username" => $request->username,
-            "password" => $request->password,
-            "is_active" => true], $request->remember)) {
-
-            $user->is_online = true;
-            $user->save();
-
-            return redirect()->intended('/dashboard');
-        }
-
+        //$user->security_code = rand(10000, 99999);
         if ($user->is_forgot_password) {
             $user->is_forgot_password = false;
         }
 
-        $request->session()->flash("loginError", "An error occurred while login. Please try again later.");
+            $user->security_code = 1234;
+            $user->verify_token = Str::uuid();
+            $user->is_online = true;
+            $user->save();
 
-        return redirect()->back()->withInput($request->input());
+            $user->notify(new VerifyUser($user));
+
+            return redirect()->route("verify-login.index", [
+                "id" => $hashid->encode($user->id),
+                "token" => $user->verify_token
+            ]);
     }
 

app/Http/Kernel.php

@@ -71 +71 @@
         'permission' => \App\Http\Middleware\CheckPermission::class,
         'checkIsActive' => \App\Http\Middleware\CheckIsActive::class,
+        'CheckVerifyToken' => \App\Http\Middleware\CheckVerifyToken::class
     ];
 }

app/Models/User.php

@@ -28 +28 @@
         "password",
         "avatar",
-        "role_id"
+        "role_id",
+        "security_code",
+        "verify_token"
     ];
 
@@ -39 +41 @@
         "password",
         "remember_token",
-        "is_active"
+        "is_active",
+        "verify_token",
+        "security_code"
     ];
 

app/Notifications/VerifyUser.php

@@ -3 +3 @@
 namespace App\Notifications;
 
+use App\Models\Company;
 use App\Models\User;
+use App\Services\Hashid;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
 
-class VerifyNewEmail extends Notification
+class VerifyUser extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    private $user;
+    protected $user;
 
     /**
@@ -27 +30 @@
      * Get the notification's delivery channels.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
@@ -38 +41 @@
      * Get the mail representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
+        $hashId = new Hashid();
+
         return (new MailMessage)
-            ->greeting("Hello " . $this->user->name)
-            ->line("To verify your new email click the button.")
+            ->greeting("Login verification")
+            ->line("To verify click the button and enter your security code.")
             ->line("Your security code is: " . $this->user->security_code)
-            ->action("Verify", url("/auth/verify/" . $this->user->id . "/" . $this->user->verify_token));
+            ->action("Verify", route("verify-login.index", [
+                "id" => $hashId->encode($this->user->id),
+                "token" => $this->user->verify_token
+            ]));
     }
 
@@ -53 +61 @@
      * Get the array representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
@@ -62 +70 @@
         ];
     }
+
+
 }