From 8554c6cceb6788a88211c6a79d34014a3057fee3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 17 Jul 2021 17:38:59 +1000 Subject: [PATCH] Working on improving hosted migration experience --- app/Http/Controllers/HostedMigrationController.php | 4 ++-- app/Jobs/User/CreateUser.php | 2 +- routes/api.php | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/HostedMigrationController.php b/app/Http/Controllers/HostedMigrationController.php index bf967433ef8f..7415dca2395b 100644 --- a/app/Http/Controllers/HostedMigrationController.php +++ b/app/Http/Controllers/HostedMigrationController.php @@ -21,6 +21,7 @@ class HostedMigrationController extends Controller public function getAccount(Request $request) { + if($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret')) return; @@ -32,8 +33,7 @@ class HostedMigrationController extends Controller return response()->json(['token' => $user->account->companies->first()->tokens->first()->token] ,200); } - - return response()->json(['error' => 'This user is not able to perform a migration. Please contact us at contact@invoiceninja.com to discuss.'], 401) + return response()->json(['error' => 'This user is not able to perform a migration. Please contact us at contact@invoiceninja.com to discuss.'], 401); } diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index 0962eaf5d410..8b767762d56d 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -58,7 +58,7 @@ class CreateUser { $user = new User(); $user->account_id = $this->account->id; - $user->password = bcrypt($this->request['password']); + $user->password = $this->request['password'] ? bcrypt($this->request['password']) : ''; $user->accepted_terms_version = config('ninja.terms_version'); $user->confirmation_code = $this->createDbHash(config('database.default')); $user->fill($this->request); diff --git a/routes/api.php b/routes/api.php index 2dba96ccc669..ce068d9077cb 100644 --- a/routes/api.php +++ b/routes/api.php @@ -205,7 +205,6 @@ Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{compa Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook'); Route::get('token_hash_router', 'OneTimeTokenController@router'); Route::get('webcron', 'WebCronController@index'); - -Route::post('api/v1/get_migration_account', 'HostedMigration@getAccount'); +Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest'); Route::fallback('BaseController@notFound');