tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

change response json

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-03 10:50:27 +07:00
parent c6f5d129c2
commit b96c6726e9
10 changed files with 62 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Modules/Linksehat/Http/Controllers/Api/AuthController.php
View File

@@ -2,6 +2,7 @@
namespace Modules\Linksehat\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Models\Person;
use App\Models\User;
@@ -10,6 +11,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Laravel\Socialite\Facades\Socialite;
use Modules\Linksehat\Transformers\UserProfileResource;
use Symfony\Component\HttpFoundation\Response;
use Validator;
class AuthController extends Controller
@@ -60,11 +62,9 @@ class AuthController extends Controller
}
if (!$user) {
return response()->json([
'message' => filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ?
"User dengan alamat email " . $request->phone_or_email . " tidak ditemukan" :
"User dengan nomor telepon " . $request->phone_or_email . " tidak ditemukan"
], 404);
$message = filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ? "User dengan alamat email " . $request->phone_or_email . " tidak ditemukan" : "User dengan nomor telepon " . $request->phone_or_email . " tidak ditemukan";
return Helper::responseJson(statusCode: Response::HTTP_NOT_FOUND, message: $message);
}
// TODO Send the OTP
@@ -74,13 +74,10 @@ class AuthController extends Controller
// Send Whatsapp
}
return response()->json([
'message' => 'OTP Terkirim',
'data' => [
'otp' => $user->otp,
'otp_valid_until' => $user->otp_created_at->addMinutes(config('linksehat.otp_valid_minutes'))
]
]);
return Helper::responseJson(data: [
'otp' => $user->otp,
'otp_valid_until' => $user->otp_created_at->addMinutes(config('linksehat.otp_valid_minutes'))
], message: 'OTP Terkirim');
}
public function login(Request $request)
@@ -124,11 +121,7 @@ class AuthController extends Controller
return response(['message' => 'Mode Login Tidak Dikenal'], 403);
}
return response([
'message' => 'Selamat Datang',
'user' => UserProfileResource::make($user),
'token' => $user->createToken('app')->plainTextToken
]);
return Helper::responseJson(data: ['token' => $user->createToken('app')->plainTextToken], message: 'Selamat Datang');
}
public function register(Request $request)
@@ -148,19 +141,14 @@ class AuthController extends Controller
])->validate();
try {
$user = User::create([
User::create([
'email' => $request->email,
'password' => Hash::make($request->password),
]);
return response()->json([
'message' => 'Akun berhasil dibuat, silahkan cek E-mail untuk konfirmasi'
], 201);
return Helper::responseJson(statusCode: Response::HTTP_CREATED, message: 'Akun berhasil dibuat, silahkan cek E-mail untuk konfirmasi');
} catch (\Exception $e) {
return response()->json([
'message' => 'Terjadi masalah ketika mendaftar',
'error_message' => $e->getMessage()
], 403);
return Helper::responseJson(['error_message' => $e->getMessage()], Response::HTTP_FORBIDDEN, 'Terjadi masalah ketika mendaftar');
}
}
@@ -169,7 +157,7 @@ class AuthController extends Controller
$token = $request->bearerToken();
Auth::user()->tokens()->where('id', $token)->delete();
return response(['message' => 'Berhasil Logout.']);
return Helper::responseJson(message: 'Behasil Logout.');
}
public function mockOtp(Request $request)
@@ -178,23 +166,12 @@ class AuthController extends Controller
'phone_or_email' => 'required'
]);
$user = User::where((filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ? 'email' : 'phone'), $request->phone_or_email)->first();
$user = User::query()->where((filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ? 'email' : 'phone'), $request->phone_or_email)->firstOrFail();
if ($user) {
return response()->json([
'message' => 'OTP Anda',
'data' => [
'otp' => $user->otp,
'otp_valid_until' => $user->otp_created_at ? $user->otp_created_at->addMinutes(config('linksehat.otp_valid_minutes')) : null
]
]);
}
if (!$user) {
return response()->json([
'message' => 'User Tidak Ditemukan'
], 404);
}
return Helper::responseJson(data: [
'otp' => $user->otp,
'otp_valid_until' => $user->otp_created_at ? $user->otp_created_at->addMinutes(config('linksehat.otp_valid_minutes')) : null
], message: 'OTP Anda');
}
public function redirectSocialLogin($provider)
@@ -224,10 +201,9 @@ class AuthController extends Controller
]);
}
return response([
'message' => 'Selamat Datang',
return Helper::responseJson(data: [
'user' => UserProfileResource::make($user),
'token' => $user->createToken('app')->plainTextToken
]);
], message: 'Selamat Datang');
}
}