Actualizacuion de Rama Kquiroz
This commit is contained in:
@@ -52,17 +52,23 @@ class AuthController extends Controller
|
||||
if ($validator->fails()) {
|
||||
return response()->json([
|
||||
'result' => false,
|
||||
'message' => $validator->errors()
|
||||
'message' => $validator->errors()->all()
|
||||
]);
|
||||
}
|
||||
|
||||
$user = new User([
|
||||
'name' => $request->name,
|
||||
'email' => $request->register_by == 'email' ? $request->email_or_phone : '',
|
||||
'phone' => $request->register_by == 'phone' ? $request->email_or_phone : '',
|
||||
'password' => bcrypt($request->password),
|
||||
'verification_code' => rand(100000, 999999)
|
||||
]);
|
||||
$user = new User();
|
||||
$user->name = $request->name;
|
||||
if ($request->register_by == 'email') {
|
||||
|
||||
$user->email = $request->email_or_phone;
|
||||
}
|
||||
if ($request->register_by == 'phone') {
|
||||
$user->phone = $request->email_or_phone;
|
||||
}
|
||||
$user->password = bcrypt($request->password);
|
||||
$user->verification_code = rand(100000, 999999);
|
||||
$user->save();
|
||||
|
||||
|
||||
$user->email_verified_at = null;
|
||||
if ($user->email != null) {
|
||||
@@ -172,9 +178,9 @@ class AuthController extends Controller
|
||||
if (!$user->banned) {
|
||||
if (Hash::check($request->password, $user->password)) {
|
||||
|
||||
if ($user->email_verified_at == null) {
|
||||
return response()->json(['result' => false, 'message' => translate('Please verify your account'), 'user' => null], 401);
|
||||
}
|
||||
// if ($user->email_verified_at == null) {
|
||||
// return response()->json(['result' => false, 'message' => translate('Please verify your account'), 'user' => null], 401);
|
||||
// }
|
||||
return $this->loginSuccess($user);
|
||||
} else {
|
||||
return response()->json(['result' => false, 'message' => translate('Unauthorized'), 'user' => null], 401);
|
||||
|
||||
Reference in New Issue
Block a user