Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:17:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5065 from turbo124/v5-develop

Browse Source 
Minor fixes
This commit is contained in:
David Bomba 2021-03-09 16:39:46 +11:00 committed by GitHub
commit cc563a9d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.14 5.1.15

3
app/Http/Middleware/TokenAuth.php
View File

@ -51,8 +51,6 @@ class TokenAuth
*/ */
$user->setCompany($company_token->company); $user->setCompany($company_token->company);
config(['ninja.company_id' => $company_token->company->id]);
app('queue')->createPayloadUsing(function () use ($company_token) { app('queue')->createPayloadUsing(function () use ($company_token) {
return ['db' => $company_token->company->db]; return ['db' => $company_token->company->db];
}); });
@ -71,6 +69,7 @@ class TokenAuth
auth()->login($user, false); auth()->login($user, false);
event(new UserLoggedIn($user, $company_token->company, Ninja::eventVars())); event(new UserLoggedIn($user, $company_token->company, Ninja::eventVars()));
} else { } else {
$error = [ $error = [
'message' => 'Invalid token', 'message' => 'Invalid token',

2
config/ninja.php
View File

@ -13,7 +13,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.14', 'app_version' => '5.1.15',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),