feat: impelement verification with email
This commit is contained in:
@@ -118,18 +118,5 @@ public function completeSession(Request $request)
|
|||||||
return response()->json(['message' => 'Session completed', 'session' => $session]);
|
return response()->json(['message' => 'Session completed', 'session' => $session]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function profile()
|
|
||||||
{
|
|
||||||
$user = auth()->user();
|
|
||||||
$templates = BreathingTemplate::where('user_id', $user->id)->get();
|
|
||||||
$sessions = UserBreathingSession::with('template')->where('user_id', $user->id)->get();
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'email' => $user->email,
|
|
||||||
'name' => $user->first_name . ' ' . $user->last_name,
|
|
||||||
'xp' => $user->xp,
|
|
||||||
'templates' => $templates,
|
|
||||||
'sessions' => $sessions
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Laravel\Socialite\Facades\Socialite;
|
use Laravel\Socialite\Facades\Socialite;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use App\Models\BreathingExercise;
|
||||||
|
use App\Models\BreathingTemplate;
|
||||||
|
use App\Models\UserBreathingSession;
|
||||||
class UserController extends Controller
|
class UserController extends Controller
|
||||||
{
|
{
|
||||||
public function login(Request $request)
|
public function login(Request $request)
|
||||||
@@ -72,28 +75,70 @@ public function register(Request $request)
|
|||||||
'mobile' => ['string', new MobileNumber, 'nullable', 'unique:users', 'required_without:email'],
|
'mobile' => ['string', new MobileNumber, 'nullable', 'unique:users', 'required_without:email'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if(isset($data['mobile'])){
|
if(isset($data['mobile'])){
|
||||||
$data['mobile'] = MobileNumberHelper::formatMobile($data['mobile']);
|
$data['mobile'] = MobileNumberHelper::formatMobile($data['mobile']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($data['password'])) {
|
if (!isset($data['password'])) {
|
||||||
$data['password'] = Hash::make(config('app.default_password')); // Hash default password
|
$data['password'] = Hash::make(config('app.default_password'));
|
||||||
} else {
|
} else {
|
||||||
$data['password'] = Hash::make($data['password']); // Hash provided password
|
$data['password'] = Hash::make($data['password']);
|
||||||
}
|
}
|
||||||
// return response()->json([
|
|
||||||
// "salam"
|
|
||||||
// ]);
|
|
||||||
$user = User::create($data);
|
$user = User::create($data);
|
||||||
|
|
||||||
$token = $user->createToken('token', ['user'])->plainTextToken;
|
// Generate verification code
|
||||||
|
$code = rand(100000, 999999);
|
||||||
|
|
||||||
|
// Save verification record
|
||||||
|
\DB::table('email_verifications')->insert([
|
||||||
|
'user_id' => $user->id,
|
||||||
|
'code' => $code,
|
||||||
|
'expires_at' => now()->addMinutes(15),
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Send verification email
|
||||||
|
\Mail::to($user->email)->send(new \App\Mail\VerifyEmailCodeMail($code));
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
'message' => 'User registered successfully. Verification code sent to email.',
|
||||||
'user' => $user,
|
'user' => $user,
|
||||||
'token' => $token
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function verifyEmailCode(Request $request)
|
||||||
|
{
|
||||||
|
$request->validate([
|
||||||
|
'email' => 'required|email',
|
||||||
|
'code' => 'required|string',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$user = User::where('email', $request->email)->first();
|
||||||
|
if (!$user) {
|
||||||
|
return response()->json(['message' => 'User not found'], 404);
|
||||||
|
}
|
||||||
|
|
||||||
|
$record = \DB::table('email_verifications')
|
||||||
|
->where('user_id', $user->id)
|
||||||
|
->where('code', $request->code)
|
||||||
|
->where('expires_at', '>', now())
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if (!$record) {
|
||||||
|
return response()->json(['message' => 'Invalid or expired code'], 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark email as verified
|
||||||
|
$user->update(['email_verified_at' => now()]);
|
||||||
|
|
||||||
|
// Delete verification record
|
||||||
|
\DB::table('email_verifications')->where('id', $record->id)->delete();
|
||||||
|
|
||||||
|
return response()->json(['message' => 'Email verified successfully']);
|
||||||
|
}
|
||||||
|
|
||||||
public function loginOTP(Request $request)
|
public function loginOTP(Request $request)
|
||||||
{
|
{
|
||||||
$data = $request->validate([
|
$data = $request->validate([
|
||||||
@@ -225,6 +270,24 @@ public function updateProfile(Request $request)
|
|||||||
'message' => 'user updated'
|
'message' => 'user updated'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function profile()
|
||||||
|
{
|
||||||
|
$user = auth()->user();
|
||||||
|
$templates = BreathingTemplate::where('user_id', $user->id)->get();
|
||||||
|
$sessions = UserBreathingSession::with('template')->where('user_id', $user->id)->get();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'email' => $user->email,
|
||||||
|
'first_name' => $user->first_name,
|
||||||
|
'last_name' => $user->last_name,
|
||||||
|
'mobile'=> $user->mobile,
|
||||||
|
'birthday' => $user ->birthday,
|
||||||
|
'xp' => $user->xp,
|
||||||
|
'templates' => $templates,
|
||||||
|
'sessions' => $sessions
|
||||||
|
]);
|
||||||
|
}
|
||||||
public function status(Request $request)
|
public function status(Request $request)
|
||||||
{
|
{
|
||||||
$data = $request->validate([
|
$data = $request->validate([
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Mail;
|
||||||
|
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Mail\Mailable;
|
||||||
|
use Illuminate\Mail\Mailables\Content;
|
||||||
|
use Illuminate\Mail\Mailables\Envelope;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
|
class VerifyEmailCodeMail extends Mailable
|
||||||
|
{
|
||||||
|
use Queueable, SerializesModels;
|
||||||
|
|
||||||
|
public $code;
|
||||||
|
|
||||||
|
public function __construct($code)
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function build()
|
||||||
|
{
|
||||||
|
return $this->subject('Your Email Verification Code')
|
||||||
|
->view('emails.verify-code')
|
||||||
|
->with(['code' => $this->code]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::create('email_verifications', function (Blueprint $table) {
|
||||||
|
$table->id();
|
||||||
|
$table->foreignId('user_id')->constrained()->onDelete('cascade');
|
||||||
|
$table->string('code');
|
||||||
|
$table->timestamp('expires_at');
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('email_verifications');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table) {
|
||||||
|
$table->timestamp('email_verified_at')->nullable()->after('email');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('email_verified_at');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::create('user_mood', function (Blueprint $table) {
|
||||||
|
$table->id();
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('user_mood');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<h2>Your Verification Code</h2>
|
||||||
|
<p>Use the code below to verify your email:</p>
|
||||||
|
<h1>{{ $code }}</h1>
|
||||||
|
<p>This code will expire in 15 minutes.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
+13
-5
@@ -12,7 +12,7 @@
|
|||||||
Route::prefix('auth')->controller(UserController::class)->group(function () {
|
Route::prefix('auth')->controller(UserController::class)->group(function () {
|
||||||
Route::middleware(['throttle:3,1'])->post('login-otp', 'loginOTP');
|
Route::middleware(['throttle:3,1'])->post('login-otp', 'loginOTP');
|
||||||
Route::post('check-otp', 'checkOTP');
|
Route::post('check-otp', 'checkOTP');
|
||||||
|
Route::post('verify-email-code','verifyEmailCode');
|
||||||
Route::post('login', 'login');
|
Route::post('login', 'login');
|
||||||
Route::post('register', 'register');
|
Route::post('register', 'register');
|
||||||
|
|
||||||
@@ -35,16 +35,24 @@
|
|||||||
Route::middleware('abilities:admin')->patch('/{name}/products/{id}', [ProductController::class, 'update']);
|
Route::middleware('abilities:admin')->patch('/{name}/products/{id}', [ProductController::class, 'update']);
|
||||||
Route::middleware('abilities:admin')->delete('/{name}/products/{id}', [ProductController::class, 'delete']);
|
Route::middleware('abilities:admin')->delete('/{name}/products/{id}', [ProductController::class, 'delete']);
|
||||||
Route::put('/{name}/products/{id}/subscribe', [ProductController::class, 'subscribe']);
|
Route::put('/{name}/products/{id}/subscribe', [ProductController::class, 'subscribe']);
|
||||||
});
|
|
||||||
|
|
||||||
Route::post('breathing-exercises', [BreathingExerciseController::class, 'store']);
|
|
||||||
Route::get('profile', [BreathingExerciseController::class, 'profile']);
|
|
||||||
|
|
||||||
|
});
|
||||||
|
// --------- user profile
|
||||||
|
Route::post('/profile', [UserController::class, 'updateProfile']);
|
||||||
|
Route::get('/profile', [UserController::class, 'profile']);
|
||||||
|
|
||||||
|
|
||||||
|
// Route::post('breathing-exercises', [BreathingExerciseController::class, 'store']);
|
||||||
|
// Route::get('profile', [BreathingExerciseController::class, 'profile']);
|
||||||
|
|
||||||
// ------------------------------------------------
|
// ------------------------------------------------
|
||||||
Route::post('breathing-templates', [BreathingExerciseController::class, 'createTemplate']);
|
Route::post('breathing-templates', [BreathingExerciseController::class, 'createTemplate']);
|
||||||
Route::get('breathing-templates', [BreathingExerciseController::class, 'getTemplates']);
|
Route::get('breathing-templates', [BreathingExerciseController::class, 'getTemplates']);
|
||||||
Route::post('breathing-complete', [BreathingExerciseController::class, 'completeSession']);
|
Route::post('breathing-complete', [BreathingExerciseController::class, 'completeSession']);
|
||||||
Route::get('profile', [BreathingExerciseController::class, 'profile']);
|
// Route::get('profile', [BreathingExerciseController::class, 'profile']);
|
||||||
Route::put('breathing-templates/{id}', [BreathingExerciseController::class, 'updateTemplate']);
|
Route::put('breathing-templates/{id}', [BreathingExerciseController::class, 'updateTemplate']);
|
||||||
Route::delete('breathing-templates/{id}', [BreathingExerciseController::class, 'deleteTemplate']);
|
Route::delete('breathing-templates/{id}', [BreathingExerciseController::class, 'deleteTemplate']);
|
||||||
Route::get('user-templates', [BreathingExerciseController::class, 'getUserTemplates']);
|
Route::get('user-templates', [BreathingExerciseController::class, 'getUserTemplates']);
|
||||||
|
|||||||
Reference in New Issue
Block a user