From 0cf0b874d0a384dcec1a839777eec2fbebe93ebf Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Tue, 25 Jan 2022 12:25:49 +0500
Subject: [PATCH] auth fix

---
 .../Sarga/API/Http/Controllers/Customers.php  | 26 +++++++++++++++++--
 .../Controllers/IntegrationController.php     |  4 +--
 packages/Sarga/API/Http/routes.php            | 10 ++++---
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/Customers.php b/packages/Sarga/API/Http/Controllers/Customers.php
index 39547ed87..a1e9b5201 100644
--- a/packages/Sarga/API/Http/Controllers/Customers.php
+++ b/packages/Sarga/API/Http/Controllers/Customers.php
@@ -4,20 +4,27 @@ namespace Sarga\API\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Validator;
 use Webkul\API\Http\Controllers\Shop\SessionController;
 use Webkul\API\Http\Resources\Customer\Customer as CustomerResource;
+use Webkul\Customer\Repositories\CustomerGroupRepository;
 
 
 class Customers extends SessionController
 {
+
     /**
      * Method to store user's sign up form data to DB.
      *
      * @return \Illuminate\Http\Response
      */
-    public function register(Request $request)
+    public function register(Request $request,CustomerGroupRepository $groupRepository)
     {
         $request->validate([
+
+        ]);
+
+        $validation = Validator::make($request->all(), [
             'first_name' => 'required|string',
             'last_name'  => 'required|string',
             'phone'      => 'required|digits:8|unique:customers,phone',
@@ -25,6 +32,11 @@ class Customers extends SessionController
             'gender'     => 'in:Male,Female'
         ]);
 
+        if ($validation->fails()) {
+
+            return response()->json(['errors'=>$validation->getMessageBag()->all()],422);
+        }
+
         $data = [
             'first_name'  => $request->get('first_name'),
             'last_name'   => $request->get('last_name'),
@@ -33,7 +45,7 @@ class Customers extends SessionController
             'channel_id'  => core()->getCurrentChannel()->id,
             'is_verified' => 1,
             'gender'      => $request->get('gender'),
-            'customer_group_id' => $this->customerGroupRepository->findOneWhere(['code' => 'general'])->id
+            'customer_group_id' => $groupRepository->findOneWhere(['code' => 'general'])->id
         ];
 
         Event::dispatch('customer.registration.before');
@@ -69,6 +81,16 @@ class Customers extends SessionController
             'password'   => 'required|min:6',
         ]);
 
+        $validation = Validator::make($request->all(), [
+            'phone'      => 'required|digits:8',
+            'password'   => 'required|min:6',
+        ]);
+
+        if ($validation->fails()) {
+
+            return response()->json(['errors'=>$validation->getMessageBag()->all()],422);
+        }
+
         $jwtToken = null;
 
         if (! $jwtToken = auth()->guard($this->guard)->attempt($request->only(['phone', 'password']))) {
diff --git a/packages/Sarga/API/Http/Controllers/IntegrationController.php b/packages/Sarga/API/Http/Controllers/IntegrationController.php
index 6be202563..b89043ba4 100644
--- a/packages/Sarga/API/Http/Controllers/IntegrationController.php
+++ b/packages/Sarga/API/Http/Controllers/IntegrationController.php
@@ -59,8 +59,6 @@ class IntegrationController extends Controller
             return response()->json(['errors'=>$e->getMessage()],400);
         }
 
-        Log::info(request()->getContent());
-
         $validation = Validator::make($data, [
             'categories' => 'required',
 //            'sku' => ['required', 'unique:products,sku', new Slug],
@@ -72,7 +70,7 @@ class IntegrationController extends Controller
         ]);
 
         if ($validation->fails()) {
-            Log::info($validation->getMessageBag()->all());
+
             return response()->json(['errors'=>$validation->getMessageBag()->all()],422);
         }
 
diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php
index 23d0defe1..5b2f4ae7f 100644
--- a/packages/Sarga/API/Http/routes.php
+++ b/packages/Sarga/API/Http/routes.php
@@ -49,7 +49,11 @@ Route::group(['prefix' => 'api'], function ($router) {
         Route::put('create',[IntegrationController::class,'create']);
     });
 
-    Route::post('customer/register', [Customers::class, 'register']);
-    Route::post('customer/login', [Customers::class, 'login']);
-    Route::put('customer/profile', [Customers::class, 'update']);
+    Route::group(['prefix' => 'customer'],function ($router){
+        Route::post('register', [Customers::class, 'register']);
+        Route::post('login', [Customers::class, 'login']);
+        Route::put('profile', [Customers::class, 'update']);
+    });
+
+
 });