Upgraded to v0.3.7

2026-01-08 07:16:49 +00:00 · 2024-01-19 19:55:47 +08:00
parent 2c2a4121a8 74770883fe
commit 88c3842441
9 changed files with 48 additions and 42 deletions
--- a/api/composer.json
+++ b/api/composer.json
@@ -9,9 +9,9 @@
    "license": "MIT",
    "require": {
        "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.3.9",
-        "fleetbase/fleetops-api": "^0.3.9",
-        "fleetbase/storefront-api": "^0.2.6",
+        "fleetbase/core-api": "^1.3.10",
+        "fleetbase/fleetops-api": "^0.4.0",
+        "fleetbase/storefront-api": "^0.2.7",
        "fleetbase/billing-api": "^0.0.6",
        "fleetbase/internals-api": "dev-main",
        "fruitcake/laravel-cors": "^2.0",
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "0cede6eee0783a410cf85f8395a94320",
+    "content-hash": "4fa90bb61f838cb1a2a9500e9c0a6c98",
    "packages": [
        {
            "name": "aloha/twilio",
@@ -2181,16 +2181,16 @@
        },
        {
            "name": "fleetbase/core-api",
-            "version": "1.3.9",
+            "version": "1.3.10",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/core-api.git",
-                "reference": "a6acbc0a2e241c38432486b9a7b8957bfcde8f9d"
+                "reference": "00c489b6cc4f22e02e1184b3dcb550407efe4661"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/a6acbc0a2e241c38432486b9a7b8957bfcde8f9d",
-                "reference": "a6acbc0a2e241c38432486b9a7b8957bfcde8f9d",
+                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/00c489b6cc4f22e02e1184b3dcb550407efe4661",
+                "reference": "00c489b6cc4f22e02e1184b3dcb550407efe4661",
                "shasum": ""
            },
            "require": {
@@ -2266,29 +2266,29 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/core-api/issues",
-                "source": "https://github.com/fleetbase/core-api/tree/v1.3.9"
+                "source": "https://github.com/fleetbase/core-api/tree/v1.3.10"
            },
-            "time": "2024-01-19T08:58:30+00:00"
+            "time": "2024-01-19T11:19:57+00:00"
        },
        {
            "name": "fleetbase/fleetops-api",
-            "version": "0.3.9",
+            "version": "0.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/fleetops.git",
-                "reference": "687c82780e359fb69dddc19e198c5d82308aabe0"
+                "reference": "a36f876f95c996708f48fd5412926d7b997542ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/687c82780e359fb69dddc19e198c5d82308aabe0",
-                "reference": "687c82780e359fb69dddc19e198c5d82308aabe0",
+                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/a36f876f95c996708f48fd5412926d7b997542ae",
+                "reference": "a36f876f95c996708f48fd5412926d7b997542ae",
                "shasum": ""
            },
            "require": {
                "barryvdh/laravel-dompdf": "^2.0",
                "brick/geo": "0.7.2",
                "cknow/laravel-money": "^7.1",
-                "fleetbase/core-api": "^1.3.7",
+                "fleetbase/core-api": "^1.3.10",
                "geocoder-php/google-maps-places-provider": "^1.4",
                "giggsey/libphonenumber-for-php": "^8.13",
                "league/geotools": "^1.1.0",
@@ -2354,9 +2354,9 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/fleetops/issues",
-                "source": "https://github.com/fleetbase/fleetops/tree/v0.3.9"
+                "source": "https://github.com/fleetbase/fleetops/tree/v0.4.0"
            },
-            "time": "2024-01-18T10:51:28+00:00"
+            "time": "2024-01-19T11:24:04+00:00"
        },
        {
            "name": "fleetbase/internals-api",
@@ -2464,21 +2464,21 @@
        },
        {
            "name": "fleetbase/storefront-api",
-            "version": "0.2.6",
+            "version": "0.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/storefront.git",
-                "reference": "1afef1deb719248a817aea23ac5434ff4a7dd1e1"
+                "reference": "e14ea2a9b53759d31805b098fb27284ece854d63"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/1afef1deb719248a817aea23ac5434ff4a7dd1e1",
-                "reference": "1afef1deb719248a817aea23ac5434ff4a7dd1e1",
+                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/e14ea2a9b53759d31805b098fb27284ece854d63",
+                "reference": "e14ea2a9b53759d31805b098fb27284ece854d63",
                "shasum": ""
            },
            "require": {
-                "fleetbase/core-api": "^1.3.6",
-                "fleetbase/fleetops-api": "^0.3.8",
+                "fleetbase/core-api": "^1.3.10",
+                "fleetbase/fleetops-api": "^0.4.0",
                "geocoder-php/google-maps-places-provider": "^1.4",
                "laravel-notification-channels/apn": "^3.8",
                "laravel-notification-channels/fcm": "^2.7",
@@ -2539,9 +2539,9 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/storefront/issues",
-                "source": "https://github.com/fleetbase/storefront/tree/v0.2.6"
+                "source": "https://github.com/fleetbase/storefront/tree/v0.2.7"
            },
