diff --git a/api/app/Http/Kernel.php b/api/app/Http/Kernel.php index 4f18062a..13591a65 100644 --- a/api/app/Http/Kernel.php +++ b/api/app/Http/Kernel.php @@ -40,7 +40,6 @@ class Kernel extends HttpKernel ], 'api' => [ - // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, 'throttle:api', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], diff --git a/api/app/Providers/RouteServiceProvider.php b/api/app/Providers/RouteServiceProvider.php index df99802d..71e6923d 100644 --- a/api/app/Providers/RouteServiceProvider.php +++ b/api/app/Providers/RouteServiceProvider.php @@ -2,10 +2,8 @@ namespace App\Providers; -use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Http\Request; -use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider @@ -17,17 +15,15 @@ class RouteServiceProvider extends ServiceProvider */ public function boot() { - $this->configureRateLimiting(); - $this->routes( function () { Route::get( - '/status', - function () { + '/health', + function (Request $request) { return response()->json( [ 'status' => 'ok', - 'time' => microtime(true) - LARAVEL_START + 'time' => microtime(true) - $request->attributes->get('request_start_time') ] ); } @@ -35,19 +31,4 @@ class RouteServiceProvider extends ServiceProvider } ); } - - /** - * Configure the rate limiters for the application. - * - * @return void - */ - protected function configureRateLimiting() - { - RateLimiter::for( - 'api', - function (Request $request) { - return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip()); - } - ); - } } diff --git a/console/app/models/user.js b/console/app/models/user.js index 89914341..0e965338 100644 --- a/console/app/models/user.js +++ b/console/app/models/user.js @@ -23,6 +23,7 @@ export default class UserModel extends Model { @attr('string') timezone; @attr('string') country; @attr('string') ip_address; + @attr('string') aws_customer_id; @attr('string') slug; @attr('string') role_name; @attr('string') type; diff --git a/console/app/templates/onboard/index.hbs b/console/app/templates/onboard/index.hbs index fc0bb292..a1c78dbf 100644 --- a/console/app/templates/onboard/index.hbs +++ b/console/app/templates/onboard/index.hbs @@ -35,4 +35,8 @@