From b07c497b5b9058160979bd75dd7d20444e102406 Mon Sep 17 00:00:00 2001 From: R Date: Mon, 7 Nov 2022 03:14:43 +0700 Subject: [PATCH 1/2] Revert User Resource --- .../Linksehat/Http/Controllers/Api/AuthController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/AuthController.php b/Modules/Linksehat/Http/Controllers/Api/AuthController.php index e578914f..10705c95 100755 --- a/Modules/Linksehat/Http/Controllers/Api/AuthController.php +++ b/Modules/Linksehat/Http/Controllers/Api/AuthController.php @@ -121,7 +121,13 @@ class AuthController extends Controller return response(['message' => 'Mode Login Tidak Dikenal'], 403); } - return Helper::responseJson(data: ['token' => $user->createToken('app')->plainTextToken], message: 'Selamat Datang'); + return Helper::responseJson( + data: [ + 'token' => $user->createToken('app')->plainTextToken, + 'user' => UserProfileResource::make($user), + ], + message: 'Selamat Datang' + ); } public function register(Request $request) @@ -169,7 +175,6 @@ class AuthController extends Controller $user = User::query()->where((filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ? 'email' : 'phone'), $request->phone_or_email)->firstOrFail(); 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'); } From 20c323d91ed98c9389cb80b0371d7be9bc95e0e3 Mon Sep 17 00:00:00 2001 From: R Date: Mon, 7 Nov 2022 03:58:32 +0700 Subject: [PATCH 2/2] Fix Mock OTP --- Modules/Linksehat/Http/Controllers/Api/AuthController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/AuthController.php b/Modules/Linksehat/Http/Controllers/Api/AuthController.php index 10705c95..2328ed02 100755 --- a/Modules/Linksehat/Http/Controllers/Api/AuthController.php +++ b/Modules/Linksehat/Http/Controllers/Api/AuthController.php @@ -75,7 +75,7 @@ class AuthController extends Controller } return Helper::responseJson(data: [ - 'otp' => $user->otp, + // 'otp' => $user->otp, 'otp_valid_until' => $user->otp_created_at->addMinutes(config('linksehat.otp_valid_minutes')) ], message: 'OTP Terkirim'); } @@ -175,6 +175,7 @@ class AuthController extends Controller $user = User::query()->where((filter_var($request->phone_or_email, FILTER_VALIDATE_EMAIL) ? 'email' : 'phone'), $request->phone_or_email)->firstOrFail(); 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'); }