Beautiful Open-Source Form Builder
Block users features (#814)
Chirag Chhatralae6d1b24e7a9d
diff --git a/api/app/Http/Controllers/Admin/AdminController.php b/api/app/Http/Controllers/Admin/AdminController.phpindex 0902bde89..63cd18269 100644--- a/api/app/Http/Controllers/Admin/AdminController.php+++ b/api/app/Http/Controllers/Admin/AdminController.php@@ -3,10 +3,13 @@namespace App\Http\Controllers\Admin;use App\Http\Controllers\Controller;+use App\Http\Requests\UserBlockRequest;use App\Jobs\Template\GenerateTemplateJob;use App\Models\Forms\Form;use App\Models\User;+use App\Service\UserActionService;use Illuminate\Http\Request;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Password;use Laravel\Cashier\Cashier;@@ -57,6 +60,9 @@ class AdminController extends Controller'message' => 'You cannot fetch an admin.']);}++ $user->makeVisible('meta');+$workspaces = $user->workspaces()->withCount('forms')->get()@@ -84,6 +90,44 @@ class AdminController extends Controller]);}+ public function blockUser(UserBlockRequest $request, UserActionService $userActionService)+ {+ $user = User::findOrFail($request->get('user_id'));++ if ($user->admin) {+ return $this->error([+ 'message' => 'You cannot block an admin.'+ ]);+ }++ $user = $userActionService->block(+ $user,+ $request->get('reason'),+ request()->user()->id+ );++ return $this->success([+ "message" => "User has been blocked.",+ "user" => $user->makeVisible('meta'),+ ]);+ }++ public function unblockUser(UserBlockRequest $request, UserActionService $userActionService)+ {+ $user = User::findOrFail($request->get('user_id'));++ $user = $userActionService->unblock(+ $user,+ $request->get('reason'),+ request()->user()->id+ );++ return $this->success([+ "message" => "User has been unblocked.",+ "user" => $user->makeVisible('meta'),+ ]);+ }+public function applyDiscount(Request $request){$request->validate([@@ -119,7 +163,7 @@ class AdminController extends Controller'subcription_id' => $subscription->id,'coupon_id' => $couponId,'subscription_stripe_id' => $subscription->stripe_id,- 'moderator_id' => auth()->id(),+ 'moderator_id' => request()->user()->id,]);return $this->success([@@ -147,7 +191,7 @@ class AdminController extends Controller'subcription_id' => $subscription->id,'nb_days' => $request->get('number_of_day'),'subscription_stripe_id' => $subscription->stripe_id,- 'moderator_id' => auth()->id(),+ 'moderator_id' => request()->user()->id,]);return $this->success([@@ -180,7 +224,7 @@ class AdminController extends Controllerself::log('Cancel Subscription', ['user_id' => $user->id,'cancel_reason' => $request->get('cancellation_reason'),- 'moderator_id' => auth()->id(),+ 'moderator_id' => request()->user()->id,'subcription_id' => $subscription->id,'subscription_stripe_id' => $subscription->stripe_id]);@@ -204,7 +248,7 @@ class AdminController extends Controllerself::log('Sent password reset email', ['user_id' => $user->id,- 'moderator_id' => auth()->id(),+ 'moderator_id' => request()->user()->id,]);return $this->success([@@ -214,6 +258,6 @@ class AdminController extends Controllerpublic static function log($message, $data = []){- \Log::warning(self::ADMIN_LOG_PREFIX . $message, $data);+ Log::warning(self::ADMIN_LOG_PREFIX . $message, $data);}}diff --git a/api/app/Http/Controllers/Auth/LoginController.php b/api/app/Http/Controllers/Auth/LoginController.phpindex ff36c3884..2b77ea020 100644--- a/api/app/Http/Controllers/Auth/LoginController.php+++ b/api/app/Http/Controllers/Auth/LoginController.php@@ -49,7 +49,12 @@ class LoginController extends Controllerreturn false;}- $this->guard()->setToken($token);+ if ($user->is_blocked) {+ $this->guard()->logout();+ return false;+ }++ $guard->setToken($token);return true;}@@ -100,6 +105,14 @@ class LoginController extends Controllerthrow VerifyEmailException::forUser($user);}+ $user = \App\Models\User::where($this->username(), strtolower($request->get($this->username())))->first();++ if ($user && $user->is_blocked) {+ throw ValidationException::withMessages([+ $this->username() => ['Your account has been blocked. Please contact support.'],+ ]);+ }+throw ValidationException::withMessages([$this->username() => [trans('auth.failed')],]);diff --git a/api/app/Http/Kernel.php b/api/app/Http/Kernel.phpindex a1ec214fc..7bf46b3a1 100644--- a/api/app/Http/Kernel.php+++ b/api/app/Http/Kernel.php@@ -15,6 +15,7 @@ use App\Http\Middleware\IsSubscribed;use App\Http\Middleware\RequireProPlan;use App\Http\Middleware\SelfHostedCredentialsMiddleware;use Illuminate\Foundation\Http\Kernel as HttpKernel;+use App\Http\Middleware\CheckUserIsBlocked;class Kernel extends HttpKernel{@@ -91,11 +92,13 @@ class Kernel extends HttpKernel\Illuminate\Routing\Middleware\SubstituteBindings::class,SelfHostedCredentialsMiddleware::class,ImpersonationMiddleware::class,+ CheckUserIsBlocked::class,],'api-external' => [\Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',\Illuminate\Routing\Middleware\SubstituteBindings::class,+ CheckUserIsBlocked::class,],];diff --git a/api/app/Http/Middleware/CheckUserIsBlocked.php b/api/app/Http/Middleware/CheckUserIsBlocked.phpnew file mode 100644index 000000000..644a245f4--- /dev/null+++ b/api/app/Http/Middleware/CheckUserIsBlocked.php@@ -0,0 +1,35 @@+<?php++namespace App\Http\Middleware;++use Closure;+use Illuminate\Http\Request;+use Illuminate\Support\Facades\Auth;++class CheckUserIsBlocked+{+ /**+ * Handle an incoming request.+ *+ * @param \Illuminate\Http\Request $request+ * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next+ * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse+ */+ public function handle(Request $request, Closure $next)+ {+ if (Auth::check()) {+ $user = Auth::user();+ if ($user->is_blocked) {+ if (!Auth::guard('sanctum')->check()) {+ Auth::guard('api')->logout();+ }++ return response()->json([+ 'message' => 'Your account has been blocked. Please contact support.',+ ], 403);+ }+ }++ return $next($request);+ }+}diff --git a/api/app/Http/Requests/UserBlockRequest.php b/api/app/Http/Requests/UserBlockRequest.phpnew file mode 100644index 000000000..e436fa331--- /dev/null+++ b/api/app/Http/Requests/UserBlockRequest.php@@ -0,0 +1,16 @@+<?php++namespace App\Http\Requests;++use Illuminate\Foundation\Http\FormRequest;++class UserBlockRequest extends FormRequest+{+ public function rules()+ {+ return [+ 'user_id' => 'required',+ 'reason' => 'required|string|max:1000'+ ];+ }+}diff --git a/api/app/Mail/UserBlockedEmail.php b/api/app/Mail/UserBlockedEmail.phpnew file mode 100644index 000000000..6df718043--- /dev/null+++ b/api/app/Mail/UserBlockedEmail.php@@ -0,0 +1,39 @@+<?php++namespace App\Mail;++use App\Models\User;+use Illuminate\Bus\Queueable;+use Illuminate\Mail\Mailable;+use Illuminate\Queue\SerializesModels;++class UserBlockedEmail extends Mailable+{+ use Queueable;+ use SerializesModels;++ public User $user;+ public string $reason;++ /**+ * Create a new message instance.+ *+ * @return void+ */+ public function __construct(User $user, string $reason)+ {+ $this->user = $user;+ $this->reason = $reason;+ }++ /**+ * Build the message.+ *+ * @return $this+ */+ public function build()+ {+ return $this->subject('Your account has been blocked')+ ->markdown('mail.user.blocked');+ }+}diff --git a/api/app/Mail/UserUnblockedEmail.php b/api/app/Mail/UserUnblockedEmail.phpnew file mode 100644index 000000000..b0373a4b8--- /dev/null+++ b/api/app/Mail/UserUnblockedEmail.php@@ -0,0 +1,39 @@+<?php++namespace App\Mail;++use App\Models\User;+use Illuminate\Bus\Queueable;+use Illuminate\Mail\Mailable;+use Illuminate\Queue\SerializesModels;++class UserUnblockedEmail extends Mailable+{+ use Queueable;+ use SerializesModels;++ public User $user;+ public string $reason;++ /**+ * Create a new message instance.+ *+ * @return void+ */+ public function __construct(User $user, string $reason)+ {+ $this->user = $user;+ $this->reason = $reason;+ }++ /**+ * Build the message.+ *+ * @return $this+ */+ public function build()+ {+ return $this->subject('Your account has been unblocked')+ ->markdown('mail.user.unblocked');+ }+}diff --git a/api/app/Models/User.php b/api/app/Models/User.phpindex 04a73a819..cbbbfe7f3 100644--- a/api/app/Models/User.php+++ b/api/app/Models/User.php@@ -41,7 +41,8 @@ class User extends Authenticatable implements JWTSubject'password','hear_about_us','utm_data',- 'meta'+ 'meta',+ 'blocked_at'];/**@@ -67,6 +68,7 @@ class User extends Authenticatable implements JWTSubject'email_verified_at' => 'datetime','utm_data' => 'array','meta' => 'array',+ 'blocked_at' => 'datetime',];}@@ -77,6 +79,7 @@ class User extends Authenticatable implements JWTSubject*/protected $appends = ['photo_url',+ 'is_blocked'];public function ownsForm(Form $form)@@ -141,6 +144,55 @@ class User extends Authenticatable implements JWTSubject});}+ public function getIsBlockedAttribute()+ {+ return !is_null($this->blocked_at);+ }++ public function blockUser(string $reason, int $moderatorId): void+ {+ $this->blocked_at = now();+ $history = $this->meta['blocking_history'] ?? [];+ $history[] = [+ 'reason' => $reason,+ 'blocked_at' => $this->blocked_at,+ 'blocked_by' => $moderatorId,+ 'unblock_reason' => null,+ 'unblocked_at' => null,+ 'unblocked_by' => null,+ ];+ $this->meta = array_merge($this->meta ?? [], ['blocking_history' => $history]);+ $this->save();+ }++ public function unblockUser(string $reason, int $moderatorId): void+ {+ $this->blocked_at = null;+ $history = $this->meta['blocking_history'] ?? [];+ if (empty($history)) {+ $this->save();+ return;+ }++ $lastBlockKey = array_key_last($history);+ $history[$lastBlockKey]['unblock_reason'] = $reason;+ $history[$lastBlockKey]['unblocked_at'] = now();+ $history[$lastBlockKey]['unblocked_by'] = $moderatorId;++ $this->meta = array_merge($this->meta ?? [], ['blocking_history' => $history]);+ $this->save();+ }++ public function getLastBlock(): ?array+ {+ $history = $this->meta['blocking_history'] ?? [];+ if (empty($history)) {+ return null;+ }++ return end($history);+ }+/*** =================================* Helper Relateddiff --git a/api/app/Service/UserActionService.php b/api/app/Service/UserActionService.phpnew file mode 100644index 000000000..781cb6ee0--- /dev/null+++ b/api/app/Service/UserActionService.php@@ -0,0 +1,44 @@+<?php++namespace App\Service;++use App\Http\Controllers\Admin\AdminController;+use App\Mail\UserBlockedEmail;+use App\Mail\UserUnblockedEmail;+use App\Models\User;+use Illuminate\Support\Facades\Mail;++class UserActionService+{+ public function block(User $user, string $reason, int $moderatorId): User+ {+ $user->blockUser($reason, $moderatorId);++ $user->forms()->update(['visibility' => 'draft']);++ AdminController::log('User blocked', [+ 'user_id' => $user->id,+ 'reason' => $reason,+ 'moderator_id' => $moderatorId,+ ]);++ Mail::to($user)->send(new UserBlockedEmail($user, $reason));++ return $user->fresh();+ }++ public function unblock(User $user, string $reason, int $moderatorId): User+ {+ $user->unblockUser($reason, $moderatorId);++ AdminController::log('User unblocked', [+ 'user_id' => $user->id,+ 'reason' => $reason,+ 'moderator_id' => $moderatorId,+ ]);++ Mail::to($user)->send(new UserUnblockedEmail($user, $reason));++ return $user->fresh();+ }+}diff --git a/api/database/migrations/2025_07_17_085306_add_blocked_at_to_users_table.php b/api/database/migrations/2025_07_17_085306_add_blocked_at_to_users_table.phpnew file mode 100644index 000000000..b5caaa1c9--- /dev/null+++ b/api/database/migrations/2025_07_17_085306_add_blocked_at_to_users_table.php@@ -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::table('users', function (Blueprint $table) {+ $table->timestamp('blocked_at')->nullable();+ });+ }++ /**+ * Reverse the migrations.+ */+ public function down(): void+ {+ Schema::table('users', function (Blueprint $table) {+ $table->dropColumn('blocked_at');+ });+ }+};diff --git a/api/resources/views/mail/user/blocked.blade.php b/api/resources/views/mail/user/blocked.blade.phpnew file mode 100644index 000000000..fcd9cde5b--- /dev/null+++ b/api/resources/views/mail/user/blocked.blade.php@@ -0,0 +1,15 @@+@component('mail::message')+# Your Account Has Been Blocked++Hello {{ $user->name }},++Your account has been blocked by an administrator.++**Reason:**+{{ $reason }}++If you believe this is a mistake, please contact our support team.++Thanks,<br>+{{ config('app.name') }}+@endcomponent\ No newline at end of filediff --git a/api/resources/views/mail/user/unblocked.blade.php b/api/resources/views/mail/user/unblocked.blade.phpnew file mode 100644index 000000000..b8f4b399c--- /dev/null+++ b/api/resources/views/mail/user/unblocked.blade.php@@ -0,0 +1,15 @@+@component('mail::message')+# Your Account Has Been Unblocked++Hello {{ $user->name }},++Your account has been unblocked by an administrator. You can now log in to your account.++**Reason for unblocking:**+{{ $reason }}++If you have any questions, please contact our support team.++Thanks,<br>+{{ config('app.name') }}+@endcomponent\ No newline at end of filediff --git a/api/routes/api.php b/api/routes/api.phpindex b1b085d15..176b88e77 100644--- a/api/routes/api.php+++ b/api/routes/api.php@@ -248,6 +248,15 @@ Route::group(['middleware' => 'auth.multi'], function () {[\App\Http\Controllers\Admin\AdminController::class, 'sendPasswordResetEmail']);+ Route::post(+ 'block-user',+ [\App\Http\Controllers\Admin\AdminController::class, 'blockUser']+ );+ Route::post(+ 'unblock-user',+ [\App\Http\Controllers\Admin\AdminController::class, 'unblockUser']+ );+Route::group(['prefix' => 'billing'], function () {Route::get('{userId}/email', [\App\Http\Controllers\Admin\BillingController::class, 'getEmail']);Route::patch('/email', [\App\Http\Controllers\Admin\BillingController::class, 'updateEmail']);diff --git a/api/tests/Feature/Admin/UserBlockTest.php b/api/tests/Feature/Admin/UserBlockTest.phpnew file mode 100644index 000000000..735a7a9ea--- /dev/null+++ b/api/tests/Feature/Admin/UserBlockTest.php@@ -0,0 +1,92 @@+<?php++namespace Tests\Feature\Admin;++use App\Mail\UserBlockedEmail;+use App\Mail\UserUnblockedEmail;+use App\Models\User;+use Illuminate\Support\Facades\Mail;+use Illuminate\Support\Facades\Config;++function setupUsers()+{+ Config::set('opnform.moderator_emails', ['[email protected]']);+ $moderator = User::factory()->create([+ 'email' => '[email protected]',+ ]);++ $user = User::factory()->create();++ return [$moderator, $user];+}++it('can block a user', function () {+ Mail::fake();+ [$moderator, $user] = setupUsers();++ $this->actingAs($moderator)+ ->postJson('/moderator/block-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test block reason',+ ])+ ->assertSuccessful()+ ->assertJson([+ 'message' => 'User has been blocked.',+ ]);++ $user->refresh();+ expect($user->is_blocked)->toBeTrue();+ expect($user->blocked_at)->not->toBeNull();+ $lastBlock = $user->getLastBlock();+ expect($lastBlock['reason'])->toBe('Test block reason');+ expect($lastBlock['blocked_by'])->toBe($moderator->id);+ expect($lastBlock['blocked_at'])->not->toBeNull();+ expect($lastBlock['unblocked_at'])->toBeNull();++ Mail::assertSent(UserBlockedEmail::class, function ($mail) use ($user) {+ return $mail->hasTo($user->email);+ });+});++it('can unblock a user', function () {+ Mail::fake();+ [$moderator, $user] = setupUsers();+ $user->blockUser('Initial reason', $moderator->id);+ $user->refresh();+ expect($user->is_blocked)->toBeTrue();+++ $this->actingAs($moderator)+ ->postJson('/moderator/unblock-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test unblock reason',+ ])+ ->assertSuccessful()+ ->assertJson([+ 'message' => 'User has been unblocked.',+ ]);++ $user->refresh();+ expect($user->is_blocked)->toBeFalse();+ expect($user->blocked_at)->toBeNull();+ $lastBlock = $user->getLastBlock();+ expect($lastBlock['unblock_reason'])->toBe('Test unblock reason');+ expect($lastBlock['unblocked_by'])->toBe($moderator->id);+ expect($lastBlock['unblocked_at'])->not->toBeNull();++ Mail::assertSent(UserUnblockedEmail::class, function ($mail) use ($user) {+ return $mail->hasTo($user->email);+ });+});++it('does not allow a non-moderator to block a user', function () {+ $nonModerator = User::factory()->create();+ $user = User::factory()->create();++ $this->actingAs($nonModerator)+ ->postJson('/moderator/block-user', [+ 'user_id' => $user->id,+ 'reason' => 'Attempting to block',+ ])+ ->assertForbidden();+});diff --git a/api/tests/Feature/LoginTest.php b/api/tests/Feature/LoginTest.phpindex a766aa093..64f0ccc55 100644--- a/api/tests/Feature/LoginTest.php+++ b/api/tests/Feature/LoginTest.php@@ -35,3 +35,18 @@ it('can log out', function () {$this->getJson('/user')->assertStatus(401);});++it('cannot login if user is blocked', function () {+ $user = User::factory()->create([+ 'blocked_at' => now(),+ ]);++ $this->postJson('/login', [+ 'email' => $user->email,+ 'password' => 'password',+ ])+ ->assertStatus(422)+ ->assertJsonValidationErrors(['email' => 'Your account has been blocked. Please contact support.']);++ $this->assertGuest();+});diff --git a/client/api/admin.js b/client/api/admin.jsindex f737050cc..583a6e5dc 100644--- a/client/api/admin.js+++ b/client/api/admin.js@@ -6,6 +6,8 @@ export const adminApi = {// User managementfetchUser: (identifier, options) => apiService.get(`${BASE_PATH}/fetch-user/${encodeURI(identifier)}`, options),impersonate: (userId, options) => apiService.get(`${BASE_PATH}/impersonate/${userId}`, options),+ blockUser: (data) => apiService.post(`${BASE_PATH}/block-user`, data),+ unblockUser: (data) => apiService.post(`${BASE_PATH}/unblock-user`, data),// Template managementcreateTemplate: (data) => apiService.post(`${BASE_PATH}/create-template`, data),diff --git a/client/components/pages/admin/BlockUser.vue b/client/components/pages/admin/BlockUser.vuenew file mode 100644index 000000000..d56e856df--- /dev/null+++ b/client/components/pages/admin/BlockUser.vue@@ -0,0 +1,139 @@+<template>+ <AdminCard+ :title="isBlocked ? 'Unblock User' : 'Block User'"+ :icon="isBlocked ? 'heroicons:lock-open-20-solid' : 'heroicons:no-symbol-20-solid'"+ >+ <div class="space-y-6 flex flex-col justify-between">+ <p class="text-xs text-neutral-500">+ <template v-if="isBlocked">+ This will unblock the user and allow them to log in again. Their forms will remain in draft status.+ <br>+ <b>Blocked on:</b> {{ new Date(user.blocked_at).toLocaleString() }}+ <br>+ <b>Reason:</b> {{ lastBlock?.reason }}+ </template>+ <template v-else>+ This will block the user from accessing their account and set all their forms to draft.+ </template>+ </p>++ <VForm @submit.prevent="submit">+ <TextAreaInput+ label="Reason"+ name="reason"+ :form="form"+ :required="true"+ help="Reason will be sent to the user via email."+ />+ <div class="flex space-x-2 mt-4">+ <UButton+ block+ :loading="loading"+ type="submit"+ class="grow"+ :label="isBlocked ? 'Unblock User' : 'Block User'"+ />+ <UButton+ v-if="blockingHistory && blockingHistory.length"+ variant="outline"+ icon="i-heroicons-clock"+ @click="isModalOpen = true"+ label="View History"+ />+ </div>+ </VForm>+ </div>+ <UModal+ v-model:open="isModalOpen"+ :ui="{ content: 'sm:max-w-4xl' }"+ title="Blocking History"+ >+ <template #body>+ <UTable+ :columns="historyColumns"+ :data="blockingHistory"+ />+ </template>+ </UModal>+ </AdminCard>+</template>++<script setup>+import { adminApi } from '~/api'++const props = defineProps({+ user: { type: Object, required: true }+})+const emit = defineEmits(['user-updated'])++const alert = useAlert()+const loading = ref(false)+const isModalOpen = ref(false)++const form = useForm({+ user_id: props.user.id,+ reason: ''+})++const historyColumns = [+ {+ accessorKey: 'blocked_at',+ header: 'Blocked At',+ cell: ({ row }) => {+ return row.original.blocked_at ? new Date(row.original.blocked_at).toLocaleString() : ''+ }+ },+ {+ accessorKey: 'blocked_by',+ header: 'Blocked By'+ },+ {+ accessorKey: 'reason',+ header: 'Reason'+ },+ {+ accessorKey: 'unblocked_at',+ header: 'Unblocked At',+ cell: ({ row }) => {+ return row.original.unblocked_at ? new Date(row.original.unblocked_at).toLocaleString() : ''+ }+ },+ {+ accessorKey: 'unblocked_by',+ header: 'Unblocked By'+ },+ {+ accessorKey: 'unblock_reason',+ header: 'Unblock Reason'+ }+]++const isBlocked = computed(() => props.user.is_blocked)+const blockingHistory = computed(() => props.user.meta?.blocking_history || [])+const lastBlock = computed(() => {+ if (!blockingHistory.value.length) {+ return null+ }+ return blockingHistory.value[blockingHistory.value.length - 1]+})+++async function submit() {+ loading.value = true+ try {+ let response+ if (isBlocked.value) {+ response = await adminApi.unblockUser(form.data())+ } else {+ response = await adminApi.blockUser(form.data())+ }+ alert.success(response.message)+ emit('user-updated', response.user)+ form.reset()+ } catch (error) {+ alert.error(error.data?.message || 'An error occurred.')+ } finally {+ loading.value = false+ }+}+</script>\ No newline at end of filediff --git a/client/pages/admin.vue b/client/pages/admin.vueindex ed6cb286c..9620a2e1f 100644--- a/client/pages/admin.vue+++ b/client/pages/admin.vue@@ -115,6 +115,10 @@<DiscountOnSubscription:user="userInfo"/>+ <BlockUser+ :user="userInfo"+ @user-updated="onUserUpdate"+ /><ExtendTrial:user="userInfo"/>@@ -216,6 +220,9 @@ async function fetchUser() {})}+function onUserUpdate(updatedUser) {+ userInfo.value = updatedUser+}function getUserPlan(workspaces) {if (workspaces.some(w => w.plan === 'enterprise')) {userPlan.value = 'enterprise'