work in progress

bytedeveloperr · Jul 2, 2020 · 32d59f6 · 32d59f6
2 parents dc7c03e + 79212f5
commit 32d59f6
Show file tree

Hide file tree

Showing 471 changed files with 2,861 additions and 570 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.env.example b/.env.example
@@ -2,9 +2,9 @@ APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_URL=https://dev.customerpay.me
 
-API_URL=https://dev.customerpay.me
+API_URL=https://dev.api.customerpay.me
 
 LOG_CHANNEL=stack
 

diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/ActivateController.php b/app/Http/Controllers/ActivateController.php
@@ -11,12 +11,14 @@ class ActivateController extends Controller
 
     public function index()
     {
-        if (Cookie::get('is_active') == true) {
-            return redirect()->route('dashboard');
-        }
+        return redirect()->route('dashboard');
 
-        $api_token = Cookie::get('api_token');
-        $phone_number = Cookie::get('phone_number');
-        return view("backend.activate.activate")->withApiToken($api_token)->withPhoneNumber($phone_number);
+        // if (Cookie::get('is_active') == true) {
+        //     return redirect()->route('dashboard');
+        // }
+
+        // $api_token = Cookie::get('api_token');
+        // $phone_number = Cookie::get('phone_number');
+        // return view("backend.activate.activate")->withApiToken($api_token)->withPhoneNumber($phone_number);
     }
 }
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -48,16 +48,16 @@ public function __construct()
 
     public function index()
     {
-        if (Cookie::get('api_token')){
+        if (Cookie::get('api_token')) {
             return redirect()->route('dashboard');
         }
         return view('backend.login');
     }
 
     public function authenticate(Request $request)
     {
-        $validation = Validator::make(request()->all(),[
-            'phone_number' => 'required|numeric|digits_between:1,16',
+        $validation = Validator::make(request()->all(), [
+            'phone_number' => 'required|min:6|max:16',
             'password' => 'required|regex:/[a-zA-Z0-9]{6,20}$/'
         ]);
 
@@ -77,48 +77,49 @@ public function authenticate(Request $request)
             ]);
 
             if ($response->getStatusCode() == 200) {
+
                 $response = json_decode($response->getBody());
 
-                if($response->status) {
+                if (isset($response->success) && $response->success) {
+
+                    $data = $response->data->user->local;
+
                     // store data to cookie
-                    Cookie::queue('api_token', $response->api_token);
-                    Cookie::queue('is_active', $response->user->is_active);
-                    Cookie::queue('phone_number', $response->user->phone_number);
-                    Cookie::queue('user_id', $response->user->_id);
+                    Cookie::queue('api_token', $data->api_token);
+                    Cookie::queue('is_active', $data->is_active);
+                    Cookie::queue('phone_number', $data->phone_number);
+                    Cookie::queue('user_id', $response->data->user->_id);
+                    Cookie::queue('expires', strtotime('+ 1 day'));
 
                     $request->session()->flash('alert-class', 'alert-success');
                     $request->session()->flash('message', $response->message);
 
                     //check if active
-                    if ($response->user->is_active == false) {
+                    if ($data->is_active == false) {
                         return redirect()->route('activate.user');
                     }
 
-                    // store other data to cookie
-                    Cookie::queue('first_name', $response->user->first_name);
-                    Cookie::queue('last_name', $response->user->last_name);
-                    Cookie::queue('email', $response->user->email);
-
                     return redirect()->route('dashboard');
                 } else {
-                    $request->session()->flash('message', $response->message);
+                    $message = isset($response->Message) ? $response->Message : $response->message;
+                    $request->session()->flash('message', $message);
                     return redirect()->route('login');
                 }
             }
 
-            if ($response->getStatusCode() == 500) {
-                return view('errors.500');
-            }
+            $message = isset($response->Message) ? $response->Message : $response->message;
+            $request->session()->flash('message', $message);
+            return redirect()->route('login');
         } catch (\Exception $e) {
-            // log $e->getMessage() when error loggin is setup
-            if($e->getCode() == 400) {
-                $request->session()->flash('message', 'Invalid Phone number or password');
+
+            if ($e->getCode() == 400) {
+                $request->session()->flash('message', 'Invalid Phone number or password. Ensure Your phone number uses internations format.e.g +234');
                 $request->session()->flash('alert-class', 'alert-danger');
                 return redirect()->route('login');
             }
 
-            Log::error("catch error: LoginController - ".$e->getMessage());
-            $request->session()->flash('message', 'something went wrong try again in a few minutes');
+            Log::error("catch error: LoginController - " . $e->getMessage());
+            $request->session()->flash('message', 'Something bad happened, please try again');
             return redirect()->route('login');
         }
         return redirect()->route('login');

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -41,26 +41,13 @@ class RegisterController extends Controller
     public function __construct()
     {
         $this->middleware('guest');
+        $this->host = env('API_URL', 'https://api.customerpay.me/');
     }
 
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-    }
 
     public function index()
     {
-        if (Cookie::get('api_token')){
+        if (Cookie::get('api_token')) {
             return redirect()->route('dashboard');
         }
         return view('backend.register.signup');
@@ -75,50 +62,66 @@ public function index()
     // Controller action to register a new user.
     public function register(Request $request)
     {
+
+        $request->validate([
+            'phone_number' => 'required|min:6|max:17',
+            'password' =>  'required|regex:/[a-zA-Z0-9]{6,20}$/',
+        ]);
+
         try {
-            // check if all fields are available
+
             if ($request->all()) {
-                // make an api call to register the user
-                $client = new Client();
-                $response = $client->post(env('API_URL') . '/register/user', [
+
+                $client =  new Client();
+                $response = $client->post($this->host . '/register/user', [
                     'form_params' => [
-                        'first_name' => $request->input('first_name'),
-                        'last_name' => $request->input('last_name'),
-                        'email' => $request->input('email'),
                         'phone_number' => $request->input('phone_number'),
                         'password' => $request->input('password')
                     ]
                 ]);
 
+
                 if ($response->getStatusCode() == 201) {
+
                     $res = json_decode($response->getBody());
-                    // get the api_token and phone_number from the response
-                    $api_token = $res->User->api_token;
-                    $phone_number = $res->User->phone_number;
-                    $user_id = $res->User->_id;
 
-                    // set api_token and phone number cookie
-                    Cookie::queue('api_token', $api_token);
-                    Cookie::queue('phone_number', $phone_number);
-                    Cookie::queue('user_id', $user_id);
+                    if ($res->success) {
 
-                    return redirect()->route('activate.user');
-                }
+                        $data = $res->data->user->local;
 
-                if ($response->getStatusCode() == 200) {
-                    $res = json_decode($response->getBody());
-                    $request->session()->flash('alert', $res->Message);
-                    $request->session()->flash('alert-class', 'alert-danger');
+                        // store data to cookie
+                        Cookie::queue('api_token', $data->api_token);
+                        Cookie::queue('is_active', $data->is_active);
+                        Cookie::queue('phone_number', $data->phone_number);
+                        Cookie::queue('user_id', $res->data->user->_id);
+                        Cookie::queue('expires', strtotime('+ 1 day'));
 
-                    return redirect()->route('signup');
+                        return redirect()->route('activate.user');
+                    }
                 }
 
-            } else {
-                return redirect()->route('signup');
+                if($response->getStatusCode() == 200) {
+                    $_response = json_decode($response->getBody(), true);
+
+                    if (count($_response) == 1) {
+                        $request->session()->flash('message', $_response['Message']);
+                        $request->session()->flash('alert-class', 'alert-danger');
+                        return redirect()->route('signup');
+                    }
+                }
             }
+
+            $res = json_decode($response->getBody());
+            $request->session()->flash('message', $res->Message);
+            $request->session()->flash('alert-class', 'alert-danger');
+
+            return redirect()->route('signup');
         } catch (\Exception $e) {
+            //log error
             Log::error('Catch error: RegisterController - ' . $e->getMessage());
-            $request->session()->flash('alert', 'Something went wrong, please try again.');
+
+            $request->session()->flash('alert-class', 'alert-danger');
+            $request->session()->flash('message', 'Something bad happened, please try again');
             return redirect()->route('signup');
         }
     }

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php