Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 16:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for company tokens (#3612)

Browse Source
This commit is contained in:
David Bomba 2020-04-09 22:36:20 +10:00 committed by GitHub
parent 4b18041d36
commit 36c2c64625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/ArtisanUpgrade.php
View File

@ -55,7 +55,7 @@ class ArtisanUpgrade extends Command
} }
putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer'); putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
$input = new ArrayInput(array('command' => 'install')); $input = new ArrayInput(array('command' => 'update'));
$application = new Application(); $application = new Application();
$application->setAutoExit(true); // prevent `$application->run` method from exitting the script $application->setAutoExit(true); // prevent `$application->run` method from exitting the script
$application->run($input); $application->run($input);

49
app/Console/Commands/CreateTestData.php
View File

@ -31,6 +31,7 @@ use Faker\Factory;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Str;
class CreateTestData extends Command class CreateTestData extends Command
{ {
@ -102,15 +103,13 @@ class CreateTestData extends Command
]); ]);
} }
$token = \Illuminate\Support\Str::random(64); $company_token = new CompanyToken;
$company_token->user_id = $user->id;
$company_token = CompanyToken::create([ $company_token->company_id = $company->id;
'user_id' => $user->id, $company_token->account_id = $account->id;
'company_id' => $company->id, $company_token->name = 'test token';
'account_id' => $account->id, $company_token->token = Str::random(64);
'name' => 'test token', $company_token->save();
'token' => $token,
]);
$user->companies()->attach($company->id, [ $user->companies()->attach($company->id, [
'account_id' => $account->id, 'account_id' => $account->id,
@ -183,15 +182,13 @@ class CreateTestData extends Command
]); ]);
} }
$token = \Illuminate\Support\Str::random(64); $company_token = new CompanyToken;
$company_token->user_id = $user->id;
$company_token = CompanyToken::create([ $company_token->company_id = $company->id;
'user_id' => $user->id, $company_token->account_id = $account->id;
'company_id' => $company->id, $company_token->name = 'test token';
'account_id' => $account->id, $company_token->token = Str::random(64);
'name' => 'test token', $company_token->save();
'token' => $token,
]);
$user->companies()->attach($company->id, [ $user->companies()->attach($company->id, [
'account_id' => $account->id, 'account_id' => $account->id,
@ -289,15 +286,13 @@ class CreateTestData extends Command
]); ]);
} }
$token = \Illuminate\Support\Str::random(64); $company_token = new CompanyToken;
$company_token->user_id = $user->id;
$company_token = CompanyToken::create([ $company_token->company_id = $company->id;
'user_id' => $user->id, $company_token->account_id = $account->id;
'company_id' => $company->id, $company_token->name = 'test token';
'account_id' => $account->id, $company_token->token = Str::random(64);
'name' => 'test token', $company_token->save();
'token' => $token,
]);
$user->companies()->attach($company->id, [ $user->companies()->attach($company->id, [
'account_id' => $account->id, 'account_id' => $account->id,