fix npm issue

added name validation to register controller
fixed register frontend validator issue
This commit is contained in:
Jack Goh
2018-07-04 11:54:28 +08:00
parent 8798c83b97
commit 54f6722472
4 changed files with 60 additions and 97 deletions
@@ -46,7 +46,8 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'marking' => 'required|max:255|unique:markings'
'name' => 'required|name|max:255',
'marking' => 'required|max:255|unique:markings',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
]);
@@ -61,14 +62,16 @@ class RegisterController extends Controller
protected function create(Request $data)
{
$marking = Marking::Where('email',$data['email'])->first();
if(!$marking){
return response()->json('Access Denied', 401);
return response()->json('Does not exist ', 400);
}
if($marking->marking != $data['marking']){
return response()->json('Wrong Marking', 400);
return response()->json('Incorrect marking', 400);
}
if(User::Where('email',$data['email'])->first()){
return response()->json('Email already exist in the system', 401);
return response()->json('Email already exist in the system', 400);
}
$role = Role::where('name','=','member')->first();