@fleetbase/storefront-engine 0.3.20 → 0.3.22

package/addon/styles/storefront-engine.css

@@ -59,3 +59,11 @@
 .status-badge.order-canceled-status-badge > span svg {
     color: #fca5a5;
 }
+
+/** hotfix nav tab */
+body[data-theme='dark'] .ui-tabs.overlay-content-panel > ul .nav-item.active, 
+body[data-theme='dark'] .ui-tabs.overlay-content-panel > nav .nav-item.active, 
+body[data-theme='dark'] .ui-tabs.overlay-content-panel > ul .ui-tab.active, 
+body[data-theme='dark'] .ui-tabs.overlay-content-panel > nav .ui-tab.active {
+    background-color: #202A37;
+}

package/addon/templates/products/index/category/new.hbs

@@ -142,7 +142,7 @@
                         <Button @text="New Variant" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} @permission="storefront create product-variant" />
                     </div>
                 </div>
-                <Tabs as |Tab|>
+                <Tabs class="overlay-content-panel" as |Tab|>
                     {{#each this.product.variants as |variant|}}
                         <Tab @title={{variant.name}}>
                             <div class="px-4 py-3">

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.20",
+    "version": "0.3.22",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.20",
+    "version": "0.3.22",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.20",
+    "version": "0.3.22",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",

package/server/config/storefront.php

@@ -6,6 +6,11 @@
  * -------------------------------------------
  */
 return [
+    /*
+    |--------------------------------------------------------------------------
+    | API Config
+    |--------------------------------------------------------------------------
+    */
     'api' => [
         'version' => '0.0.1',
         'routing' => [
@@ -13,6 +18,21 @@ return [
             'internal_prefix' => 'int'
         ],
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Storefront App
+    |--------------------------------------------------------------------------
+    */
+    'storefront_app' => [
+        'bypass_verification_code' => env('STOREFRONT_BYPASS_VERIFICATION_CODE', '999000')
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connection
+    |--------------------------------------------------------------------------
+    */
     'connection' => [
         'db' => env('STOREFRONT_DB_CONNECTION', 'storefront')
     ]

package/server/src/Console/Commands/SendOrderNotification.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace Fleetbase\Storefront\Console\Commands;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Support\Utils;
+use Illuminate\Console\Command;
+
+class SendOrderNotification extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'storefront:send-notification {--id= : The ID of the order} {--event= : The name of the event to trigger}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Manually trigger a push notification for an order';
+
+    /**
+     * Mapping of event names to notification classes.
+     *
+     * @var array
+     */
+    protected $eventToNotification = [
+        'created'          => \Fleetbase\Storefront\Notifications\StorefrontOrderCreated::class,
+        'canceled'         => \Fleetbase\Storefront\Notifications\StorefrontOrderCanceled::class,
+        'completed'        => \Fleetbase\Storefront\Notifications\StorefrontOrderCompleted::class,
+        'driver_assigned'  => \Fleetbase\Storefront\Notifications\StorefrontOrderDriverAssigned::class,
+        'enroute'          => \Fleetbase\Storefront\Notifications\StorefrontOrderEnroute::class,
+        'preparing'        => \Fleetbase\Storefront\Notifications\StorefrontOrderPreparing::class,
+        'ready_for_pickup' => \Fleetbase\Storefront\Notifications\StorefrontOrderReadyForPickup::class,
+        'nearby'           => \Fleetbase\Storefront\Notifications\StorefrontOrderNearby::class,
+    ];
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // Get order ID and event from options
+        $orderId = $this->option('id');
+        $event   = $this->option('event');
+
+        // Prompt user to search for order ID if not provided
+        if (!$orderId) {
+            $orderId = $this->ask('Enter the order ID to trigger the notification');
+        }
+
+        // Attempt to find the order
+        $order = Order::where('public_id', $orderId)->first();
+
+        if (!$order) {
+            $this->error('Order not found!');
+
+            return 1;
+        }
+
+        // Load customer relation
+        $order->loadMissing('customer');
+
+        if (!$order->customer) {
+            $this->error('Order does not have an associated customer!');
+
+            return 1;
+        }
+
+        // Prompt user to select event if not provided
+        if (!$event) {
+            $event = $this->choice(
+                'Select the event to trigger',
+                array_keys($this->eventToNotification),
+                'created' // Default event
+            );
+        }
+
+        // Resolve notification class
+        $notificationClass = $this->eventToNotification[$event] ?? null;
+
+        if (!$notificationClass) {
+            $this->error('Invalid event selected!');
+
+            return 1;
+        }
+
+        // nearby notification requires more arguments
+        try {
+            if ($event === 'nearby') {
+                $origin      = $order->payload->getPickupOrFirstWaypoint();
+                $destination = $order->payload->getDropoffOrLastWaypoint();
+                $matrix      = Utils::getDrivingDistanceAndTime($origin, $destination);
+                $distance    = $matrix->distance;
+                $time        = $matrix->time;
+
+                // Trigger notification
+                $order->customer->notify(new $notificationClass($order, $distance, $time));
+            } else {
+                // Trigger notification
+                $order->customer->notify(new $notificationClass($order));
+            }
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return 0;
+        }
+
+        $this->info("Notification '{$event}' has been triggered for order ID '{$orderId}'.");
+
+        return 0;
+    }
+}

package/server/src/Http/Controllers/ProductController.php

@@ -10,7 +10,6 @@ use Fleetbase\Storefront\Imports\ProductsImport;
 use Fleetbase\Storefront\Jobs\DownloadProductImageUrl;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Support\Http;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
@@ -25,53 +24,6 @@ class ProductController extends StorefrontController
      */
     public $resource = 'product';
 
-    /**
-     * Update a Product record.
-     * This update method was overwritten because the ProductObserver
-     * isn't firing on the `updated` callback.
-     *
-     * @return \Fleetbase\Storefront\Http\Resources\Product
-     */
-    public function updateRecord(Request $request, string $id)
-    {
-        try {
-            $this->validateRequest($request);
-            $record = $this->model->updateRecordFromRequest($request, $id, function (&$request, Product &$product) {
-                $addonCategories = $request->array('product.addon_categories');
-                $variants        = $request->array('product.variants');
-                $files           = $request->array('product.files');
-
-                // dd($addonCategories);
-
-                // save addon categories
-                $product->setAddonCategories($addonCategories);
-
-                // save product variants
-                $product->setProductVariants($variants);
-
-                // set keys on files
-                foreach ($files as $file) {
-                    $fileRecord = File::where('uuid', $file['uuid'])->first();
-                    $fileRecord->setKey($product);
-                }
-            });
-
-            if (Http::isInternalRequest($request)) {
-                $this->resource::wrap($this->resourceSingularlName);
-
-                return new $this->resource($record);
-            }
-
-            return new $this->resource($record);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        } catch (\Illuminate\Database\QueryException $e) {
-            return response()->error($e->getMessage());
-        } catch (\Fleetbase\Exceptions\FleetbaseRequestValidationException $e) {
-            return response()->error($e->getErrors());
-        }
-    }
-
     /**
      * List all activity options for current order.
      *

package/server/src/Http/Controllers/v1/CheckoutController.php

@@ -186,7 +186,7 @@ class CheckoutController extends Controller
 
         // Check if customer has a saved default payment method
         if (StripeUtils::isCustomerPaymentMethodValid($customer)) {
-            $paymentIntentData['payment_method'] = $$customer->getMeta('stripe_payment_method_id');
+            $paymentIntentData['payment_method'] = $customer->getMeta('stripe_payment_method_id');
         }
 
         try {
@@ -246,7 +246,7 @@ class CheckoutController extends Controller
 
         // Check if customer has a saved default payment method
         if (StripeUtils::isCustomerPaymentMethodValid($customer)) {
-            $paymentIntentData['payment_method'] = $$customer->getMeta('stripe_payment_method_id');
+            $paymentIntentData['payment_method'] = $customer->getMeta('stripe_payment_method_id');
         }
 
         try {
@@ -283,6 +283,7 @@ class CheckoutController extends Controller
                 'setupIntent'          => $setupIntent->id,
                 'clientSecret'         => $setupIntent->client_secret,
                 'defaultPaymentMethod' => $defaultPaymentMethod,
+                'customerId'           => $customer->getMeta('stripe_id'),
             ]);
         } catch (\Exception $e) {
             return response()->apiError($e->getMessage());

package/server/src/Http/Controllers/v1/CustomerController.php

@@ -2,6 +2,8 @@
 
 namespace Fleetbase\Storefront\Http\Controllers\v1;
 
+use Fleetbase\Auth\AppleVerifier;
+use Fleetbase\Auth\GoogleVerifier;
 use Fleetbase\FleetOps\Exceptions\UserAlreadyExistsException;
 use Fleetbase\FleetOps\Http\Requests\UpdateContactRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
@@ -36,7 +38,7 @@ class CustomerController extends Controller
         $customer = Storefront::getCustomerFromToken();
 
         if (!$customer) {
-            return response()->error('Not authorized to register device for cutomer');
+            return response()->apiError('Not authorized to register device for cutomer');
         }
 
         $device = UserDevice::firstOrCreate(
@@ -68,7 +70,7 @@ class CustomerController extends Controller
         $customer = Storefront::getCustomerFromToken();
 
         if (!$customer) {
-            return response()->error('Not authorized to view customers orders');
+            return response()->apiError('Not authorized to view customers orders');
         }
 
         $results = Order::queryWithRequest($request, function (&$query) use ($customer) {
@@ -96,7 +98,7 @@ class CustomerController extends Controller
         $customer = Storefront::getCustomerFromToken();
 
         if (!$customer) {
-            return response()->error('Not authorized to view customers places');
+            return response()->apiError('Not authorized to view customers places');
         }
 
         $results = Place::queryWithRequest($request, function (&$query) use ($customer) {
@@ -121,7 +123,7 @@ class CustomerController extends Controller
 
         // validate identity
         if ($mode === 'email' && !$isEmail) {
-            return response()->error('Invalid email provided for identity');
+            return response()->apiError('Invalid email provided for identity');
         }
 
         // prepare phone number
@@ -176,7 +178,7 @@ class CustomerController extends Controller
         // verify code
         $isVerified = VerificationCode::where(['code' => $code, 'for' => 'storefront_create_customer', 'meta->identity' => $identity])->exists();
         if (!$isVerified) {
-            return response()->error('Invalid verification code provided!');
+            return response()->apiError('Invalid verification code provided!');
         }
 
         // check for existing user to attach contact to
@@ -250,7 +252,7 @@ class CustomerController extends Controller
         try {
             $contact = Contact::findRecordOrFail($id);
         } catch (ModelNotFoundException $exception) {
-            return response()->error('Customer resource not found.');
+            return response()->apiError('Customer resource not found.');
         }
 
         // get request input
@@ -303,7 +305,7 @@ class CustomerController extends Controller
         try {
             $contact = Contact::findRecordOrFail($id);
         } catch (ModelNotFoundException $exception) {
-            return response()->error('Customer resource not found.');
+            return response()->apiError('Customer resource not found.');
         }
 
         // response the customer resource
@@ -325,7 +327,7 @@ class CustomerController extends Controller
         try {
             $contact = Contact::findRecordOrFail($id);
         } catch (ModelNotFoundException $exception) {
-            return response()->error('Customer resource not found.');
+            return response()->apiError('Customer resource not found.');
         }
 
         // delete the product
@@ -349,7 +351,7 @@ class CustomerController extends Controller
         $user = User::where('email', $identity)->orWhere('phone', static::phone($identity))->first();
 
         if (!Hash::check($password, $user->password)) {
-            return response()->error('Authentication failed using password provided.', 401);
+            return response()->apiError('Authentication failed using password provided.', 401);
         }
 
         // get the storefront or network logging in for
@@ -376,7 +378,7 @@ class CustomerController extends Controller
         try {
             $token = $user->createToken($contact->uuid);
         } catch (\Exception $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         $contact->token = $token->plainTextToken;
@@ -397,7 +399,7 @@ class CustomerController extends Controller
         $user = User::where('phone', $phone)->whereNull('deleted_at')->withoutGlobalScopes()->first();
 
         if (!$user) {
-            return response()->error('No customer with this phone # found.');
+            return response()->apiError('No customer with this phone # found.');
         }
 
         // get the storefront or network logging in for
@@ -413,6 +415,243 @@ class CustomerController extends Controller
         return response()->json(['status' => 'OK']);
     }
 
+    /**
+     * Handles user authentication via Apple Sign-In.
+     *
+     * This method validates the Apple ID token, checks if the user exists in the system,
+     * and creates a new user if necessary. It then ensures a contact record exists for
+     * the user and generates an authentication token.
+     *
+     * @param Request $request
+     *                         The HTTP request containing the following required fields:
+     *                         - `identityToken` (string): The token generated by Apple to identify the user.
+     *                         - `authorizationCode` (string): The one-time code issued by Apple during login.
+     *                         - `email` (string|null): The user's email address (provided on first login).
+     *                         - `phone` (string|null): The user's phone number (optional).
+     *                         - `name` (string|null): The user's full name (optional).
+     *                         - `appleUserId` (string): A unique identifier for the user assigned by Apple.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *                                       A JSON response containing the authenticated customer's details, including an access token
+     *
+     * @throws \Exception
+     *                    If Apple authentication fails or any other error occurs during the process
+     */
+    public function loginWithApple(Request $request)
+    {
+        $identityToken     = $request->input('identityToken');
+        $authorizationCode = $request->input('authorizationCode');
+        $email             = $request->input('email');
+        $phone             = $request->input('phone');
+        $name              = $request->input('name');
+        $appleUserId       = $request->input('appleUserId');
+
+        if (!$identityToken || !$authorizationCode) {
+            return response()->apiError('Missing required Apple authentication parameters.', 400);
+        }
+
+        try {
+            // Verify the Apple token using the utility function
+            $isValid = AppleVerifier::verifyAppleJwt($identityToken);
+            if (!$isValid) {
+                return response()->apiError('Apple ID authentication is not valid.', 400);
+            }
+
+            // Check if the user exists in the system
+            $user = User::where(function ($query) use ($email, $appleUserId) {
+                if ($email) {
+                    $query->where('email', $email);
+                    $query->orWhere('apple_user_id', $appleUserId);
+                } else {
+                    $query->where('apple_user_id', $appleUserId);
+                }
+            })->first();
+
+            if (!$user) {
+                // Create a new user
+                $user = User::create([
+                    'email'         => $email,
+                    'phone'         => $phone,
+                    'name'          => $name,
+                    'apple_user_id' => $appleUserId,
+                    'type'          => 'customer',
+                    'company_uuid'  => session('company'),
+                ]);
+            } else {
+                // Update the `apple_user_id` if it's not already set
+                if (!$user->apple_user_id) {
+                    $user->apple_user_id = $appleUserId;
+                    $user->save();
+                }
+            }
+
+            // Ensure a customer contact exists
+            $contact = Contact::firstOrCreate(
+                ['user_uuid' => $user->uuid, 'company_uuid' => session('company')],
+                ['name' => $user->name, 'email' => $user->email, 'phone' => $user->phone, 'meta' => ['apple_user_id' => $appleUserId], 'type' => 'customer']
+            );
+
+            // Generate an auth token
+            $token          = $user->createToken($contact->uuid);
+            $contact->token = $token->plainTextToken;
+
+            return new Customer($contact);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage(), 500);
+        }
+    }
+
+    /**
+     * Handles user authentication via Facebook Sign-In.
+     *
+     * This method checks if the user exists in the system based on their email or Facebook ID.
+     * If the user does not exist, it creates a new user and ensures a contact record is created.
+     * Finally, it generates an authentication token for the user.
+     *
+     * @param Request $request
+     *                         The HTTP request containing the following required fields:
+     *                         - `email` (string|null): The user's email address.
+     *                         - `name` (string|null): The user's full name.
+     *                         - `facebookUserId` (string): A unique identifier for the user assigned by Facebook.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *                                       A JSON response containing the authenticated customer's details, including an access token
+     *
+     * @throws \Exception
+     *                    If Facebook authentication fails or any other error occurs during the process
+     */
+    public function loginWithFacebook(Request $request)
+    {
+        $email                = $request->input('email');
+        $name                 = $request->input('name');
+        $facebookUserId       = $request->input('facebookUserId');
+
+        try {
+            // Check if the user exists in the system
+            $user = User::where(function ($query) use ($email, $facebookUserId) {
+                if ($email) {
+                    $query->where('email', $email);
+                    $query->orWhere('facebook_user_id', $facebookUserId);
+                } else {
+                    $query->where('facebook_user_id', $facebookUserId);
+                }
+            })->first();
+
+            if (!$user) {
+                // Create a new user
+                $user = User::create([
+                    'email'            => $email,
+                    'name'             => $name,
+                    'facebook_user_id' => $facebookUserId,
+                    'type'             => 'customer',
+                    'company_uuid'     => session('company'),
+                ]);
+            } else {
+                // Update the `facebook_user_id` if it's not already set
+                if (!$user->facebook_user_id) {
+                    $user->facebook_user_id = $facebookUserId;
+                    $user->save();
+                }
+            }
+
+            // Ensure a customer contact exists
+            $contact = Contact::firstOrCreate(
+                ['user_uuid' => $user->uuid, 'company_uuid' => session('company')],
+                ['name' => $user->name, 'email' => $user->email, 'phone' => $user->phone, 'meta' => ['facebook_user_id' => $facebookUserId], 'type' => 'customer']
+            );
+
+            // Generate an auth token
+            $token          = $user->createToken($contact->uuid);
+            $contact->token = $token->plainTextToken;
+
+            return new Customer($contact);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage(), 500);
+        }
+    }
+
+    /**
+     * Handles user authentication via Google Sign-In.
+     *
+     * This method validates the Google ID token, retrieves user details from the token payload,
+     * checks if the user exists in the system, and creates a new user if necessary.
+     * It ensures a contact record exists for the user and generates an authentication token.
+     *
+     * @param Request $request
+     *                         The HTTP request containing the following required fields:
+     *                         - `idToken` (string): The token generated by Google to identify the user.
+     *                         - `clientId` (string): The client ID associated with the app.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *                                       A JSON response containing the authenticated customer's details, including an access token
+     *
+     * @throws \Exception
+     *                    If Google authentication fails or any other error occurs during the process
+     */
+    public function loginWithGoogle(Request $request)
+    {
+        $idToken  = $request->input('idToken');
+        $clientId = $request->input('clientId');
+        if (!$idToken || !$clientId) {
+            return response()->apiError('Missing required Google authentication parameters.', 400);
+        }
+
+        try {
+            // Verify the Google ID token using the utility function
+            $payload = GoogleVerifier::verifyIdToken($idToken, $clientId);
+            if (!$payload) {
+                return response()->apiError('Google Sign-In authentication is not valid.', 400);
+            }
+
+            // Extract user details from the payload
+            $email        = data_get($payload, 'email');
+            $name         = data_get($payload, 'name');
+            $googleUserId = data_get($payload, 'sub');
+            $avatarUrl    = data_get($payload, 'picture');
+
+            // Check if the user exists in the system
+            $user = User::where(function ($query) use ($email, $googleUserId) {
+                if ($email) {
+                    $query->where('email', $email);
+                    $query->orWhere('google_user_id', $googleUserId);
+                } else {
+                    $query->where('google_user_id', $googleUserId);
+                }
+            })->first();
+
+            if (!$user) {
+                // Create a new user
+                $user = User::create([
+                    'email'          => $email,
+                    'name'           => $name,
+                    'google_user_id' => $googleUserId,
+                    'type'           => 'customer',
+                    'company_uuid'   => session('company'),
+                ]);
+            } else {
+                // Update the `google_user_id` if it's not already set
+                if (!$user->google_user_id) {
+                    $user->google_user_id = $googleUserId;
+                    $user->save();
+                }
+            }
+
+            // Ensure a customer contact exists
+            $contact = Contact::firstOrCreate(
+                ['user_uuid' => $user->uuid, 'company_uuid' => session('company')],
+                ['name' => $user->name, 'email' => $user->email, 'phone' => $user->phone, 'meta' => ['google_user_id' => $googleUserId], 'type' => 'customer']
+            );
+
+            // Generate an auth token
+            $token          = $user->createToken($contact->uuid);
+            $contact->token = $token->plainTextToken;
+
+            return new Customer($contact);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage(), 500);
+        }
+    }
+
     /**
      * Verifys SMS code and sends auth token with customer resource.
      *
@@ -433,14 +672,13 @@ class CustomerController extends Controller
         $user = User::where('phone', $identity)->orWhere('email', $identity)->first();
 
         if (!$user) {
-            return response()->error('Unable to verify code.');
+            return response()->apiError('Unable to verify code.');
         }
 
         // find and verify code
         $verificationCode = VerificationCode::where(['subject_uuid' => $user->uuid, 'code' => $code, 'for' => $for])->exists();
-
-        if (!$verificationCode && $code !== '999000') {
-            return response()->error('Invalid verification code!');
+        if (!$verificationCode && $code !== config('storefront.storefront_app.bypass_verification_code')) {
+            return response()->apiError('Invalid verification code!');
         }
 
         // get the storefront or network logging in for
@@ -467,7 +705,7 @@ class CustomerController extends Controller
         try {
             $token = $user->createToken($contact->uuid);
         } catch (\Exception $e) {
-            return response()->error($e->getMessage());
+            return response()->apiError($e->getMessage());
         }
 
         $contact->token = $token->plainTextToken;
@@ -495,7 +733,7 @@ class CustomerController extends Controller
     {
         $customer = Storefront::getCustomerFromToken();
         if (!$customer) {
-            return response()->error('Not authorized to view customers places');
+            return response()->apiError('Not authorized to view customers places');
         }
 
         $gateway    = Storefront::findGateway('stripe');
@@ -518,8 +756,8 @@ class CustomerController extends Controller
             );
 
             return response()->json([
-                'ephemeralKey'          => $ephemeralKey->secret,
-                'customer'              => $customer->getMeta('stripe_id'),
+                'ephemeralKey'            => $ephemeralKey->secret,
+                'customerId'              => $customer->getMeta('stripe_id'),
             ]);
         } catch (\Exception $e) {
             return response()->apiError($e->getMessage());
@@ -530,7 +768,7 @@ class CustomerController extends Controller
     {
         $customer = Storefront::getCustomerFromToken();
         if (!$customer) {
-            return response()->error('Not authorized to view customers places');
+            return response()->apiError('Not authorized to view customers places');
         }
 
         $gateway    = Storefront::findGateway('stripe');
@@ -554,6 +792,7 @@ class CustomerController extends Controller
             return response()->json([
                 'setupIntentId'          => $setupIntent->id,
                 'setupIntent'            => $setupIntent->client_secret,
+                'customerId'             => $customer->getMeta('stripe_id'),
             ]);
         } catch (\Exception $e) {
             return response()->apiError($e->getMessage());

package/server/src/Http/Requests/{CustomerRequest.php → StorefrontCustomerRequest.php}

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Requests;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Storefront\Rules\CustomerExists;
 
-class CustomerRequest extends FleetbaseRequest
+class StorefrontCustomerRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.

package/server/src/Http/Resources/Cart.php

@@ -44,7 +44,7 @@ class Cart extends FleetbaseResource
         $items = $this->items ?? [];
 
         return array_map(function ($cartItem) {
-            $product = Product::select(['public_id', 'primary_image_uuid', 'name', 'description'])->where('public_id', data_get($cartItem, 'product_id'))->first();
+            $product = Product::select(['uuid', 'public_id', 'primary_image_uuid', 'name', 'description'])->with(['files'])->where('public_id', data_get($cartItem, 'product_id'))->first();
             if ($product) {
                 data_set($cartItem, 'name', $product->name);
                 data_set($cartItem, 'description', $product->description);

package/server/src/Observers/ProductObserver.php

@@ -2,15 +2,9 @@
 
 namespace Fleetbase\Storefront\Observers;
 
-use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\File;
 use Fleetbase\Storefront\Models\Product;
-use Fleetbase\Storefront\Models\ProductAddonCategory;
-use Fleetbase\Storefront\Models\ProductVariant;
-use Fleetbase\Storefront\Models\ProductVariantOption;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Str;
 
 class ProductObserver
 {
@@ -47,56 +41,18 @@ class ProductObserver
     {
         $addonCategories        = Request::input('product.addon_categories', []);
         $variants               = Request::input('product.variants', []);
+        $files                  = Request::input('product.files', []);
 
-        // update addon categories
-        foreach ($addonCategories as $productAddonCategory) {
-            if (isset($productAddonCategory['uuid']) && Str::isUuid($productAddonCategory['uuid'])) {
-                ProductAddonCategory::where('uuid', $productAddonCategory['uuid'])->update(Arr::except($productAddonCategory, ['uuid', 'name', 'category']));
-                continue;
-            }
-
-            // add new addon category
-            $productAddonCategory['product_uuid'] = $product->uuid;
-            ProductAddonCategory::create(Arr::except($productAddonCategory, ['category']));
-        }
-
-        // update product variants
-        foreach ($variants as $variant) {
-            if (isset($variant['uuid']) && Str::isUuid($variant['uuid'])) {
-                // update product variante
-                ProductVariant::where('uuid', $variant['uuid'])->update(Arr::except($variant, ['uuid', 'options']));
-
-                // update product variant options
-                foreach ($variant['options'] as $option) {
-                    if (!empty($option['uuid'])) {
-                        // make sure additional cost is always numbers only
-                        if (isset($option['additional_cost'])) {
-                            $option['additional_cost'] = Utils::numbersOnly($option['additional_cost']);
-                        }
-
-                        $updateAttrs = Arr::except($option, ['uuid']);
-
-                        ProductVariantOption::where('uuid', $option['uuid'])->update($updateAttrs);
-                        continue;
-                    }
-
-                    $option['product_variant_uuid'] = $variant['uuid'];
-                    ProductVariantOption::create($option);
-                }
-                continue;
-            }
-
-            // create new variant
-            $variant['created_by_uuid'] = Request::session()->get('user');
-            $variant['company_uuid']    = Request::session()->get('company');
-            $variant['product_uuid']    = $product->uuid;
+        // save addon categories
+        $product->setAddonCategories($addonCategories);
 
-            $productVariant = ProductVariant::create(Arr::except($variant, ['options']));
+        // save product variants
+        $product->setProductVariants($variants);
 
-            foreach ($variant['options'] as $option) {
-                $option['product_variant_uuid'] = $productVariant->uuid;
-                ProductVariantOption::create($option);
-            }
+        // set keys on files
+        foreach ($files as $file) {
+            $fileRecord = File::where('uuid', $file['uuid'])->first();
+            $fileRecord->setKey($product);
         }
     }
 }

package/server/src/Providers/StorefrontServiceProvider.php

@@ -54,6 +54,7 @@ class StorefrontServiceProvider extends CoreServiceProvider
      */
     public $commands = [
         \Fleetbase\Storefront\Console\Commands\NotifyStorefrontOrderNearby::class,
+        \Fleetbase\Storefront\Console\Commands\SendOrderNotification::class,
     ];
 
     /**

package/server/src/routes.php

@@ -20,7 +20,7 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
         | Public/Callback Receivable Storefront API Routes
         |--------------------------------------------------------------------------
         |
-        | End-user API routes, these are routes that the SDK and applications will interface with, and require API credentials.
+        | End-user API routes, these are routes that the SDK and applications will interface with, and DO NOT require API credentials.
         */
         Route::group(['prefix' => 'v1', 'namespace' => 'v1'], function ($router) {
             // storefront/v1/checkouts
@@ -94,6 +94,9 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                     $router->get('{id}', 'CustomerController@find');
                     $router->post('/', 'CustomerController@create');
                     $router->post('login-with-sms', 'CustomerController@loginWithPhone');
+                    $router->post('login-with-apple', 'CustomerController@loginWithApple');
+                    $router->post('login-with-facebook', 'CustomerController@loginWithFacebook');
+                    $router->post('login-with-google', 'CustomerController@loginWithGoogle');
                     $router->post('verify-code', 'CustomerController@verifyCode');
                     $router->post('login', 'CustomerController@login');
                     $router->post('request-creation-code', 'CustomerController@requestCustomerCreationCode');