Merge branch 'main' of https://git.koppkb.com/KoPKB/lelong
This commit is contained in:
@@ -2,26 +2,31 @@
|
||||
|
||||
namespace App\Http\Controllers\AuthMobile;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\User;
|
||||
use App\Models\File;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\ResetPassword;
|
||||
use App\Mail\VerifyEmail;
|
||||
use App\Models\Staff;
|
||||
use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Str;
|
||||
<<<<<<< HEAD
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Mail\ResetPassword;
|
||||
use App\Mail\VerifyEmail;
|
||||
=======
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
|
||||
class AuthController extends Controller
|
||||
{
|
||||
public function register(Request $request)
|
||||
{
|
||||
// dd($request->all);
|
||||
$validator = Validator::make($request->all(), [
|
||||
$validator = Validator::make($request->all(), [
|
||||
'name' => 'required|string',
|
||||
'username' => 'required|string|unique:users',
|
||||
'nokp' => 'required|string|unique:users',
|
||||
@@ -29,14 +34,15 @@ class AuthController extends Controller
|
||||
'email' => 'required|string|unique:users|email',
|
||||
'notelbimbit' => 'required|string|unique:users',
|
||||
'register_agree' => 'required|integer',
|
||||
'alamat' => 'required'
|
||||
'alamat' => 'required',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
$errors = [
|
||||
'success' => false,
|
||||
'message' => $validator->errors()
|
||||
'message' => $validator->errors(),
|
||||
];
|
||||
|
||||
return response($errors, 201);
|
||||
}
|
||||
// Retrieve the validated input...
|
||||
@@ -44,22 +50,26 @@ class AuthController extends Controller
|
||||
|
||||
$convert_ic_to_hyphen = (substr_replace(substr_replace($fields['nokp'], '-', 6, 0), '-', 9, 0));
|
||||
$check_staff = Staff::where('nokp', '=', $convert_ic_to_hyphen)
|
||||
->orWhere('nokp', '=', $fields['nokp'])
|
||||
->first();
|
||||
if($check_staff)
|
||||
{
|
||||
->orWhere('nokp', '=', $fields['nokp'])
|
||||
->first();
|
||||
if ($check_staff) {
|
||||
$errors = [
|
||||
'success' => "Staff",
|
||||
'message' => "Staff tidak dibenarkan mendaftar."
|
||||
'success' => 'Staff',
|
||||
'message' => 'Staff tidak dibenarkan mendaftar.',
|
||||
];
|
||||
|
||||
return response($errors, 201);
|
||||
|
||||
}
|
||||
|
||||
|
||||
$currentdate = Carbon::now();
|
||||
$currentdate = $currentdate->toDateTimeString();
|
||||
$verificationToken = Str::random(60);
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
$user = new User;
|
||||
$user->name = $fields['name'];
|
||||
$user->username = $fields['username'];
|
||||
@@ -70,14 +80,18 @@ class AuthController extends Controller
|
||||
$user->register_agree = $fields['register_agree'];
|
||||
$user->t_daftar = $currentdate;
|
||||
$user->status = 'active';
|
||||
$user->user_type = 2; //type 2 = pembida
|
||||
$user->user_type = 2; // type 2 = pembida
|
||||
$user->alamat = $fields['alamat'];
|
||||
$user->token = $verificationToken;
|
||||
$user->is_verified = 0;
|
||||
$user->email_verified_at = null;
|
||||
$user->save();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$verifyUrl = url('/api/verifyEmail') . '?' . http_build_query([
|
||||
=======
|
||||
$verifyUrl = url('/api/verifyEmail').'?'.http_build_query([
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
'email' => $user->email,
|
||||
'token' => $verificationToken,
|
||||
]);
|
||||
@@ -89,7 +103,7 @@ class AuthController extends Controller
|
||||
'message' => 'Pendaftaran berjaya. Sila semak emel anda untuk pautan pengesahan.',
|
||||
'user' => $user,
|
||||
];
|
||||
|
||||
|
||||
return response($response, 201);
|
||||
}
|
||||
|
||||
@@ -103,7 +117,11 @@ class AuthController extends Controller
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
<<<<<<< HEAD
|
||||
return redirect()->away($redirectBase . '?email_verified=0&message=' . urlencode('Pautan pengesahan tidak sah.'));
|
||||
=======
|
||||
return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah.'));
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
}
|
||||
|
||||
$user = User::where('email', $request->email)
|
||||
@@ -111,8 +129,13 @@ class AuthController extends Controller
|
||||
->where('is_verified', 0)
|
||||
->first();
|
||||
|
||||
<<<<<<< HEAD
|
||||
if (!$user) {
|
||||
return redirect()->away($redirectBase . '?email_verified=0&message=' . urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
|
||||
=======
|
||||
if (! $user) {
|
||||
return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
}
|
||||
|
||||
$user->is_verified = 1;
|
||||
@@ -120,14 +143,14 @@ class AuthController extends Controller
|
||||
$user->token = null;
|
||||
$user->save();
|
||||
|
||||
return redirect()->away($redirectBase . '?email_verified=1&message=' . urlencode('Emel berjaya disahkan.'));
|
||||
return redirect()->away($redirectBase.'?email_verified=1&message='.urlencode('Emel berjaya disahkan.'));
|
||||
}
|
||||
|
||||
public function loginUser(Request $request)
|
||||
{
|
||||
$fields = $request->validate([
|
||||
'username' => 'required|string',
|
||||
'password' => 'required|string'
|
||||
'password' => 'required|string',
|
||||
]);
|
||||
|
||||
$user = User::where('username', $fields['username'])->orWhere('email', $fields['username'])->first();
|
||||
@@ -142,8 +165,8 @@ class AuthController extends Controller
|
||||
if ($user->user_type != '2') {
|
||||
return response([
|
||||
'statusAkaun' => 6,
|
||||
'message1' => "Akaun ini didaftar menggunakan id staff.",
|
||||
'message2' => "Sila login menggunakan url " . env('APP_URL'),
|
||||
'message1' => 'Akaun ini didaftar menggunakan id staff.',
|
||||
'message2' => 'Sila login menggunakan url '.env('APP_URL'),
|
||||
]);
|
||||
} else {
|
||||
if (is_null($user->email_verified_at)) {
|
||||
@@ -151,41 +174,46 @@ class AuthController extends Controller
|
||||
'statusAkaun' => 7,
|
||||
'message' => 'Sila sahkan emel anda sebelum log masuk. Semak peti masuk anda untuk pautan pengesahan.',
|
||||
]);
|
||||
<<<<<<< HEAD
|
||||
} else if ($user->status == 'active') {
|
||||
=======
|
||||
} elseif ($user->status == 'active') {
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
$user->tokens()->delete();
|
||||
$token = $user->createToken('myapptoken')->plainTextToken;
|
||||
|
||||
return response([
|
||||
'statusAkaun' => 1,
|
||||
'user' => $user,
|
||||
'token' => $token
|
||||
'token' => $token,
|
||||
]);
|
||||
} else if ($user->status == 'banned') {
|
||||
} elseif ($user->status == 'banned') {
|
||||
return response()->json([
|
||||
'statusAkaun' => 2,
|
||||
'message' => "User banned."
|
||||
'message' => 'User banned.',
|
||||
]);
|
||||
} else if ($user->status == 'rejected') {
|
||||
} elseif ($user->status == 'rejected') {
|
||||
return response([
|
||||
'statusAkaun' => 3,
|
||||
'message' => "Rejected."
|
||||
'message' => 'Rejected.',
|
||||
]);
|
||||
} else {
|
||||
return response([
|
||||
'statusAkaun' => 4,
|
||||
'message' => 'Registration in progress,status wait for approval.'
|
||||
'message' => 'Registration in progress,status wait for approval.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return response()->json([
|
||||
'statusAkaun' => 5,
|
||||
'message' => "Kata Laluan Salah."
|
||||
'message' => 'Kata Laluan Salah.',
|
||||
]);
|
||||
}
|
||||
} else {
|
||||
return response()->json([
|
||||
'statusAkaun' => 0,
|
||||
'message' => "Akaun tiada."
|
||||
'message' => 'Akaun tiada.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -203,11 +231,11 @@ class AuthController extends Controller
|
||||
public function forgotPassword(Request $request)
|
||||
{
|
||||
$user = User::where('email', $request->email)->first();
|
||||
if (!$user) {
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'status' => 0,
|
||||
'message' => "Emel tidak dijumpai. Sila daftar sekarang."
|
||||
'message' => 'Emel tidak dijumpai. Sila daftar sekarang.',
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -217,20 +245,78 @@ class AuthController extends Controller
|
||||
$user['is_verified'] = 0;
|
||||
$user->save();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$resetUrl = rtrim(config('app.app_pembida'), '/') . '/reset-password/' . $token;
|
||||
=======
|
||||
$resetUrl = rtrim(config('app.app_pembida'), '/').'/reset-password/'.$token;
|
||||
>>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
|
||||
|
||||
Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
|
||||
|
||||
if (Mail::failures() != 0) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => "Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda."
|
||||
'message' => 'Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda.',
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'status' => 500,
|
||||
'message' => "Failed! there is some issue with email provider"
|
||||
'message' => 'Failed! there is some issue with email provider',
|
||||
]);
|
||||
}
|
||||
|
||||
public function validateResetToken($token)
|
||||
{
|
||||
$user = User::where('token', $token)->where('is_verified', 0)->first();
|
||||
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
|
||||
], 422);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'email' => $user->email,
|
||||
]);
|
||||
}
|
||||
|
||||
public function updatePassword(Request $request)
|
||||
{
|
||||
$validator = Validator::make($request->all(), [
|
||||
'token' => 'required|string',
|
||||
'password' => 'required|string|min:6',
|
||||
'confirm_password' => 'required|same:password',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => $validator->errors()->first(),
|
||||
'errors' => $validator->errors(),
|
||||
], 422);
|
||||
}
|
||||
|
||||
$user = User::where('token', $request->token)->where('is_verified', 0)->first();
|
||||
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
|
||||
], 422);
|
||||
}
|
||||
|
||||
$user->password = Hash::make($request->password);
|
||||
$user->token = null;
|
||||
$user->is_verified = 0;
|
||||
$user->save();
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Katalaluan anda telah berjaya dikemaskini.',
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -290,9 +376,10 @@ class AuthController extends Controller
|
||||
public function getProfile()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
return response()->json([
|
||||
"message" => true,
|
||||
"user_detail" => $user
|
||||
'message' => true,
|
||||
'user_detail' => $user,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user