Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-01 20:17:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hillel Coren 2016-03-13 17:39:03 +02:00
commit 39fc63886b
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/AccountApiController.php
View File

@ -34,25 +34,8 @@ class AccountApiController extends BaseAPIController
$this->accountRepo = $accountRepo;
}
public function register(Request $request)
public function register(RegisterRequest $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();

32
app/Http/Requests/RegisterRequest.php
View File

@ -2,7 +2,11 @@
use Auth;
use App\Http\Requests\Request;
use Illuminate\Http\Request as InputRequest;
use Illuminate\Support\Facades\Log;
use Illuminate\Validation\Factory;
use App\Libraries\Utils;
use Response;
class RegisterRequest extends Request
{
@ -11,6 +15,13 @@ class RegisterRequest extends Request
*
* @return bool
*/
public function __construct(InputRequest $req)
{
$this->req = $req;
}
public function authorize()
{
return true;
@ -23,6 +34,7 @@ class RegisterRequest extends Request
*/
public function rules()
{
$rules = [
'email' => 'required|unique:users',
'first_name' => 'required',
@ -32,4 +44,24 @@ class RegisterRequest extends Request
return $rules;
}
public function response(array $errors)
{
/* If the user is not validating from a mobile app - pass through parent::response */
if(!isset($this->req->api_secret))
return parent::response($errors);
/* If the user is validating from a mobile app - pass through first error string and return error */
foreach($errors as $error) {
foreach ($error as $key => $value) {
$message['error'] = ['message'=>$value];
$message = json_encode($message, JSON_PRETTY_PRINT);
$headers = Utils::getApiHeaders();
return Response::make($message, 400, $headers);
}
}
}
}