-            "time": "2024-01-12T10:15:42+00:00"
+            "time": "2024-01-19T11:33:05+00:00"
        },
        {
            "name": "fruitcake/laravel-cors",
--- a/console/app/controllers/auth/verification.js
+++ b/console/app/controllers/auth/verification.js
@@ -81,7 +81,7 @@ export default class AuthVerificationController extends Controller {
     *
     * @memberof OnboardVerifyEmailController
     */
-    @tracked waitTimeout = 800 * 60 * 2;
+    @tracked waitTimeout = 60 * 100;

    /**
     * Determines if Fleetbase is still awaiting verification after a certain time.
@@ -190,8 +190,10 @@ export default class AuthVerificationController extends Controller {
                modal.startLoading();
                const phone = modal.getOption('phone');

-                return this.fetch.post('onboard/send-verification-sms', { phone }).then(() => {
+                return this.fetch.post('onboard/send-verification-sms', { phone, session: this.hello }).then(() => {
                    this.notifications.success('Verification code SMS sent!');
+                }).catch((error) => {
+                    this.notifications.serverError(error);
                });
            },
        });
@@ -211,8 +213,10 @@ export default class AuthVerificationController extends Controller {
                modal.startLoading();
                const email = modal.getOption('email');

-                return this.fetch.post('onboard/send-verification-email', { email }).then(() => {
+                return this.fetch.post('onboard/send-verification-email', { email, session: this.hello }).then(() => {
                    this.notifications.success('Verification code email sent!');
+                }).catch((error) => {
+                    this.notifications.serverError(error);
                });
            },
        });
--- a/console/package.json
+++ b/console/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@fleetbase/console",
-    "version": "0.3.6",
+    "version": "0.3.7",
    "private": true,
    "description": "Fleetbase Console",
    "repository": "https://github.com/fleetbase/fleetbase",
@@ -28,8 +28,8 @@
    "dependencies": {
        "@fleetbase/ember-core": "^0.2.0",
        "@fleetbase/ember-ui": "^0.2.9",
-        "@fleetbase/storefront-engine": "^0.2.6",
-        "@fleetbase/fleetops-engine": "^0.3.9",
+        "@fleetbase/storefront-engine": "^0.2.7",
+        "@fleetbase/fleetops-engine": "^0.4.0",
        "@fleetbase/fleetops-data": "^0.1.7",
        "@fleetbase/dev-engine": "^0.2.0",
        "@fleetbase/iam-engine": "^0.0.8",
--- a/console/pnpm-lock.yaml
+++ b/console/pnpm-lock.yaml
@@ -25,8 +25,8 @@ dependencies:
    specifier: ^0.1.7
    version: 0.1.7
  '@fleetbase/fleetops-engine':
-    specifier: ^0.3.9
-    version: 0.3.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
+    specifier: ^0.4.0
+    version: 0.4.0(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
  '@fleetbase/iam-engine':
    specifier: ^0.0.8
    version: 0.0.8(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
@@ -34,8 +34,8 @@ dependencies:
    specifier: ^3.2.16
    version: 3.2.16
  '@fleetbase/storefront-engine':
-    specifier: ^0.2.6
-    version: 0.2.6(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
+    specifier: ^0.2.7
+    version: 0.2.7(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
  '@fortawesome/ember-fontawesome':
    specifier: ^0.4.1
    version: 0.4.1(rollup@4.9.1)
@@ -2830,8 +2830,8 @@ packages:
      - supports-color
    dev: false

-  /@fleetbase/fleetops-engine@0.3.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
-    resolution: {integrity: sha512-J9UVReq7kIge6INf1aiheKFclrp02xgbm/wRTR3j5O6K62U5qFMOtPLQk+9uSQF21XmsiWOa/ocGrc/BDXsE0Q==, tarball: https://npm.pkg.github.com/download/@fleetbase/fleetops-engine/0.3.9/b2dfc7b4bec17ace689dd49f9f937467ef71857b}
+  /@fleetbase/fleetops-engine@0.4.0(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
+    resolution: {integrity: sha512-wP4ufaBxQ2+gkvAzELySm06sHlocI+2+JZHtQEefqJYlzBHo7bLo9ugNMTLB9b07jbBIzTjreUWUbktcbQraOA==, tarball: https://npm.pkg.github.com/download/@fleetbase/fleetops-engine/0.4.0/247e7c4fb1505cf45cde5da68b5f68ae8b85b7d4}
    engines: {node: '>= 18'}
    peerDependencies:
      ember-engines: ^0.9.0
@@ -2938,8 +2938,8 @@ packages:
      osrm-text-instructions: 0.13.4
    dev: false

-  /@fleetbase/storefront-engine@0.2.6(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
-    resolution: {integrity: sha512-vHXN3eiBrOA9rFIFqxscDuB/WJK5+yvP4vNibYUfSHO+6oRYRqtY6oUnlawmxfk1F/Y3sHvY2/iLM2Xg6f9kKQ==, tarball: https://npm.pkg.github.com/download/@fleetbase/storefront-engine/0.2.6/306781bc7e856a3445421519e945374e1a9b6b4f}
+  /@fleetbase/storefront-engine@0.2.7(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
+    resolution: {integrity: sha512-+dmXqdNt2TuGrbg5FRqYQ2JDEGpFvzrBRShckx1wvOIphOQCcI4GsH8Zdy1BbfAXEwodmdVK+FxD4VGbNe3sYA==, tarball: https://npm.pkg.github.com/download/@fleetbase/storefront-engine/0.2.7/e5ad9ae9e342304a9806c6b136d56283a371e231}
    engines: {node: '>= 18'}
    peerDependencies:
      ember-engines: ^0.9.0
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,6 +37,8 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 # Set some build ENV variables
 ENV LOG_CHANNEL=stdout
 ENV CACHE_DRIVER=null
+ENV BROADCAST_DRIVER=socketcluster
+ENV QUEUE_CONNECTION=redis

 # For development only
 WORKDIR /var/www/html
--- a/packages/core-api
+++ b/packages/core-api
--- a/packages/fleetops
+++ b/packages/fleetops
--- a/packages/storefront
+++ b/packages/storefront