Merge pull request #5286 from beganovich/v5-3003-company-user-registration

(v5) Fix acessing client register route without company instance
This commit is contained in:
Benjamin Beganović 2021-03-30 16:30:16 +02:00 committed by GitHub
commit eec902429a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,9 @@
namespace App\Http\Requests\ClientPortal; namespace App\Http\Requests\ClientPortal;
use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Utils\Ninja;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
class RegisterRequest extends FormRequest class RegisterRequest extends FormRequest
@ -43,6 +45,14 @@ class RegisterRequest extends FormRequest
return Company::where('company_key', $this->company_key)->firstOrFail(); return Company::where('company_key', $this->company_key)->firstOrFail();
} }
if (!$this->route()->parameter('company_key') && Ninja::isSelfHost()) {
$company = Account::first()->default_company;
abort_unless($company->client_can_register, 404);
return $company;
}
abort(404); abort(404);
} }
} }