Merge pull request #27 from Mohammadreza-73/1.x

[1.x] Implements login action
Mohammadreza-73 · Apr 29, 2023 · e91f2f3 · e91f2f3
2 parents dd70633 + 2ebeb93
commit e91f2f3
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 15 deletions.
diff --git a/app/Core/Authenticatable.php b/app/Core/Authenticatable.php
@@ -9,12 +9,16 @@ public function attemp(string $email, string $password)
         $user = $this->db()->query("SELECT * FROM `users` WHERE `email` = :email", [
             'email' => $email,
         ])->find();
-
+        
         if ($user) {
             if (password_verify($password, $user->password)) {
-                $this->login([
-                    'email' => $email,
+                // $this->login($user);
+                Session::put('user', [
+                    'email' => $user->email,
                 ]);
+
+                // Prevent Session Hijacking
+                session_regenerate_id(true);
 
                 return true;
             }
@@ -27,7 +31,9 @@ public function login(array|object $user)
     {
         $user = is_object($user) ? $user : (object) $user;
 
-        Session::flash('email', $user->email);
+        Session::put('user', [
+            'email' => $user->email,
+        ]);
 
         // Prevent Session Hijacking
         session_regenerate_id(true);

diff --git a/app/Core/Http/Middleware/Authenticated.php b/app/Core/Http/Middleware/Authenticated.php
@@ -7,7 +7,7 @@ class Authenticated
     public function handle()
     {
         if (! $_SESSION['user'] ?? false) {
-            header('location: /admin');
+            header('location: /');
             exit();
         }
     }

diff --git a/app/Core/Session.php b/app/Core/Session.php
@@ -4,7 +4,7 @@
 
 class Session
 {
-    public static function put(string $key, string $value)
+    public static function put(string $key, $value)
     {
         $_SESSION[$key] = $value;
     }
@@ -19,7 +19,7 @@ public static function has(string $key)
         return (bool) static::get($key);
     }
 
-    public static function flash(string $key, string $value)
+    public static function flash(string $key, $value)
     {
         $_SESSION['_flash'][$key] = $value;
     }

diff --git a/app/Core/helpers.php b/app/Core/helpers.php
@@ -142,3 +142,10 @@ function session(string $key)
         return Session::get($key);
     }
 }
+
+if (! function_exists('old')) {
+    function old(string $key, $default = '')
+    {
+        return Session::get('old')[$key] ?? $default;
+    }
+}
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -22,14 +22,20 @@ public function verify()
     {
         $inputs = inputs();
 
-        // TODO: validation
+        $errors = [];
+        if (! Validator::email($inputs['email'])) {
+            $errors['email'] = 'Please provide a valid email address.';
+        }
 
-        if ($this->attemp($inputs['email'], $inputs['password'])) {
-            return redirect('/admin'); // Bug: to many redirects
+        if (! empty($errors)) {
+            return view('auth.login', compact('errors'));
+        }
 
-        } else {
-            return redirect('/login', 'error', 'Invalid email or password.');
+        if ($this->attemp($inputs['email'], $inputs['password'])) {
+            return redirect('/admin');
         }
+
+        return redirect('/login', 'error', 'Invalid email or password.');
     }
 
     public function signup()

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -13,6 +13,6 @@ public function index()
 
     public function dashboard()
     {
-        echo 'admin dashboard';
+        return view('dashboard');
     }
 }
diff --git a/public/index.php b/public/index.php
@@ -10,6 +10,6 @@
 require_once BASE_PATH . 'bootstrap/app.php';
 require_once BASE_PATH . 'routes.php';
 
-$router = (new App\Core\Http\Router)->run();
+(new App\Core\Http\Router)->run();
 
 Session::unflash();
diff --git a/resources/Views/auth/login.php b/resources/Views/auth/login.php
@@ -8,7 +8,7 @@
 </head>
 <body>
     <div>
-        <h4><?= session('error') ?? session('succes') ?></h4>
+        <h4><?= session('errors') ?? session('succes') ?></h4>
     </div>
     <form action="<?= url('/verify') ?>" method="post">
         <label for="email">Eamil: </label>

diff --git a/resources/Views/dashboard.php b/resources/Views/dashboard.php
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dashboard</title>
+</head>
+<body>
+    <h1>Welcome to Dashboard</h1>
+</body>
+</html>