@fleetbase/storefront-engine 0.3.27 → 0.3.29

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.27",
+    "version": "0.3.29",
     "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.27",
+    "version": "0.3.29",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -43,14 +43,14 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
+        "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "latest",
         "@fleetbase/ember-ui": "latest",
         "@fleetbase/fleetops-data": "latest",
-        "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
-        "@fortawesome/free-solid-svg-icons": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",
+        "@fortawesome/free-solid-svg-icons": "6.4.0",
         "ember-auto-import": "^2.7.4",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
@@ -59,12 +59,12 @@
         "ember-wormhole": "^0.6.0"
     },
     "devDependencies": {
-        "@fleetbase/intl-lint": "^0.0.1",
         "@babel/eslint-parser": "^7.22.15",
         "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^3.2.0",
         "@embroider/test-setup": "^3.0.2",
+        "@fleetbase/intl-lint": "^0.0.1",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "broccoli-asset-rev": "^3.0.0",

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

@@ -13,6 +13,7 @@ use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\File;
 use Fleetbase\Models\User;
 use Fleetbase\Models\UserDevice;
 use Fleetbase\Models\VerificationCode;
@@ -176,8 +177,8 @@ class CustomerController extends Controller
         }
 
         // verify code
-        $isVerified = VerificationCode::where(['code' => $code, 'for' => 'storefront_create_customer', 'meta->identity' => $identity])->exists();
-        if (!$isVerified) {
+        $verificationCode = VerificationCode::where(['code' => $code, 'for' => 'storefront_create_customer', 'meta->identity' => $identity])->exists();
+        if (!$verificationCode) {
             return response()->apiError('Invalid verification code provided!');
         }
 
@@ -210,6 +211,27 @@ class CustomerController extends Controller
             'origin'        => 'storefront',
         ];
 
+        // Handle photo as either file id/ or base64 data string
+        $photo = $request->input('photo');
+        if ($photo) {
+            // Handle photo being a file id
+            if (Utils::isPublicId($photo)) {
+                $file = File::where('public_id', $photo)->first();
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle the photo being base64 data string
+            if (Utils::isBase64String($photo)) {
+                $path = implode('/', ['uploads', session('company'), 'customers']);
+                $file = File::createFromBase64($photo, null, $path);
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+        }
+
         // create the customer/contact
         try {
             $customer = Contact::create($input);
@@ -269,6 +291,32 @@ class CustomerController extends Controller
             ]);
         }
 
+        // Handle photo as either file id/ or base64 data string
+        $photo = $request->input('photo');
+        if ($photo) {
+            // Handle photo being a file id
+            if (Utils::isPublicId($photo)) {
+                $file = File::where('public_id', $photo)->first();
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle the photo being base64 data string
+            if (Utils::isBase64String($photo)) {
+                $path = implode('/', ['uploads', session('company'), 'customers']);
+                $file = File::createFromBase64($photo, null, $path);
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle removal key
+            if ($photo === 'REMOVE') {
+                $input['photo_uuid'] = null;
+            }
+        }
+
         // update the contact
         try {
             $contact->update($input);
@@ -802,4 +850,99 @@ class CustomerController extends Controller
             return response()->apiError($e->getMessage());
         }
     }
+
+    public function startAccountClosure(Request $request)
+    {
+        $about    = Storefront::about(['company_uuid']);
+        if (!$about) {
+            return response()->apiError('Storefront not found.');
+        }
+
+        $customer = Storefront::getCustomerFromToken();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view customers places');
+        }
+
+        // Get the user account for the contact/customer
+        $user = User::where(['uuid' => $customer->user_uuid])->first();
+        if (!$user) {
+            return response()->apiError('Customer user account not found.');
+        }
+
+        // Check for phone or email
+        if (!$user->phone && !$user->email) {
+            return response()->apiError('Customer account must have a valid email or phone number linked.');
+        }
+
+        // Send account closure confirmation with code
+        try {
+            if ($user->phone) {
+                VerificationCode::generateSmsVerificationFor($user, 'storefront_account_closure', [
+                    'messageCallback' => function ($verification) use ($about) {
+                        return "Your {$about->name} account closure verification code is {$verification->code}";
+                    },
+                    'meta' => ['identity' => $user->phone],
+                ]);
+            } elseif ($user->email) {
+                VerificationCode::generateEmailVerificationFor($user, 'storefront_account_closure', [
+                    'subject'         => $about->name . ' account closure request',
+                    'messageCallback' => function ($verification) use ($about) {
+                        return "Your {$about->name} account closure verification code is {$verification->code}";
+                    },
+                    'meta' => ['identity' => $user->email],
+                ]);
+            }
+
+            return response()->json(['status' => 'OK']);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+
+        return response()->apiError('An uknown error occured attempting to close customer account.');
+    }
+
+    public function confirmAccountClosure(Request $request)
+    {
+        $code     = $request->input('code');
+        $about    = Storefront::about(['company_uuid']);
+        if (!$about) {
+            return response()->apiError('Storefront not found.');
+        }
+
+        $customer = Storefront::getCustomerFromToken();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view customers places');
+        }
+
+        // Get the user account for the contact/customer
+        $user = User::where(['uuid' => $customer->user_uuid])->first();
+        if (!$user) {
+            return response()->apiError('Customer user account not found.');
+        }
+
+        // Get verification identity
+        $identity = $user->phone ?? $user->email;
+
+        // verify account closure code
+        $verificationCode = VerificationCode::where(['code' => $code, 'for' => 'storefront_account_closure', 'meta->identity' => $identity])->exists();
+        if (!$verificationCode && $code !== config('storefront.storefront_app.bypass_verification_code')) {
+            return response()->apiError('Invalid verification code provided!');
+        }
+
+        try {
+            // If the user type is `contact` or `customer` delete the user account
+            if ($user->isType(['contact', 'customer'])) {
+                $user->delete();
+            }
+
+            // Delete the customer
+            $customer->delete();
+
+            return response()->json(['status' => 'OK']);
+        } catch (\Exception $e) {
+            return response()->apiError($e->getMessage());
+        }
+
+        return response()->apiError('An uknown error occured attempting to close customer account.');
+    }
 }

package/server/src/Support/PushNotification.php

@@ -52,7 +52,7 @@ class PushNotification
         );
 
         return (new FcmMessage(notification: $notification))
-            ->setData(['order' => $order->uuid, 'id' => $order->public_id, 'type' => $status])
+            ->data(['order' => $order->uuid, 'id' => $order->public_id, 'type' => $status])
             ->custom([
                 'android' => [
                     'notification' => [

package/server/src/routes.php

@@ -113,6 +113,8 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                     $router->post('request-creation-code', 'CustomerController@requestCustomerCreationCode');
                     $router->post('stripe-ephemeral-key', 'CustomerController@getStripeEphemeralKey');
                     $router->post('stripe-setup-intent', 'CustomerController@getStripeSetupIntent');
+                    $router->post('account-closure', 'CustomerController@startAccountClosure');
+                    $router->post('confirm-account-closure', 'CustomerController@confirmAccountClosure');
                 });
 
                 // hotfix! storefront-app sending customer update to /contacts/ route