Merged in izzati-buang-telescope (pull request #105)

Izzati buang telescope

app/Http/Controllers/Mobile/UserController.php

@@ -15,23 +15,22 @@ use Illuminate\Support\Facades\Http;
 
 class UserController extends Controller
 {
-    public function getProfileUser(Request $request){
+    public function getProfileUser(Request $request)
+    {
+        $user = Auth::user(); 
 
-        $getUserNokp = User::where('nokp', $request->nokp)
+        if ($user) {
-        // ->join('file', function ($join) {
+            return response()->json([
-        //     $join->on('users.id', '=', 'file.user_id');
+                'success' => true,
-        // })
+                'message' => [$user]
-        ->get();
+            ], 200);
-
+        } else {
-        if ($getUserNokp->isNotEmpty()) {
+            return response()->json([
-            return response()->json(['success' => true , 'message' => $getUserNokp], 201);
+                'success' => false,
-        }
+                'message' => 'Unauthorized'
-        
+            ], 401);
-        else {
-            return response()->json(['success' => false, 'message' => 'Empty data'], 201);
         }
     }
-
     public function updateProfileUser(Request $request){
 
         $validator = Validator::make($request->all(), [
@@ -179,7 +178,7 @@ class UserController extends Controller
         ]);
 
         $tac_code_model = new TacCode();
-        $tac_code_model->tac_code = $tac_code;
+        $tac_code_model->tac_code = Hash::make($tac_code);
         $tac_code_model->phone_number = $request->phone_number;
         $tac_code_model->case_code = 1;
         $tac_code_model->case_description = 'Verify Phone Number';
@@ -189,7 +188,6 @@ class UserController extends Controller
         return response()->json([
             'success' => true,
             'message' => 'Tac Sent!',
-            'response' => $tac_code_model
         ]);
     }
 
@@ -199,13 +197,13 @@ class UserController extends Controller
         $current_date_time = $current->toDateTimeString();
 
         $tac_code = TacCode::query()
-            ->where('tac_code', $request->tac_code)
             ->where('phone_number', $request->phone_number)
             ->where('expired_at', '>=', $current_date_time)
             ->where('status', 0)
+            ->latest()
             ->first();
 
-        if ($tac_code) {
+        if ($tac_code && Hash::check($request->tac_code, $tac_code->tac_code)) {
             $user = Auth::user();
             $user->notelbimbit = $request->phone_number;
             $user->save();

routes/api.php

@@ -43,7 +43,6 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::get('/getProfile', [AuthController::class, 'getProfile']);
     // User
     Route::post('/user/logout', [AuthController::class, 'logoutUser']);
-    Route::get('/user/profile/{nokp}', [UserController::class, 'getProfileUser']);
     Route::post('/password/reset', [ResetPasswordController::class, 'reset']);
     //change password user
     Route::post('/changePassword', [UserController::class, 'changePassword']);
@@ -52,7 +51,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::get('/user/profile', [UserController::class, 'getProfileUser']);
     Route::put('/userUpdate/profile', [UserController::class, 'updateProfileUser']);
 
-    Route::get('/requestTac', [UserController::class, 'requestTac']);
+    Route::post('/requestTac', [UserController::class, 'requestTac']);
     Route::post('/verifyTac', [UserController::class, 'verifyTac']);
 
     //============HOME===========================