diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index c2228b1c5052..f1c66b0a3a4f 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -93,7 +93,7 @@ class UpdateCompanyRequest extends Request * are saveable * * @param object $settings - * @return stdClass $settings + * @return \stdClass $settings */ private function filterSaveableSettings($settings) { diff --git a/app/Models/License.php b/app/Models/License.php new file mode 100644 index 000000000000..bc4f20b70d8d --- /dev/null +++ b/app/Models/License.php @@ -0,0 +1,19 @@ +default_rate_limit); - else { + if (Ninja::isSelfHost()) { + return Limit::none(); + }else { return Limit::perMinute(50); } @@ -57,9 +57,9 @@ class RouteServiceProvider extends ServiceProvider RateLimiter::for('api', function () { - if(Ninja::isSelfHost()) - return Limit::perMinute($this->default_rate_limit); - else { + if (Ninja::isSelfHost()) { + return Limit::none(); + }else { return Limit::perMinute(300); } @@ -67,9 +67,9 @@ class RouteServiceProvider extends ServiceProvider RateLimiter::for('refresh', function () { - if(Ninja::isSelfHost()) - return Limit::perMinute($this->default_rate_limit); - else { + if (Ninja::isSelfHost()) { + return Limit::none(); + }else { return Limit::perMinute(200); } diff --git a/resources/views/email/template/admin.blade.php b/resources/views/email/template/admin.blade.php index 98c8b2128406..96547c9d5883 100644 --- a/resources/views/email/template/admin.blade.php +++ b/resources/views/email/template/admin.blade.php @@ -1,6 +1,6 @@ @php $primary_color = isset($settings) ? $settings->primary_color : '#4caf50'; - $email_alignment = isset($settings) ? $settings->email_alignment : 'center'; + $email_alignment = isset($settings) && $settings?->email_alignment ? $settings->email_alignment : 'center'; @endphp ['throttle:api', 'api_secret_check']], function () }); Route::group(['middleware' => ['throttle:login','api_secret_check','email_db']], function () { - Route::post('api/v1/login', [LoginController::class, 'apiLogin'])->name('login.submit')->middleware('throttle:20,1'); + Route::post('api/v1/login', [LoginController::class, 'apiLogin'])->name('login.submit'); Route::post('api/v1/reset_password', [ForgotPasswordController::class, 'sendResetLinkEmail']); });