From d36cb2fafa1a8302954cf3d820ecad8c18536aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 14 Apr 2020 00:20:38 +0200
Subject: [PATCH] Refactor steps controller (#3627)

---
 app/Http/Controllers/Migration/StepsController.php | 2 +-
 resources/views/migration/companies.blade.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php
index 788b83f43601..0c4b984188c6 100644
--- a/app/Http/Controllers/Migration/StepsController.php
+++ b/app/Http/Controllers/Migration/StepsController.php
@@ -160,7 +160,7 @@ class StepsController extends BaseController
                 ->force(array_key_exists('force', $company))
                 ->company($company['id'])
                 ->endpoint(session('MIGRATION_ENDPOINT'))
-                ->companyKey($company['key'])
+                ->companyKey($request->account_key)
                 ->start();
         }
 
diff --git a/resources/views/migration/companies.blade.php b/resources/views/migration/companies.blade.php
index 141a3605fba3..d521a80ec0b1 100644
--- a/resources/views/migration/companies.blade.php
+++ b/resources/views/migration/companies.blade.php
@@ -14,6 +14,7 @@
             <h4>Awesome! Please select the company you would like to apply migration.</h4>
             <form action="/migration/companies" method="post" id="auth-form">
                 {{ csrf_field() }}
+                <input type="hidden" name="account_key" value="{{ auth()->user()->account->account_key }}">
                     
                 @foreach($companies as $company)
                 <div class="form-check">
@@ -24,7 +25,6 @@
                 </div>
                 <div class="form-group">
                     <input type="checkbox" name="companies[{{ $company->id }}][force]">
-                    <input type="hidden" name="companies[{{ $company->id }}][key]" value="{{ $company->company_key }}">
                     <label for="force">Force migration</label>
                     <small>* All current company data will be wiped.</small>
                 </div>