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

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-04-30 10:11:20 +07:00
parent 8aa67c1864 2b9553d003
commit f3064d306c
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Modules/Linksehat/Http/Controllers/Api/Doctor/AuthDoctorController.php
View File

@@ -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,19 +43,19 @@ 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 = [
'user' => $user,
// 'user' => $user,
'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);
}
}
}

2
Modules/Linksehat/Http/Controllers/Api/Doctor/ProfileDoctorController.php
View File

@@ -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)

12
Modules/Linksehat/Http/Middleware/Doctor/Authentication.php
View File

@@ -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);
}