Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing api or register account and resend otp for email and phone

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-02 17:55:37 +05:30
parent e7e837765e
commit a0acf1860f
2 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
app/Http/Controllers/AuthController.php
View File

@@ -615,21 +615,30 @@ class AuthController extends Controller
// ]);
$otp = $this->otpGenerate($request->email);
$mobile_otp = $this->otpGenerate($request->contact_number);
// $mobile_otp = $this->otpGenerate($request->contact_number);
$mailData = [
'title' => 'Mail from ItSolutionStuff.com',
'body' => 'This is for testing email using smtp.'
];
Mail::to($request->email)->send(new OtpMail($mailData, $otp));
$this->thirdPartyOTP($request->contact_number, $mobile_otp);
// $this->thirdPartyOTP($request->contact_number, $mobile_otp);
//here we are storing mobile and contact in UserOTp table
$insertOtp = UserOtp::create([
'contact_number' => $request->contact_number,
'email' => $request->email, //emai
'expire_at' => Carbon::now()->addMinutes('5'),
'otp' => $otp, //email otp
'contact_otp' => $mobile_otp //contact OTP
// $insertOtp = UserOtp::create([
// 'contact_number' => $request->contact_number,
// 'email' => $request->email, //emai
// 'expire_at' => Carbon::now()->addMinutes('5'),
// 'otp' => $otp, //email otp
// 'contact_otp' => $mobile_otp //contact OTP
// ]);
$insertOtp = RegistrationOtp::create([
'contact_number'=>$request->contact_number,
// 'contact_otp'=>$mobile_otp,
// 'contact_expire_at'=>Carbon::now()->addMinutes('4'),
'email'=>$request->email,
'email_otp'=>$otp,
'email_expire_at'=>Carbon::now()->addMinutes('2'),
]);
return response()->json(['status' => 200, 'message' => 'OTP has been sent to your Email & Contact no.']);
@@ -706,19 +715,28 @@ class AuthController extends Controller
// }
$otp = $this->otpGenerate($request->email2);
$mobile_otp = $this->otpGenerate($request->contact_number2);
// $mobile_otp = $this->otpGenerate($request->contact_number2);
$mailData = [
'title' => 'Mail from ItSolutionStuff.com',
'body' => 'This is for testing email using smtp.'
];
Mail::to($request->email2)->send(new OtpMail($mailData, $otp));
$this->thirdPartyOTP($request->contact_number2, $mobile_otp);
$insertOtp = UserOtp::create([
'contact_number' => $request->contact_number2,
'email' => $request->email2, //emai
'expire_at' => Carbon::now()->addMinutes('5'),
'otp' => $otp, //email otp
'contact_otp' => $mobile_otp //contact OTP
// $this->thirdPartyOTP($request->contact_number2, $mobile_otp);
// $insertOtp = UserOtp::create([
// 'contact_number' => $request->contact_number2,
// 'email' => $request->email2, //emai
// 'expire_at' => Carbon::now()->addMinutes('5'),
// 'otp' => $otp, //email otp
// 'contact_otp' => $mobile_otp //contact OTP
// ]);
$insertOtp = RegistrationOtp::create([
'contact_number'=>$request->contact_number2,
// 'contact_otp'=>$mobile_otp,
// 'contact_expire_at'=>Carbon::now()->addMinutes('4'),
'email'=>$request->email2,
'email_otp'=>$otp,
'email_expire_at'=>Carbon::now()->addMinutes('2'),
]);
return response()->json(['status' => 200, 'message' => 'OTP has been sent to your Email & Contact no.']);
@@ -781,14 +799,17 @@ class AuthController extends Controller
$emailOtp = $request->email_otp;
$emailToAdd = $request->email;
$userEmailOtpData = UserOtp::where('email', $emailToAdd)->where('otp', $emailOtp)->first(); // checking user email otp data
$userEmailOtpData = RegistrationOtp::where('email', $emailToAdd)->where('email_otp', $emailOtp)->first(); // checking user email otp data
if (!$userEmailOtpData) {
return response()->json(['status' => 400, 'message' => 'Email OTP Did Not Matched!'], 400);
}
if (now() > $userEmailOtpData->expire_at) {
if (now() > $userEmailOtpData->email_expire_at) {
return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400);
}
if ($userEmailOtpData) {
$otp = rand(1000,9999);
$this->thirdPartyOTP($userEmailOtpData->contact_number, $otp);
RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']);
}
}
@@ -797,11 +818,11 @@ class AuthController extends Controller
$contactOtp = $request->contact_otp;
$contactToAdd = $request->contact_number;
$userContactOtpData = UserOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first();
$userContactOtpData = RegistrationOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first();
if (!$userContactOtpData) {
return response()->json(['status' => 400, 'message' => 'Contact OTP Did Not Matched!'], 400);
}
if (now() > $userContactOtpData->expire_at) {
if (now() > $userContactOtpData->contact_expire_at) {
return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400);
}
@@ -842,15 +863,18 @@ class AuthController extends Controller
$emailToAdd = $request->email2;
$userEmailOtpData = UserOtp::where('email', $emailToAdd)->where('otp', $emailOtp)->first(); // checking user email otp data
$userEmailOtpData = RegistrationOtp::where('email', $emailToAdd)->where('email_otp', $emailOtp)->first(); // checking user email otp data
// dd($userEmailOtpData);
if (!$userEmailOtpData) {
return response()->json(['status' => 400, 'message' => 'Email OTP Did Not Matched!'], 400);
}
if (now() > $userEmailOtpData->expire_at) {
if (now() > $userEmailOtpData->email_expire_at) {
return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400);
}
if ($userEmailOtpData) {
$otp = rand(1000,9999);
$this->thirdPartyOTP($userEmailOtpData->contact_number, $otp);
RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>rand(1000,9999),'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']);
}
}
@@ -858,12 +882,12 @@ class AuthController extends Controller
$contactOtp = $request->contact_otp;
$contactToAdd = $request->contact_number2;
$userContactOtpData = UserOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first();
$userContactOtpData = RegistrationOtp::where('contact_number', $contactToAdd)->where('contact_otp', $contactOtp)->first();
if (!$userContactOtpData) {
return response()->json(['status' => 400, 'message' => 'Contact OTP Did Not Matched!'], 400);
}
if (now() > $userContactOtpData->expire_at) {
if (now() > $userContactOtpData->contact_expire_at) {
return response()->json(['status' => 400, 'message' => 'OTP has been expired!'], 400);
}
@@ -888,6 +912,39 @@ class AuthController extends Controller
}
}
public function resendOtp(Request $request)
{
try{
// Type 1 for email, 2 for mobile
$type = $request->type;
$credential = $request->credential;
$otp = rand(1000,9999);
if($type == 1)
{
// resend otp for email
$mailData = [
'title' => 'Mail from ItSolutionStuff.com',
'body' => 'This is for testing email using smtp.'
];
Mail::to($credential)->send(new OtpMail($mailData, $otp));
RegistrationOtp::where('email',$credential)->update(['email_otp'=>$otp,'email_expire_at'=>Carbon::now()->addMinutes(2)]);
}
else if($type == 2){
// resend otp for mobile
$this->thirdPartyOTP($credential, $otp);
RegistrationOtp::where('contact_number',$credential)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
}
return response()->json([
'status' => 200,
'message' => 'OTP resend successfull',
]);
} catch (\Exception $e)
{
return response()->json(['status' => 500,'exception' => $e, 500]);
}
}
public function getUser(Request $request)
{
try {

2
public/assets/js/FrontendJs/script.js
View File

@@ -37,7 +37,7 @@ window.$('#currently').DataTable({
$("#recipes-popbtn-four").on("click", function () {
var investNowUrl = "{{route('investNow')}}";
$.ajax({
url : '/jericho_28_march/invest-now',
url : '/invest-now',
// url : "{{route('investNow')}}",
// url : investNowUrl,
type: 'get',