diff --git a/VERSION.txt b/VERSION.txt index 63f23b12f92a..40dc92612c46 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.14 \ No newline at end of file +5.1.15 \ No newline at end of file diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php index 105dfdcb6763..b93f7c90479e 100644 --- a/app/Http/Middleware/TokenAuth.php +++ b/app/Http/Middleware/TokenAuth.php @@ -51,8 +51,6 @@ class TokenAuth */ $user->setCompany($company_token->company); - config(['ninja.company_id' => $company_token->company->id]); - app('queue')->createPayloadUsing(function () use ($company_token) { return ['db' => $company_token->company->db]; }); @@ -71,6 +69,7 @@ class TokenAuth auth()->login($user, false); event(new UserLoggedIn($user, $company_token->company, Ninja::eventVars())); + } else { $error = [ 'message' => 'Invalid token', diff --git a/config/ninja.php b/config/ninja.php index 7599c029b53c..f9c64b250f51 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -13,7 +13,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.14', + 'app_version' => '5.1.15', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),