Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-02 19:54:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix company_token issue & pass unset_user to repository (#3629)

Browse Source
This commit is contained in:
Benjamin Beganović 2020-04-15 00:37:27 +02:00 committed by GitHub
parent 2a68dbf792
commit a785329965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/Http/Controllers/MigrationController.php
View File

@ -11,33 +11,16 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Console\Commands\ImportMigrations;
use App\DataMapper\CompanySettings;
use App\Exceptions\MigrationValidatorFailed;
use App\Exceptions\NonExistingMigrationFile;
use App\Exceptions\ProcessingMigrationArchiveFailed;
use App\Exceptions\ResourceNotAvailableForMigration;
use App\Factory\CompanyFactory;
use App\Http\Requests\Account\CreateAccountRequest;
use App\Http\Requests\Migration\UploadMigrationFileRequest;
use App\Jobs\Account\CreateAccount;
use App\Jobs\Util\StartMigration;
use App\Mail\ExistingMigration;
use App\Mail\MigrationFailed;
use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Models\CompanyToken; use App\Models\CompanyToken;
use App\Models\CompanyUser; use App\DataMapper\CompanySettings;
use App\Transformers\AccountTransformer; use App\Jobs\Util\StartMigration;
use App\Transformers\CompanyUserTransformer; use App\Mail\ExistingMigration;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use function GuzzleHttp\Promise\queue; use Illuminate\Http\Request;
use App\Models\User; use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Artisan; use App\Console\Commands\ImportMigrations;
use Illuminate\Foundation\Bus\DispatchesJobs;
class MigrationController extends BaseController class MigrationController extends BaseController
{ {
@ -200,28 +183,31 @@ class MigrationController extends BaseController
$user = auth()->user(); $user = auth()->user();
$existing_company = Company::where('company_key', $request->company_key)->first(); $existing_company = Company::where('company_key', $request->company_key)->first();
info('Request key: ' . $request->company_key);
if ($request->company_key !== $company->company_key) { if ($request->company_key !== $company->company_key) {
info('Migration type: Fresh migration with new company. MigrationController::203'); info('Migration type: Fresh migration with new company. MigrationController::203');
// If there's company with same 'company_key' as from request we would crash it /**
// to avoid duplicate 'company_key' insert error. This should never happen, but just in case to prevent it. * This case is still unresolved.
*
* Following block will happen in case $request->company_key and $company.company_key
* are different in which case the migration might fail due duplicated company_key
* record.
*/
if ($existing_company) { if ($existing_company) {
Mail::to($user)->send(new ExistingMigration());
return; return;
} }
$account = (new ImportMigrations())->getAccount(); $account = (new ImportMigrations())->getAccount();
$company = (new ImportMigrations())->getCompany($account); $company = (new ImportMigrations())->getCompany($account);
CompanyToken::create([ $company_token = new CompanyToken();
'user_id' => $user->id, $company_token->user_id = $user->id;
'company_id' => $company->id, $company_token->company_id = $company->id;
'account_id' => $account->id, $company_token->account_id = $account->id;
'name' => $request->token_name ?? Str::random(12), $company_token->name = $request->token_name ?? Str::random(12);
'token' => $request->token ?? \Illuminate\Support\Str::random(64), $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
]); $company_token->save();
$user->companies()->attach($company->id, [ $user->companies()->attach($company->id, [
'account_id' => $account->id, 'account_id' => $account->id,
@ -242,13 +228,13 @@ class MigrationController extends BaseController
$account = (new ImportMigrations())->getAccount(); $account = (new ImportMigrations())->getAccount();
$company = (new ImportMigrations())->getCompany($account); $company = (new ImportMigrations())->getCompany($account);
CompanyToken::create([ $company_token = new CompanyToken();
'user_id' => $user->id, $company_token->user_id = $user->id;
'company_id' => $company->id, $company_token->company_id = $company->id;
'account_id' => $account->id, $company_token->account_id = $account->id;
'name' => $request->token_name ?? Str::random(12), $company_token->name = $request->token_name ?? Str::random(12);
'token' => $request->token ?? \Illuminate\Support\Str::random(64), $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
]); $company_token->save();
$user->companies()->attach($company->id, [ $user->companies()->attach($company->id, [
'account_id' => $account->id, 'account_id' => $account->id,

2
app/Jobs/Util/Import.php
View File

@ -281,7 +281,7 @@ class Import implements ShouldQueue
$modified = $resource; $modified = $resource;
unset($modified['id']); unset($modified['id']);
$user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, false); $user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, true);
$user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT'); $user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT');