Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fleetbase/core-api",
"version": "1.6.42",
"version": "1.6.43",
"description": "Core Framework and Resources for Fleetbase API",
"keywords": [
"fleetbase",
Expand Down
30 changes: 30 additions & 0 deletions src/Events/UserCreatedNewCompany.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Fleetbase\Events;

use Fleetbase\Models\Company;
use Fleetbase\Models\User;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;

class UserCreatedNewCompany
{
use Dispatchable;
use InteractsWithSockets;
use SerializesModels;

public $user;
public $company;

/**
* Create a new event instance.
*
* @return void
*/
public function __construct(User $user, Company $company)
{
$this->user = $user;
$this->company = $company;
}
}
18 changes: 17 additions & 1 deletion src/Http/Controllers/Internal/v1/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Fleetbase\Http\Controllers\Internal\v1;

use Fleetbase\Events\UserCreatedNewCompany;
use Fleetbase\Exceptions\InvalidVerificationCodeException;
use Fleetbase\Http\Controllers\Controller;
use Fleetbase\Http\Requests\AdminRequest;
Expand Down Expand Up @@ -799,7 +800,22 @@ public function createOrganization(Request $request)

try {
$company = Company::create($input);
$company->assignUser($user, 'Administrator');

// Set company owner
$company->setOwner($user)->save();

// Assign user to organization
$user->assignCompany($company, 'Administrator');
$user->assignSingleRole('Administrator');

// Company onboarding is not necessary - set correct flags
$company->update([
'onboarding_completed_at' => now(),
'onboarding_completed_by_uuid' => $user->uuid,
]);

// Fire event that user created a new organization
event(new UserCreatedNewCompany($user, $company));
} catch (\Throwable $e) {
return response()->error($e->getMessage());
}
Expand Down
Loading