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

Merge branch 'mhmfajar-dev' into mhmfajar

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-17 16:13:49 +07:00
parent 91e44fcb41 3288f766f5
commit d2e2c3bbe9
31 changed files with 1958 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Modules/Client/Http/Controllers/Api/AuthController.php
View File

@@ -15,39 +15,39 @@ class AuthController extends Controller
public function requestOtp(Request $request)
{
$request->validate([
'phone_or_email' => 'required'
'phoneOrEmail' => 'required'
]);
$user = User::query()
->when(filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL), function (Builder $query) use ($request) {
$query->getQuery()->where('email', $request->phone_or_email);
->when(filter_var($request->phoneOrEmail, FILTER_VALIDATE_EMAIL), function (Builder $query) use ($request) {
$query->getQuery()->where('email', $request->phoneOrEmail);
}, function (Builder $query) use ($request) {
$query->getQuery()->where('phone', $request->phone_or_email);
$query->getQuery()->where('phone', $request->phoneOrEmail);
})
->first();
if (!$user) {
$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";
$message = filter_var($request->phoneOrEmail, FILTER_VALIDATE_EMAIL) ? "User dengan alamat email " . $request->phoneOrEmail . " tidak ditemukan" : "User dengan nomor telepon " . $request->phoneOrEmail . " tidak ditemukan";
return Helper::responseJson(statusCode: Response::HTTP_NOT_FOUND, message: $message);
}
if (filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL)) {
if (filter_var($request->phoneOrEmail, FILTER_VALIDATE_EMAIL)) {
User::query()->find($user->id)->update([
'email' => $request->phone_or_email,
'email' => $request->phoneOrEmail,
'otp' => rand(1000, 9999),
'otp_created_at' => now()
]);
} else {
User::query()->find($user->id)->update([
'phone' => $request->phone_or_email,
'phone' => $request->phoneOrEmail,
'otp' => rand(1000, 9999),
'otp_created_at' => now()
]);
}
// TODO Send the OTP
if (filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL)) {
if (filter_var($request->phoneOrEmail, FILTER_VALIDATE_EMAIL)) {
// Send Email
} else {
// Send Whatsapp
@@ -59,15 +59,15 @@ class AuthController extends Controller
public function validateOtp(Request $request)
{
$request->validate([
'phone_or_email' => 'required',
'phoneOrEmail' => 'required',
'otp' => 'required'
]);
$user = User::query()
->when(filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL), function (Builder $query) use ($request) {
$query->getQuery()->where('email', $request->phone_or_email);
->when(filter_var($request->phoneOrEmail, FILTER_VALIDATE_EMAIL), function (Builder $query) use ($request) {
$query->getQuery()->where('email', $request->phoneOrEmail);
}, function (Builder $query) use ($request) {
$query->getQuery()->where('phone', $request->phone_or_email);
$query->getQuery()->where('phone', $request->phoneOrEmail);
})
->first();
@@ -86,9 +86,8 @@ class AuthController extends Controller
public function logout(Request $request)
{
$token = $request->bearerToken();
Auth::user()->tokens()->where('id', $token)->delete();
$request->user()->currentAccessToken()->delete();
return response(['message' => 'Berhasil Logout.']);
return Helper::responseJson(message: 'Berhasil Logout.');
}
}

4
Modules/Client/Routes/api.php
View File

@@ -19,8 +19,8 @@ use Modules\Client\Http\Controllers\Api\UserController;
Route::prefix('client')->group(function () {
Route::controller(AuthController::class)->group(function () {
Route::post('otp-request', 'requestOtp');
Route::post('otp-validation', 'validateOtp');
Route::post('login', 'login');
Route::post('verify-code', 'validateOtp');
});
Route::middleware('auth:sanctum')->group(function () {