From 87a4fdc59fb2951f0154d9b8f714e44154038abc Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 9 Oct 2022 12:18:33 +0800
Subject: [PATCH] fix login api

---
 .../Controllers/AuthMobile/AuthController.php | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index 46e26b73..0ceb7a3f 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -81,53 +81,55 @@ class AuthController extends Controller
         return response($response, 201);
     }
 
-    public function loginUser(Request $request) {
+    public function loginUser(Request $request)
+    {
         $fields = $request->validate([
             'username' => 'required|string',
             'password' => 'required|string'
         ]);
 
-       //Check username
-       $user = User::where('username', $fields['username'])->first();
-       
-       if($user->status != 'active')
-       {
-           if($user->status == 'banned')
-           {    
-                return response([
-                    'message' => 'User Banned'
-                ], 401);
-           }
-           else if($user->status == 'rejected')
-           {    
-                return response([
-                    'message' => 'rejected',
-                    'nota' => $user->note
-                ], 401);
-           }
-           else
-           {
-                return response([
-                    'message' => 'Registration in progress,status wait for approval.'
-                ], 401);
-           }
-       }
-       //Check Password
-       if(!$user || !Hash::check($fields['password'], $user->password)){
+        $user = User::where('username', $fields['username'])->first();
 
-            return response([
-                'message' => 'Bad Creds'
-            ], 401);
+        if ($user) {
 
-       }
+            $passwordTrue = Hash::check($fields['password'], $user->password);
 
-        $token = $user->createToken('myapptoken')->plainTextToken;
-        $response = [
-            'user' => $user,
-            'token' => $token
-        ];
-
-        return response($response, 201);
+            if ($passwordTrue) {
+                if ($user->status == 'active') {
+                    $token = $user->createToken('myapptoken')->plainTextToken;
+                    return response([
+                        'statusAkaun' => 1,
+                        'user' => $user,
+                        'token' => $token
+                    ]);
+                } else if ($user->status == 'banned') {
+                    return response()->json([
+                        'statusAkaun' => 2,
+                        'message' => "User banned."
+                    ]);
+                } else if ($user->status == 'rejected') {
+                    return response([
+                        'statusAkaun' => 3,
+                        'message' => "Rejected."
+                    ]);
+                } else {
+                    return response([
+                        'statusAkaun' => 4,
+                        'message' => 'Registration in progress,status wait for approval.'
+                    ]);
+                }
+            } else {
+                return response()->json([
+                    'statusAkaun' => 5,
+                    'message' => "Kata Laluan Salah."
+                ]);
+            }
+        } else {
+            return response()->json([
+                'statusAkaun' => 0,
+                'message' => "Akaun tiada."
+            ]);
+        }
     }
 
     public function logoutUser(Request $request){