responses fixed
This commit is contained in:
ilmedova
parent
1561ff682c
commit
ad39c49986
|
|
@ -81,7 +81,11 @@ public function login(Request $request){
|
|||
// do the passwords match?
|
||||
if (!Hash::check(request()->password, $client->password)){
|
||||
// no they don't
|
||||
return response()->json(['error' => 'Unauthorized'], 401);
|
||||
return response()->json([
|
||||
'error' => [
|
||||
'message' => 'Unauthorized'
|
||||
]
|
||||
], 401);
|
||||
}
|
||||
|
||||
Auth::login($client);
|
||||
|
|
@ -90,7 +94,7 @@ public function login(Request $request){
|
|||
$tokenResult = $client->createToken('auth_token');
|
||||
|
||||
// return token in json response
|
||||
return response()->json(['success' => ['token' => $tokenResult, 'client' => $client]], 200);
|
||||
return response()->json(['data' => ['token' => $tokenResult, 'client' => $client]], 200);
|
||||
}
|
||||
return response()->json(['error' => ['message' => 'email not found']], 404);
|
||||
}
|
||||
|
|
@ -166,7 +170,9 @@ public function register(Request $request){
|
|||
$client = Client::where('email', $data['email'])->first();
|
||||
if($client){
|
||||
return response()->json([
|
||||
'error' => 'This email is already used'
|
||||
'error' => [
|
||||
'message' => 'This email is already used'
|
||||
]
|
||||
], 401);
|
||||
}
|
||||
|
||||
|
|
@ -174,8 +180,10 @@ public function register(Request $request){
|
|||
Mail::to($request->email)->send(new EmailVerification($client->firstname, $token));
|
||||
|
||||
return response()->json([
|
||||
'message' => 'confirmation code sent',
|
||||
'email' => $client->email
|
||||
'data' => [
|
||||
'message' => 'confirmation code sent',
|
||||
'email' => $client->email
|
||||
]
|
||||
],200);
|
||||
}
|
||||
|
||||
|
|
@ -197,7 +205,9 @@ public function register(Request $request){
|
|||
$client = Client::where('email', $data['email'])->first();
|
||||
if($client){
|
||||
return response()->json([
|
||||
'error' => 'This email is already used'
|
||||
'error' => [
|
||||
'message' => 'This email is already used'
|
||||
]
|
||||
], 401);
|
||||
}
|
||||
|
||||
|
|
@ -209,10 +219,19 @@ public function register(Request $request){
|
|||
$tokenResult = $client->createToken('auth_token');
|
||||
|
||||
// return token in json response
|
||||
return response()->json(['success' => ['token' => $tokenResult, 'client' => $client]], 200);
|
||||
return response()->json([
|
||||
'data' => [
|
||||
'token' => $tokenResult,
|
||||
'client' => $client
|
||||
]
|
||||
], 200);
|
||||
}
|
||||
catch(\Exception $e){
|
||||
return response()->json(['error' => ['message' => $e->getMessage()]], 400);
|
||||
return response()->json([
|
||||
'error' => [
|
||||
'message' => $e->getMessage()
|
||||
]
|
||||
], 400);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -275,20 +294,28 @@ public function verifyEmail(Request $request){
|
|||
$tokenResult = $client->createToken('auth_token');
|
||||
|
||||
// return token in json response
|
||||
return response()->json(['success' => ['token' => $tokenResult, 'client' => $client]], 200);
|
||||
return response()->json(['data' => ['token' => $tokenResult, 'client' => $client]], 200);
|
||||
}
|
||||
else{
|
||||
return response()->json(['error' => ['message' => 'tokens don\'t match']], 401);
|
||||
}
|
||||
}
|
||||
else{
|
||||
return response()->json(['error' => ['message' => 'no such client']], 404);
|
||||
return response()->json([
|
||||
'error' => [
|
||||
'message' => 'no such client'
|
||||
]
|
||||
], 404);
|
||||
}
|
||||
}
|
||||
catch(\Exception $e){
|
||||
return response()->json(['error' => ['message' => $e->getMessage()]], 404);
|
||||
return response()->json([
|
||||
'error' => [
|
||||
'message' => $e->getMessage()
|
||||
]
|
||||
], 404);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -314,7 +341,7 @@ public function client(Request $request) {
|
|||
$user = $request->user();
|
||||
if($user){
|
||||
return response()->json([
|
||||
'success' => [
|
||||
'data' => [
|
||||
'client' => $request->user()
|
||||
]
|
||||
],200);
|
||||
|
|
@ -358,7 +385,7 @@ public function logout(Request $request) {
|
|||
$request->user()->currentAccessToken()->delete();
|
||||
//$request->user->tokens()->delete(); // use this to revoke all tokens (logout from all devices)
|
||||
return response()->json([
|
||||
'success' => [
|
||||
'data' => [
|
||||
'message' => 'ok'
|
||||
]
|
||||
], 200);
|
||||
|
|
@ -370,7 +397,7 @@ public function logout(Request $request) {
|
|||
]
|
||||
], 200);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -418,7 +445,7 @@ public function sendPasswordResetLinkEmail(Request $request) {
|
|||
Mail::to($request->email)->send(new ResetPassword($user->firstname, $token));
|
||||
|
||||
return response()->json([
|
||||
'succes' => [
|
||||
'data' => [
|
||||
'message' => 'OK'
|
||||
]
|
||||
], 200);
|
||||
|
|
@ -430,7 +457,7 @@ public function sendPasswordResetLinkEmail(Request $request) {
|
|||
]
|
||||
], 200);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -476,19 +503,19 @@ public function updatePassword(Request $request) {
|
|||
'password' => 'required',
|
||||
'confirm_password' => 'required|same:password'
|
||||
]);
|
||||
|
||||
|
||||
$user = Client::where('email', $request->email)->first();
|
||||
if($user && $request->token == $user->token){
|
||||
$user['is_verified'] = 0;
|
||||
$user['password'] = Hash::make($request->password);
|
||||
$user->save();
|
||||
return response()->json([
|
||||
'succes' => [
|
||||
'data' => [
|
||||
'message' => 'OK'
|
||||
]
|
||||
], 200);
|
||||
}
|
||||
|
||||
|
||||
return response()->json([
|
||||
'error' => [
|
||||
'message' => 'not_found'
|
||||
|
|
@ -580,7 +607,7 @@ public function updateClient(Request $request){
|
|||
}
|
||||
$client->save();
|
||||
return response()->json([
|
||||
'success' => [
|
||||
'data' => [
|
||||
'client' => $client
|
||||
]
|
||||
], 200);
|
||||
|
|
@ -598,7 +625,6 @@ public function updateClient(Request $request){
|
|||
]
|
||||
], 401);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue