google auth update

Author: Level237

app/Http/Controllers/Auth/SocialAuthController.php

@@ -19,28 +19,39 @@ public function redirectToGoogle(Request $request)
     // 1. Validation (s'assurer que l'URL d'origine est valide)
     $request->validate(['origin_url' => 'required|url']);
     $originUrl = $request->input('origin_url');
-
     // 2. Stocker l'URL du frontend dans la session (ou passer un paramètre crypté dans 'state')
     // Utiliser la session est le plus simple pour cet exemple
-    session()->put('socialite_origin_url', $originUrl);
-
+    $state = base64_encode(json_encode([
+        'origin_url' => $originUrl
+    ]));
     // 3. Rediriger vers Google
-    return Socialite::driver('google')->stateless()->redirect();
+    return Socialite::driver('google')->stateless()->with(['state' => $state]) ->redirect();
 }
     public function handleGoogleCallback(Request $request): RedirectResponse
     {
-        $frontendUrl = env('FRONTEND_URL', 'http://localhost:3000');
-
+         $stateData = json_decode(base64_decode($request->input('state')), true);
+        $originUrl = $stateData['origin_url'] ?? null;
         try{
             $googleUser = Socialite::driver('google')->stateless()->user();
         } catch (\Exception $e) {
             Log::error("Erreur de callback Google: " . $e->getMessage());
-            return redirect("{$frontendUrl}/login?error=google_auth_failed");
+            return redirect("{$originUrl}/login?error=google_auth_failed");
         }
         $email = $googleUser->getEmail();
         $user = User::where('email', $email)->first();
-
+        $role_id=0;
         if($user){
+             if (str_contains($originUrl, 'seller.akevas.com')) {
+        $frontendUrl = "https://seller.akevas.com";
+        $role_id = 2;
+    } elseif (str_contains($originUrl, 'delivery.akevas.com')) {
+        $frontendUrl = "https://delivery.akevas.com";
+        $role_id = 4;
+    } else {
+        $frontendUrl = "https://akevas.com";
+        $role_id = 3;
+    }
+           
             if (is_null($user->google_id)) {
                 $user->google_id = $googleUser->getId();
             }
@@ -51,7 +62,11 @@ public function handleGoogleCallback(Request $request): RedirectResponse
             return redirect("{$frontendUrl}/login?code=401");
         }
 
-        $scope = $this->getUserScope($user->role_id);
+         if($user->role_id != $role_id){
+           
+                return redirect("{$frontendUrl}/login?code=500");
+            }else{
+                $scope = $this->getUserScope($user->role_id);
         $tokenResult = $user->createToken('GoogleAuthToken', [$scope]);
         $accessToken = $tokenResult->accessToken;
 
@@ -61,15 +76,15 @@ public function handleGoogleCallback(Request $request): RedirectResponse
         $domain = (config('app.env') === 'production') ? '.akevas.com' : null;
         $secure = config('app.env') === 'production';
 
-        $origin = $request->headers->get('origin');
 
-        if(str_contains($origin, 'seller.akevas.com')){
+        
+        if(str_contains($originUrl, 'seller.akevas.com')){
             $cookieNameAccess = 'accessTokenSeller';
             $cookieNameRefresh = 'refreshTokenSeller';
-        }elseif(str_contains($origin, 'delivery.akevas.com')){
+        }elseif(str_contains($originUrl, 'delivery.akevas.com')){
             $cookieNameAccess = 'accessTokenDelivery';
             $cookieNameRefresh = 'refreshTokenDelivery';
-        }else if (str_contains($origin, 'localhost')) {
+        }else if (str_contains($originUrl, 'localhost')) {
         $cookieNameAccess = 'accessTokenSeller';
         $cookieNameRefresh = 'refreshTokenSeller';
     }else{
@@ -82,6 +97,8 @@ public function handleGoogleCallback(Request $request): RedirectResponse
     ->cookie($cookieNameRefresh, $refreshToken, 
         60*24*30, // Longue durée de vie
         '/', $domain, $secure, true, false, 'none');
+            }
+        
     }
 
     protected function getUserScope(int $roleId): string

app/Http/Controllers/Seller/ProductController.php

@@ -16,6 +16,7 @@
 use App\Services\GenerateUrlResource;
 use App\Models\ProductAttributesValue;
 use App\Http\Resources\ProductResource;
+use App\Http\Resources\ProductEditResource;
 
     class ProductController extends Controller
     {
@@ -278,4 +279,9 @@ public function restoreProduct($id){
             $product->save();
             return response()->json(['message' => 'Product restore successfully']);
         }
+
+        public function getEditProduct($url){
+            $product=Product::where('product_url',$url)->first();
+            return response()->json(new ProductEditResource($product));
+        }
     }

app/Http/Resources/ProductEditResource.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Town;
+use App\Models\Category;
+use Illuminate\Http\Request;
+use App\Http\Resources\ImageResource;
+use App\Http\Resources\CategoryResource;
+use App\Http\Resources\WholeSalePriceResource;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ProductEditResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            "id" => $this->id,
+            "product_name" => $this->product_name,
+            "product_description" => $this->product_description,
+            "isRejet"=>$this->isRejet,
+            "shop_name" => $this->shop->shop_name,
+            "user_id"=>$this->shop->user_id,
+            "shop_key" => $this->shop->shop_key,
+            "shop_created_at" => $this->shop->created_at,
+            "product_gender" => $this->product_gender,
+            "shop_profile" => URL("/storage/" . $this->shop->shop_profile),
+            "reviewCount"=>$this->reviews->count(),
+            "product_url" => $this->product_url,
+            "is_only_wholesale"=>$this->is_only_wholesale,
+            "whatsapp_number"=>$this->whatsapp_number,
+            "isVariation" => $this->variations->isNotEmpty() ? true : null,
+            "productWholeSales"=>WholeSalePriceResource::collection($this->wholesalePrices),
+            "product_images" => ImageResource::collection($this->images),
+            "product_profile" => URL("/storage/" . $this->product_profile),
+            "product_price" => $this->product_price,
+            "isWholeSale"=>$this->is_wholesale,
+            "product_quantity" => $this->product_quantity,
+            "parent_category" => CategoryResource::collection($this->categories->whereNull('parent_id')),
+            "child_category" => CategoryResource::collection($this->categories->whereNotNull('parent_id')),
+            "residence"=>Town::where('id',$this->product_residence)->select('town_name')->first()->town_name,
+            "status" => $this->status,
+            "isSubscribe" => $this->isSubscribe,
+            "variations" => $this->getVariations(),
+            "created_at" => $this->created_at,
+            "subscribe_id" => $this->subscribe_id
+        ];
+    }
+}

routes/api.php

@@ -202,6 +202,7 @@
     Route::get('/seller/orders/stats', [OrderListController::class, 'getOrderStats']);
     Route::get('/seller/order/{id}',[OrderListController::class,'getOrderById']);
 
+    Route::get('/seller/edit/product/{url}',[ProductController::class,'getEditProduct']);
 
 });