From de1a5252ecd34e07415a9b7013c5e4bf3a80c1b0 Mon Sep 17 00:00:00 2001 From: Jeramy Simpson Date: Thu, 26 Mar 2015 14:15:18 +1000 Subject: [PATCH] Fixes the creation of the initial user during setup --- app/Http/Controllers/AppController.php | 18 +++++++++++++----- app/Ninja/Repositories/AccountRepository.php | 4 ++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index 03b1acea1750..4e8edf03624f 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -1,5 +1,6 @@ true)); // Debug Purposes Artisan::call('migrate', array('--force' => true)); Artisan::call('db:seed', array('--force' => true)); $account = $this->accountRepo->create(); - $user = $account->users()->first(); + // Create User + $user = new User; $user->first_name = trim(Input::get('first_name')); $user->last_name = trim(Input::get('last_name')); $user->email = trim(strtolower(Input::get('email'))); - $user->username = $user->email; + + // Username getting the error: "The username may only contain letters, numbers, and dashes." + // Not sure where this validation comes from? + $user->username = 'test'; //$user->email; + $user->password = trim(Input::get('password')); $user->password_confirmation = trim(Input::get('password')); $user->registered = true; + $user->account()->associate($account); $user->save(); - //Auth::login($user, true); - //$this->accountRepo->registerUser($user); + Auth::login($user, true); - return Redirect::to('/invoices/create'); + return Redirect::to('/dashboard'); } private function testDatabase($database) diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php index 452ca0ac05e1..27311ebf9385 100644 --- a/app/Ninja/Repositories/AccountRepository.php +++ b/app/Ninja/Repositories/AccountRepository.php @@ -32,7 +32,7 @@ class AccountRepository $account->save(); - $random = str_random(RANDOM_KEY_LENGTH); + /* $random = str_random(RANDOM_KEY_LENGTH); // I don't like how this is done with regards to init setup. I think it needs a refresh. $user = new User(); @@ -41,7 +41,7 @@ class AccountRepository $user->email = 'test@test.com'; $user->username = $random; $user->confirmed = !Utils::isNinja(); - $account->users()->save($user, []); + $account->users()->save($user, []);*/ return $account; }