From 6a13d7aa1fde90f5691ffad42ec466dec1d4b38d Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 26 Apr 2024 14:03:43 +0700 Subject: [PATCH 1/3] Update case sensitif --- .../Api/Doctor/AuthDoctorController.php | 56 +++++++++---------- .../Api/Doctor/ProfileDoctorController.php | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php b/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php index 3ba2d663..12acbe37 100644 --- a/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php +++ b/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php @@ -30,9 +30,9 @@ class AuthDoctorController extends Controller 'email' => 'required|email', 'password' => 'required' ], [ - 'email.required' => trans('validation.required',['attribute' => 'Email']), - 'email.email' => trans('validation.email'), - 'password.required' => trans('validation.required',['attribute' => 'Password']), + 'email.required' => trans('Validation.required',['attribute' => 'Email']), + 'email.email' => trans('Validation.email'), + 'password.required' => trans('Validation.required',['attribute' => 'Password']), ]); if ($validator->fails()) @@ -43,11 +43,11 @@ class AuthDoctorController extends Controller { $user = User::where('email', $request->email)->first(); if (!$user) { - return ApiResponse::apiResponse('Not Found', $data, trans('message.not_found'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.not_found'), 404); } if (!Hash::check($request->password, $user->password)) { - return ApiResponse::apiResponse('Bad Request', $data, trans('message.password'), 400); + return ApiResponse::apiResponse('Bad Request', $data, trans('Message.password'), 400); } $res_data = [ @@ -55,7 +55,7 @@ class AuthDoctorController extends Controller 'token' => $user->createToken('app')->plainTextToken ]; - return ApiResponse::apiResponse("Success", $res_data, trans('message.success'), 200); + return ApiResponse::apiResponse("Success", $res_data, trans('Message.success'), 200); } } @@ -63,7 +63,7 @@ class AuthDoctorController extends Controller { $request->user()->tokens()->delete(); - return ApiResponse::apiResponse('Success', [], trans('message.logout'), 200); + return ApiResponse::apiResponse('Success', [], trans('Message.logout'), 200); } public function forgotPassword(Request $request) @@ -75,8 +75,8 @@ class AuthDoctorController extends Controller $validator = Validator::make($request->all(), [ 'email' => 'required|email', ], [ - 'email.required' => trans('validation.required',['attribute' => 'Email']), - 'email.email' => trans('validation.email'), + 'email.required' => trans('Validation.required',['attribute' => 'Email']), + 'email.email' => trans('Validation.email'), ]); if ($validator->fails()) @@ -87,7 +87,7 @@ class AuthDoctorController extends Controller { $user = User::where('email', $request->email)->first(); if (!$user) { - return ApiResponse::apiResponse('Not Found', $data, trans('message.not_found'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.not_found'), 404); } //send email @@ -131,11 +131,11 @@ class AuthDoctorController extends Controller ->where('token', '=', $token) ->get(); - return ApiResponse::apiResponse("Success", $res, trans('message.success'), 200); + return ApiResponse::apiResponse("Success", $res, trans('Message.success'), 200); } else { - return ApiResponse::apiResponse("Internal Server Error", $data, trans('message.server_error'), 500); + return ApiResponse::apiResponse("Internal Server Error", $data, trans('Message.server_error'), 500); } } } @@ -151,9 +151,9 @@ class AuthDoctorController extends Controller 'email' => 'required|email', 'token' => 'required|numeric', ], [ - 'email.required' => trans('validation.required',['attribute' => 'Email']), - 'email.email' => trans('validation.email'), - 'token.required' => trans('validation.required',['attribute' => 'Token']), + 'email.required' => trans('Validation.required',['attribute' => 'Email']), + 'email.email' => trans('Validation.email'), + 'token.required' => trans('Validation.required',['attribute' => 'Token']), ]); if ($validator->fails()) @@ -178,15 +178,15 @@ class AuthDoctorController extends Controller $diffInMinutes = ($now - $created_at) / 60; if ($diffInMinutes > 60) { - return ApiResponse::apiResponse('Not Found', $data, trans('message.token_expired'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.token_expired'), 404); } else { // Lanjutkan dengan proses pemulihan kata sandi - return ApiResponse::apiResponse("Success", $data, trans('message.success'), 200); + return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200); } } else { - return ApiResponse::apiResponse('Not Found', $data, trans('message.not_found'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.not_found'), 404); } } } @@ -208,12 +208,12 @@ class AuthDoctorController extends Controller 'regex:/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$/' ] ], [ - 'email.required' => trans('validation.required',['attribute' => 'Email']), - 'email.email' => trans('validation.email'), - 'token.required' => trans('validation.required',['attribute' => 'Token']), - 'new_password.required' => trans('validation.required',['attribute' => 'New Password']), - 'new_password.min' => trans('validation.min',['attribute' => 'New Password']), - 'new_password.regex' => trans('validation.regex',['attribute' => 'New Password']), + 'email.required' => trans('Validation.required',['attribute' => 'Email']), + 'email.email' => trans('Validation.email'), + 'token.required' => trans('Validation.required',['attribute' => 'Token']), + 'new_password.required' => trans('Validation.required',['attribute' => 'New Password']), + 'new_password.min' => trans('Validation.min',['attribute' => 'New Password']), + 'new_password.regex' => trans('Validation.regex',['attribute' => 'New Password']), ]); if ($validator->fails()) @@ -238,7 +238,7 @@ class AuthDoctorController extends Controller $diffInMinutes = ($now - $created_at) / 60; if ($diffInMinutes > 60) { - return ApiResponse::apiResponse('Not Found', $data, trans('message.token_expired'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.token_expired'), 404); } else { // Lanjutkan dengan proses pemulihan kata sandi $user = User::where('email', $request->email)->first(); @@ -247,17 +247,17 @@ class AuthDoctorController extends Controller $newPassword = Hash::make($request->new_password); $user->password = $newPassword; $user->save(); - return ApiResponse::apiResponse("Success", $data, trans('message.success'), 200); + return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200); } else { - return ApiResponse::apiResponse('Not Found', $data, trans('message.token_expired'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.token_expired'), 404); } } } else { - return ApiResponse::apiResponse('Not Found', $data, trans('message.not_found'), 404); + return ApiResponse::apiResponse('Not Found', $data, trans('Message.not_found'), 404); } } } diff --git a/Modules/Linksehat/Http/Controllers/Api/Doctor/ProfileDoctorController.php b/Modules/Linksehat/Http/Controllers/Api/Doctor/ProfileDoctorController.php index e6604fe1..28fdf245 100644 --- a/Modules/Linksehat/Http/Controllers/Api/Doctor/ProfileDoctorController.php +++ b/Modules/Linksehat/Http/Controllers/Api/Doctor/ProfileDoctorController.php @@ -137,7 +137,7 @@ class ProfileDoctorController extends Controller ]; $res_data['dataSip'] = $dataSip; - return ApiResponse::apiResponse("Success", $res_data, trans('message.success'), 200); + return ApiResponse::apiResponse("Success", $res_data, trans('Message.success'), 200); } public function fWorkExperience($start, $end) From 15295ea963d832bc30bb2305df03a9aa6b149f9f Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 29 Apr 2024 08:50:49 +0700 Subject: [PATCH 2/3] Update case sensitif --- .../Http/Middleware/Doctor/Authentication.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/Linksehat/Http/Middleware/Doctor/Authentication.php b/Modules/Linksehat/Http/Middleware/Doctor/Authentication.php index d2c93b97..9f1f9c26 100644 --- a/Modules/Linksehat/Http/Middleware/Doctor/Authentication.php +++ b/Modules/Linksehat/Http/Middleware/Doctor/Authentication.php @@ -26,11 +26,11 @@ class Authentication // Add language if(!$locale) { - return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept-Language']), 401); + return ApiResponse::apiResponse('Unauthorized', null, trans('Validation.required', ['attribute' => 'Accept-Language']), 401); } if($locale !== 'en-US' && $locale !== 'id-ID') { - return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept-Language']), 400); + return ApiResponse::apiResponse('Bad Request', null, trans('Validation.invalid', ['attribute' => 'Accept-Language']), 400); } if ($locale === 'en-US') { @@ -46,19 +46,19 @@ class Authentication // Validate type accept & content type if (!$acceptHeader) { - return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept']), 401); + return ApiResponse::apiResponse('Unauthorized', null, trans('Validation.required', ['attribute' => 'Accept']), 401); } if (!$contentType) { - return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Content-Type']), 401); + return ApiResponse::apiResponse('Unauthorized', null, trans('Validation.required', ['attribute' => 'Content-Type']), 401); } if ($acceptHeader !== 'application/json') { - return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept']), 400); + return ApiResponse::apiResponse('Bad Request', null, trans('Validation.invalid', ['attribute' => 'Accept']), 400); } if($contentType !== 'application/json') { - return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Content-Type']), 400); + return ApiResponse::apiResponse('Bad Request', null, trans('Validation.invalid', ['attribute' => 'Content-Type']), 400); } return $next($request); } From 2b9553d00389f2abcb48bb0bff582819efe36520 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 29 Apr 2024 08:52:43 +0700 Subject: [PATCH 3/3] Update --- .../Http/Controllers/Api/Doctor/AuthDoctorController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php b/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php index 12acbe37..4bcc60f1 100644 --- a/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php +++ b/Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php @@ -51,7 +51,7 @@ class AuthDoctorController extends Controller } $res_data = [ - 'user' => $user, + // 'user' => $user, 'token' => $user->createToken('app')->plainTextToken ];