From 80e4a6a06062d379035800b56759621c1e3a67d6 Mon Sep 17 00:00:00 2001 From: Kekskurse Date: Wed, 17 Jul 2019 11:31:30 +0200 Subject: [PATCH] Either Hot Shit or Total Bollocks --- app/Http/Controllers/API/AppController.php | 4 ++-- app/Providers/AppServiceProvider.php | 6 ++++++ bootstrap/app.php | 2 +- build.sh | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/API/AppController.php b/app/Http/Controllers/API/AppController.php index 472ba5a..d0a5883 100644 --- a/app/Http/Controllers/API/AppController.php +++ b/app/Http/Controllers/API/AppController.php @@ -81,8 +81,8 @@ class AppController extends BaseController $app = \App\Models\App::query()->where("id", "=", $id)->firstOrFail(); - if($app->owner_id != Auth::user()->id) { - throw new NoPermissionException(403, "Not your app"); + if($app->user_id != Auth::user()->id) { + throw new NoPermissionException(403, "Not your app (".$app->user_id."/".Auth::user()->id.")"); } $app->name = $request->input("name"); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ddec046..1637792 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,10 +2,16 @@ namespace App\Providers; +use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider { + + public function boot(){ + Schema::defaultStringLength(191); + } + /** * Register any application services. * diff --git a/bootstrap/app.php b/bootstrap/app.php index fb98a31..0d8d1f1 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -83,7 +83,7 @@ $app->routeMiddleware([ | */ -// $app->register(App\Providers\AppServiceProvider::class); +$app->register(App\Providers\AppServiceProvider::class); $app->register(App\Providers\AuthServiceProvider::class); // $app->register(App\Providers\EventServiceProvider::class); diff --git a/build.sh b/build.sh index d85f04f..70d2b30 100644 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ rm -r -f storage/logs/l* chmod uog+rwx storage/logs composer install --no-dev -docker build -t docker.keks.cloud/keksaccount/web:latest -f Dockerfile-app . +docker build -t docker.keks.cloud/keksaccount/web:latest -f Dockerfile-web . docker build -t docker.keks.cloud/keksaccount/app:latest -f Dockerfile-app . docker push docker.keks.cloud/keksaccount/web:latest