Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

This commit is contained in:
Hillel Coren 2016-03-13 13:32:53 +02:00
commit fe27ded103
2 changed files with 20 additions and 2 deletions

View File

@ -37,7 +37,7 @@ install:
- travis_retry composer install --prefer-dist;
before_script:
# prevent MySQL went away error
# prevent MySQL went away error
- mysql -u root -e 'SET @@GLOBAL.wait_timeout=28800;'
# copy configuration files
- cp .env.example .env

View File

@ -34,8 +34,26 @@ class AccountApiController extends BaseAPIController
$this->accountRepo = $accountRepo;
}
public function register(RegisterRequest $request)
public function register(Request $request)
{
$validator = Validator::make($request->all(), [
'email' => 'required|unique:users',
'first_name' => 'required',
'last_name' => 'required',
'password' => 'required',
]);
if ($validator->fails()) {
foreach($validator->errors()->all() as $message)
{
return $this->errorResponse(['message'=>$message],400);
}
}
$account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);
$user = $account->users()->first();