cleanup
This commit is contained in:
@@ -146,27 +146,26 @@ class UserController extends ApiController
|
|||||||
public function register(UserRegisterRequest $request)
|
public function register(UserRegisterRequest $request)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
$userData = $request->only([
|
||||||
|
'first_name',
|
||||||
|
'last_name',
|
||||||
|
'email',
|
||||||
|
'phone',
|
||||||
|
'password',
|
||||||
|
'display_name',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$userData['password'] = Hash::make($userData['password']);
|
||||||
|
|
||||||
$user = User::where('email', $request->input('email'))
|
$user = User::where('email', $request->input('email'))
|
||||||
->whereNull('password')
|
->whereNull('password')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($user === null) {
|
if ($user === null) {
|
||||||
$user = User::create([
|
$user = User::create($userData);
|
||||||
'first_name' => $request->input('first_name'),
|
|
||||||
'last_name' => $request->input('last_name'),
|
|
||||||
'email' => $request->input('email'),
|
|
||||||
'phone' => $request->input('phone', ''),
|
|
||||||
'password' => Hash::make($request->input('password')),
|
|
||||||
'display_name' => $request->input('display_name'),
|
|
||||||
]);
|
|
||||||
} else {
|
} else {
|
||||||
$user->update([
|
unset($userData['email']);
|
||||||
'first_name' => $request->input('first_name'),
|
$user->update($userData);
|
||||||
'last_name' => $request->input('last_name'),
|
|
||||||
'phone' => $request->input('phone', ''),
|
|
||||||
'password' => Hash::make($request->input('password')),
|
|
||||||
'display_name' => $request->input('display_name'),
|
|
||||||
]);
|
|
||||||
}//end if
|
}//end if
|
||||||
|
|
||||||
$code = $user->codes()->create([
|
$code = $user->codes()->create([
|
||||||
|
|||||||
Reference in New Issue
Block a user