Skip to content

Commit

Permalink
Merge pull request #185 from fleetbase/dev-v0.3.7
Browse files Browse the repository at this point in the history
v0.3.7
  • Loading branch information
roncodes committed Jan 19, 2024
2 parents bc0ba3e + 3ebedab commit 7477088
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 54 deletions.
6 changes: 3 additions & 3 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.3.7",
"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",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75",
Expand Down
68 changes: 34 additions & 34 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions console/app/controllers/auth/verification.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
});
},
});
Expand All @@ -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);
});
},
});
Expand Down
6 changes: 3 additions & 3 deletions console/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions console/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/storefront

0 comments on commit 7477088

Please sign in to comment.