Beautiful Open-Source Form Builder
Expose internal cloud admin actions through scoped tokens (#1296)
Julien Nahum116498097453
diff --git a/api/app/Enums/AccessTokenAbility.php b/api/app/Enums/AccessTokenAbility.phpindex e6adea251..38e955f2a 100644--- a/api/app/Enums/AccessTokenAbility.php+++ b/api/app/Enums/AccessTokenAbility.php@@ -20,6 +20,11 @@ enum AccessTokenAbility: stringcase WorkspaceUsersRead = 'workspace-users-read';case WorkspaceUsersWrite = 'workspace-users-write';+ public static function adminValues(): array+ {+ return ['admin:users:read', 'admin:billing:read', 'admin:forms:read', 'admin:users:block', 'admin:users:unblock', 'admin:users:password-reset', 'admin:users:disable-2fa', 'admin:users:clear-cache', 'admin:billing:discount', 'admin:billing:extend-trial', 'admin:billing:cancel', 'admin:billing:refund', 'admin:billing:update', 'admin:forms:restore', 'admin:templates:create'];+ }+public static function values(): array{return array_map(diff --git a/api/app/Http/Controllers/Admin/AdminController.php b/api/app/Http/Controllers/Admin/AdminController.phpindex 30d98be4a..b9e876182 100644--- a/api/app/Http/Controllers/Admin/AdminController.php+++ b/api/app/Http/Controllers/Admin/AdminController.php@@ -4,386 +4,92 @@ 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;+use App\Service\Admin\AdminOperations;class AdminController extends Controller{- public const ADMIN_LOG_PREFIX = '[admin_action] ';+ public const ADMIN_LOG_PREFIX = AdminOperations::ADMIN_LOG_PREFIX;public function __construct(){$this->middleware('moderator');}- public function createTemplate(Request $request)+ public function receipt(Request $request, string $actionId){- $request->validate([- 'template_prompt' => 'required|string|max:4000'- ]);-- $job = new GenerateTemplateJob($request->template_prompt);- $job->handle();+ $request->merge(['action_id' => $actionId]);+ $input = app(\App\Http\Requests\AdminApi\ActionRequest::class)->validated();+ $receipt = \App\Models\AdminApiAction::find($actionId);+ if (!$receipt) {+ return response()->json(['action_id' => $actionId, 'status' => 'not_started']);+ }+ abort_unless($receipt->actor_id === $request->user()->id+ && $receipt->token_id === $request->user()->currentAccessToken()->id+ && $receipt->operation === $request->route()->defaults['operation'], 404);+ abort_unless(hash_equals($receipt->request_hash, \App\Models\AdminApiAction::contentHash($receipt->operation, $input)), 409, 'Receipt belongs to different action content.');+ return response()->json(['action_id' => $actionId, 'status' => $receipt->status, 'result' => $receipt->result]);+ }- return $this->success([- 'template_slug' => $job->generatedTemplate?->slug ?? null- ]);+ public function createTemplate(Request $request)+ {+ return app(AdminOperations::class)->createTemplate($request);}public function fetchUser($identifier){- $user = null;- if (is_numeric($identifier)) {- $user = User::find($identifier);- } elseif (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {- $user = User::whereEmail($identifier)->first();- } else {- // Find by form slug- $form = Form::whereSlug($identifier)->first();- if ($form) {- $user = $form->creator;- }- }-- if (!$user) {- return $this->error([- 'message' => 'User not found.'- ]);- } elseif ($user->admin) {- return $this->error([- 'message' => 'You cannot fetch an admin.'- ]);- }-- $user->makeVisible('meta');-- // Get two-factor authentication status- $user->two_factor_enabled = $user->hasTwoFactorEnabled();-- $workspaces = $user->workspaces()- ->withCount('forms')- ->get()- ->map(function ($workspace) {- $plan = $workspace->is_trialing ? 'trialing' : $workspace->plan_tier;- return [- 'id' => $workspace->id,- 'name' => $workspace->name,- 'plan' => $plan,- 'forms_count' => $workspace->forms_count- ];- });- return $this->success([- 'user' => $user,- 'workspaces' => $workspaces- ]);+ return app(AdminOperations::class)->fetchUser($identifier);}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'),- ]);+ return app(AdminOperations::class)->blockUser($request, $userActionService);}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'),- ]);+ return app(AdminOperations::class)->unblockUser($request, $userActionService);}public function applyDiscount(Request $request){- $request->validate([- 'user_id' => 'required'- ]);- $user = User::find($request->get("user_id"));-- $activeSubscriptions = $user->subscriptions()->where(function ($q) {- $q->where('stripe_status', 'trialing')- ->orWhere('stripe_status', 'active');- })->get();-- if ($activeSubscriptions->count() != 1) {- return $this->error([- "message" => "The user has more than one active subscriptions or doesn't have one."- ]);- }-- $couponId = config('pricing.discount_coupon_id');- if (is_null($couponId)) {- return $this->error([- "message" => "Coupon id not defined."- ]);- }-- $subscription = $activeSubscriptions->first();- Cashier::stripe()->subscriptions->update($subscription->stripe_id, [- 'coupon' => $couponId- ]);-- self::log('Applying NGO/Student discount to sub', [- 'user_id' => $user->id,- 'subcription_id' => $subscription->id,- 'coupon_id' => $couponId,- 'subscription_stripe_id' => $subscription->stripe_id,- ]);-- return $this->success([- "message" => "40% Discount applied for the next 12 months."- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminOperations::class)->applyDiscount($request));}public function extendTrial(Request $request){- $request->validate([- 'user_id' => 'required',- 'number_of_day' => 'required|numeric|max:14'- ]);- $user = User::find($request->get("user_id"));-- $subscription = $user->subscriptions()- ->where('stripe_status', 'trialing')- ->firstOrFail();-- $trialEndDate = now()->addDays($request->get('number_of_day'));- $subscription->extendTrial($trialEndDate);-- self::log('Trial extended', [- 'user_id' => $user->id,- 'subcription_id' => $subscription->id,- 'nb_days' => $request->get('number_of_day'),- 'subscription_stripe_id' => $subscription->stripe_id,- ]);-- return $this->success([- "message" => "Subscription trial extend until the " . $trialEndDate->format('d/m/Y')- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminOperations::class)->extendTrial($request));}public function cancelSubscription(Request $request){- $request->validate([- 'user_id' => 'required',- 'subscription_id' => 'required',- 'cancellation_reason' => 'required'- ]);- $user = User::find($request->get("user_id"));- $subscription = $user->subscriptions()->find($request->get("subscription_id"));-- if (! $subscription) {- return $this->error([- "message" => "Subscription not found."- ], 404);- }-- if ($subscription && !in_array($subscription->stripe_status, ['active', 'trialing'])) {- return $this->error([- "message" => "The subscription is not active or trialing."- ]);- }-- // Cancel the subscription- $subscription->cancel();-- self::log('Cancel Subscription', [- 'user_id' => $user->id,- 'cancel_reason' => $request->get('cancellation_reason'),- 'subcription_id' => $subscription->id,- 'subscription_stripe_id' => $subscription->stripe_id- ]);-- return $this->success([- "message" => "The subscription cancellation has been successfully completed."- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminOperations::class)->cancelSubscription($request));}public function sendPasswordResetEmail(Request $request){- $user = User::findOrFail($request->user_id);-- $status = Password::sendResetLink(['email' => $user->email]);-- if ($status !== Password::RESET_LINK_SENT) {- return $this->error([- 'message' => "Password reset email failed to send"- ]);- }-- self::log('Sent password reset email', [- 'user_id' => $user->id,- ]);-- return $this->success([- 'message' => "Password reset email has been sent to the user's email address"- ]);+ return app(AdminOperations::class)->sendPasswordResetEmail($request);}public function refundPayment(Request $request){- $request->validate([- 'user_id' => 'required',- 'invoice_id' => 'required',- 'refund_reason' => 'required'- ]);-- $user = User::findOrFail($request->get('user_id'));- $latestInvoice = $user->invoices()->first();-- if (!$latestInvoice) {- return $this->error(['message' => 'No invoices found for this user.'], 404);- }-- if ($latestInvoice->id !== $request->get('invoice_id')) {- return $this->error(['message' => 'You can only refund the last invoice.'], 422);- }-- try {- // Get the Stripe invoice to find the payment- $stripeInvoice = Cashier::stripe()->invoices->retrieve($latestInvoice->id);- if (!$stripeInvoice->charge) {- return $this->error(['message' => 'It\'s trial period invoice so can not refund.'], 404);- }-- $refund = Cashier::stripe()->refunds->create([- 'charge' => $stripeInvoice->charge,- 'reason' => 'requested_by_customer',- 'metadata' => [- 'refund_reason' => $request->get('refund_reason'),- 'moderator_id' => request()->user()->id,- 'user_id' => $user->id- ]- ]);-- self::log('Refund Payment', [- 'user_id' => $user->id,- 'invoice_id' => $latestInvoice->id,- 'stripe_refund_id' => $refund->id,- 'refund_reason' => $request->get('refund_reason'),- ]);- } catch (\Exception $e) {- self::log('Refund Error', [- 'user_id' => $user->id,- 'error' => $e->getMessage(),- ]);- return $this->error(['message' => 'An error occurred while processing the refund.'], 500);- }-- return $this->success([- 'message' => "The payment has been successfully refunded."- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminOperations::class)->refundPayment($request));}public function disableTwoFactorAuthentication(Request $request){- $request->validate([- 'user_id' => 'required',- 'reason' => 'required'- ]);-- $user = User::findOrFail($request->get('user_id'));-- if ($user->admin) {- return $this->error([- 'message' => 'You cannot disable 2FA for an admin.'- ]);- }-- if (!$user->hasTwoFactorEnabled()) {- return $this->error([- 'message' => "Two-factor authentication is not enabled."- ]);- }-- // Disable 2FA- $user->disableTwoFactorAuth();-- self::log('Disable Two-Factor Authentication ', [- 'user_id' => $user->id,- 'user_email' => $user->email,- 'reason' => $request->get('reason')- ]);-- $user->two_factor_enabled = false;-- return $this->success([- 'message' => "Two-factor authentication has been disabled successfully.",- 'user' => $user->makeVisible('meta')- ]);+ return app(AdminOperations::class)->disableTwoFactorAuthentication($request);}public function clearUserCache(Request $request){- $request->validate([- 'user_id' => 'required|integer|exists:users,id'- ]);-- $user = User::findOrFail($request->get('user_id'));- $user->flushCache();-- self::log('Clear user cache', [- 'user_id' => $user->id,- ]);-- return $this->success([- 'message' => 'User cache cleared.',- ]);+ return app(AdminOperations::class)->clearUserCache($request);}public static function log($message, $data = []){- $moderator = request()->user();-- // Always include moderator information- $baseData = [- 'moderator' => $moderator->email . ' (' . $moderator->id . ')',- ];-- // Add action button for admin panel if user_id or target_id is present- if (isset($data['user_id'])) {- $baseData['actions'] = [- 'Open Admin' => front_url('/settings/admin?user_id=' . $data['user_id'])- ];- } elseif (isset($data['target_id'])) {- $baseData['actions'] = [- 'Open Admin' => front_url('/settings/admin?user_id=' . $data['target_id'])- ];- }-- // Merge with provided data (provided data takes precedence)- $logData = array_merge($baseData, $data);-- Log::warning(self::ADMIN_LOG_PREFIX . $message, $data);- Log::channel('slack_admin')->warning($message, $logData);+ return AdminOperations::log($message, $data);}+}diff --git a/api/app/Http/Controllers/Admin/BillingController.php b/api/app/Http/Controllers/Admin/BillingController.phpindex e2b048f66..c0aebbefd 100644--- a/api/app/Http/Controllers/Admin/BillingController.php+++ b/api/app/Http/Controllers/Admin/BillingController.php@@ -4,9 +4,8 @@ namespace App\Http\Controllers\Admin;use App\Http\Controllers\Controller;use App\Models\User;-use Carbon\Carbon;use Illuminate\Http\Request;-use Laravel\Cashier\Cashier;+use App\Service\Admin\AdminBilling;class BillingController extends Controller{@@ -17,103 +16,22 @@ class BillingController extends Controllerpublic function getCustomer(User $user){- if (!$user->hasStripeId()) {- return $this->error([- "message" => "Stripe user not created",- ]);- }-- $stripeCustomer = $user->asStripeCustomer();-- return $this->success([- 'billing_email' => $stripeCustomer->email,- 'billing_name' => $stripeCustomer->name,- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminBilling::class)->getCustomer($user));}public function updateCustomer(Request $request){- $request->validate([- 'user_id' => 'required',- 'billing_email' => 'required|email',- 'billing_name' => 'required|string|max:255',- ]);-- $user = User::findOrFail($request->get("user_id"));-- if (!$user->hasStripeId()) {- return $this->error([- "message" => "Stripe user not created",- ]);- }-- AdminController::log('Update billing customer', [- 'user_id' => $user->id,- 'stripe_id' => $user->stripe_id,- ]);-- $user->updateStripeCustomer([- 'email' => $request->billing_email,- 'name' => $request->billing_name,- ]);-- return $this->success(['message' => 'Billing info updated successfully']);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminBilling::class)->updateCustomer($request));}public function getSubscriptions(User $user){- if (!$user->hasStripeId()) {- return $this->error([- "message" => "Stripe user not created",- ]);- }- $subscriptions = $user->subscriptions()->latest()->take(100)->get()->map(function ($subscription) use ($user) {- return [- "id" => $subscription->id,- "stripe_id" => $subscription->stripe_id,- "name" => ucfirst($user->name),- "plan" => $subscription->type,- "status" => $subscription->stripe_status,- "creation_date" => $subscription->created_at->format('Y-m-d'),- "canceled_at" => $subscription->ends_at ? $subscription->ends_at->format('Y-m-d') : null,- ];- });- return $this->success([- 'subscriptions' => $subscriptions,- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminBilling::class)->getSubscriptions($user));}public function getPayments(User $user){- if (!$user->hasStripeId()) {- return $this->error([- "message" => "Stripe user not created",- ]);- }- $payments = $user->invoices();- $payments = $payments->map(function ($payment) use ($user) {- $status = $payment->status;-- // If the underlying Stripe charge was refunded, reflect that in the status- try {- $stripeInvoice = Cashier::stripe()->invoices->retrieve($payment->id, ['expand' => ['charge']]);- if (isset($stripeInvoice->charge) && ($stripeInvoice->charge->refunded ?? false)) {- $status = 'refunded';- }- } catch (\Exception $e) {- // Ignore errors while deriving refund status; fall back to invoice status- }-- return [- "id" => $payment->id,- "amount_paid" => ($payment->amount_paid),- "name" => ucfirst($payment->account_name),- "creation_date" => Carbon::parse($payment->created)->format("Y-m-d H:i:s"),- "status" => $status,- ];- });- return $this->success([- 'payments' => $payments,- ]);+ return \App\Service\Admin\AdminStripe::withTimeout(fn () => app(AdminBilling::class)->getPayments($user));}+}diff --git a/api/app/Http/Controllers/Admin/FormController.php b/api/app/Http/Controllers/Admin/FormController.phpindex c149adbe2..8b3d475b0 100644--- a/api/app/Http/Controllers/Admin/FormController.php+++ b/api/app/Http/Controllers/Admin/FormController.php@@ -3,34 +3,19 @@namespace App\Http\Controllers\Admin;use App\Http\Controllers\Controller;-use App\Models\Forms\Form;use App\Models\User;+use App\Service\Admin\AdminForms;class FormController extends Controller{public function getDeletedForms(User $user){- $deletedForms = $user->forms()->with('creator')->onlyTrashed()->get()->map(function ($form) {- return [- "id" => $form->id,- "slug" => $form->slug,- "title" => $form->title,- "created_by" => $form->creator->email,- "deleted_at" => $form->deleted_at->format('Y-m-d'),- ];- });- return $this->success(['forms' => $deletedForms]);+ return app(AdminForms::class)->getDeletedForms($user);}- public function restoreDeletedForm(string $slug)+ public function restoreDeletedForm(\Illuminate\Http\Request $request){- $form = Form::onlyTrashed()->whereSlug($slug)->firstOrFail();- $form->restore();-- AdminController::log('Restore deleted form', [- 'form_id' => $form->id,- ]);-- return $this->success(['message' => 'Form restored successfully']);+ return app(AdminForms::class)->restoreDeletedForm($request->route('slug') ?? $request->string('slug')->toString());}+}diff --git a/api/app/Http/Controllers/Settings/TokenController.php b/api/app/Http/Controllers/Settings/TokenController.phpindex eb3f4a22e..aae0bc8ca 100644--- a/api/app/Http/Controllers/Settings/TokenController.php+++ b/api/app/Http/Controllers/Settings/TokenController.php@@ -13,6 +13,11 @@ class TokenController{use AuthorizesRequests;+ public function abilities()+ {+ return response()->json(!config('app.self_hosted') && request()->user()->moderator && !request()->user()->is_blocked ? AccessTokenAbility::adminValues() : []);+ }+public function index(){return TokenResource::collection(@@ -22,9 +27,16 @@ class TokenControllerpublic function store(CreateTokenRequest $request){+ $abilities = $request->input('abilities') ?? [];+ $admin = array_intersect($abilities, AccessTokenAbility::adminValues());+ if ($admin) {+ abort_unless(!config('app.self_hosted') && $request->user()->moderator && !$request->user()->is_blocked, 403);+ $request->validate(['expires_at' => 'required|date|after:now|before_or_equal:'.now()->addDays(90)->toIso8601String()]);+ }$token = Auth::user()->createToken($request->input('name'),- AccessTokenAbility::allowed($request->input('abilities'))+ array_values(array_unique([...AccessTokenAbility::allowed($abilities), ...$admin])),+ $admin ? \Carbon\Carbon::parse($request->input('expires_at')) : null);return response()->json([diff --git a/api/app/Http/Middleware/AdminRequestReceipt.php b/api/app/Http/Middleware/AdminRequestReceipt.phpnew file mode 100644index 000000000..f7eb73e2d--- /dev/null+++ b/api/app/Http/Middleware/AdminRequestReceipt.php@@ -0,0 +1,62 @@+<?php++namespace App\Http\Middleware;++use App\Http\Requests\AdminApi\ActionRequest;+use App\Models\AdminApiAction;+use App\Models\User;+use Closure;+use Illuminate\Database\QueryException;+use Illuminate\Http\Request;++class AdminRequestReceipt+{+ public function handle(Request $request, Closure $next)+ {+ // Request::get() in shared UI services prefers query values over JSON input.+ abort_if($request->query->count() > 0, 422, 'Action parameters must be supplied only in the JSON body.');+ $input = app(ActionRequest::class)->validated();+ $key = $request->header('Idempotency-Key');+ abort_unless(is_string($key) && strlen($key) >= 8 && strlen($key) <= 200, 422, 'Idempotency-Key required.');+ if (isset($input['user_id'])) {+ abort_if(User::findOrFail($input['user_id'])->admin, 403);+ }+ $hash = AdminApiAction::contentHash($request->route()->defaults['operation'], $input);+ $keyHash = hash('sha256', $key);+ $tokenId = $request->user()->currentAccessToken()->id;+ try {+ $receipt = AdminApiAction::create([+ 'id' => $input['action_id'], 'actor_id' => $request->user()->id, 'token_id' => $tokenId,+ 'operation' => $request->route()->defaults['operation'],+ 'target' => isset($input['user_id']) ? 'user:'.$input['user_id'] : 'templates',+ 'request_hash' => $hash, 'idempotency_hash' => $keyHash,+ 'status' => 'running',+ ]);+ } catch (QueryException $e) {+ $receipt = AdminApiAction::where('id', $input['action_id'])->orWhere(fn ($q) => $q->where('token_id', $tokenId)->where('idempotency_hash', $keyHash))->first();+ if (!$receipt) {+ throw $e;+ }+ abort_unless($receipt->id === $input['action_id'] && $receipt->token_id === $tokenId+ && $receipt->actor_id === $request->user()->id && hash_equals($receipt->request_hash, $hash)+ && hash_equals($receipt->idempotency_hash, $keyHash), 409, 'Conflicting request identity.');+ return response()->json(['action_id' => $receipt->id, 'status' => $receipt->status, 'result' => $receipt->result], $receipt->status === 'completed' ? 200 : 409);+ }+ $request->attributes->set('admin_api_action_id', $receipt->id);+ try {+ $response = $next($request);+ $status = $response->getStatusCode() < 300 ? 'completed' : 'uncertain';+ if ($response->getStatusCode() === 202) {+ $status = 'running';+ }+ $receipt->refresh();+ if ($receipt->status === 'running') {+ $receipt->update(['status' => $status, 'result' => $status === 'completed' ? array_merge(['accepted' => true], \Illuminate\Support\Arr::only(json_decode($response->getContent(), true) ?? [], ['refund_id', 'charge_id', 'template_slug'])) : $receipt->result]);+ }+ return response()->json(['action_id' => $receipt->id, 'status' => $receipt->status, 'result' => $receipt->result], $response->getStatusCode());+ } catch (\Throwable $e) {+ $receipt->update(['status' => 'uncertain']);+ throw $e;+ }+ }+}diff --git a/api/app/Http/Middleware/IsModerator.php b/api/app/Http/Middleware/IsModerator.phpindex 2c79fc109..5ee501d78 100644--- a/api/app/Http/Middleware/IsModerator.php+++ b/api/app/Http/Middleware/IsModerator.php@@ -12,8 +12,20 @@ class IsModerator** @return mixed*/- public function handle(Request $request, Closure $next)+ public function handle(Request $request, Closure $next, ?string $scope = null){+ if ($request->is('external/admin/*')) {+ abort_if(config('app.self_hosted'), 404);+ $token = $request->user()?->currentAccessToken();+ abort_unless($request->bearerToken() && $token instanceof \Laravel\Sanctum\PersonalAccessToken+ && \Laravel\Sanctum\PersonalAccessToken::findToken($request->bearerToken())?->id === $token->id, 401);+ $target = $request->route('user');+ abort_if($target instanceof \App\Models\User && $target->admin, 403);+ $scope ??= $request->route()->defaults['admin_scope'] ?? null;+ abort_unless($request->user()->moderator && !$request->user()->is_blocked+ && $scope && in_array($scope, $token->abilities, true)+ && $token->expires_at?->isFuture(), 403);+ }if ($request->user() && ! $request->user()->moderator) {// This user is not a paying customer...if ($request->expectsJson()) {diff --git a/api/app/Http/Requests/AdminApi/ActionRequest.php b/api/app/Http/Requests/AdminApi/ActionRequest.phpnew file mode 100644index 000000000..f7b9c09e1--- /dev/null+++ b/api/app/Http/Requests/AdminApi/ActionRequest.php@@ -0,0 +1,38 @@+<?php++namespace App\Http\Requests\AdminApi;++use Illuminate\Foundation\Http\FormRequest;++class ActionRequest extends FormRequest+{+ public function rules(): array+ {+ $rules = [+ 'action_id' => 'required|uuid',+ ];+ $operation = $this->route()->defaults['operation'];+ if (!in_array($operation, ['create-template'], true)) {+ $rules['user_id'] = 'required|integer';+ }+ return $rules + match ($operation) {+ 'block-user', 'unblock-user', 'disable-two-factor-authentication' => ['reason' => 'required|string|max:1000'],+ 'extend-trial' => ['trial_ends_at' => ['required', 'date', 'regex:/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:Z|[+-]\d{2}:\d{2})$/']],+ 'cancel-subscription' => ['subscription_id' => 'required|integer', 'cancellation_reason' => 'required|string|max:1000'],+ 'refund-payment' => ['invoice_id' => 'required|string|max:255', 'refund_reason' => 'required|string|max:1000', 'expected_amount' => 'required|integer|min:1', 'expected_currency' => 'required|string|regex:/^[a-z]{3}$/'],+ 'update-customer' => ['billing_email' => 'required|email|max:255', 'billing_name' => 'required|string|max:255'],+ 'restore-form' => ['slug' => 'required|string|max:255'],+ 'create-template' => ['template_prompt' => 'required|string|max:4000'],+ default => [],+ };+ }++ public function after(): array+ {+ return [function ($validator) {+ foreach (array_diff(array_keys($this->all()), array_keys($this->rules())) as $key) {+ $validator->errors()->add($key, 'Unknown parameter.');+ }+ }];+ }+}diff --git a/api/app/Http/Requests/CreateTokenRequest.php b/api/app/Http/Requests/CreateTokenRequest.phpindex d7ae9e81c..08aa1805d 100644--- a/api/app/Http/Requests/CreateTokenRequest.php+++ b/api/app/Http/Requests/CreateTokenRequest.php@@ -13,6 +13,7 @@ class CreateTokenRequest extends FormRequest'required','string',],+ 'abilities.*' => ['string', \Illuminate\Validation\Rule::in(array_merge(\App\Enums\AccessTokenAbility::values(), \App\Enums\AccessTokenAbility::adminValues()))],'abilities' => ['nullable','array'diff --git a/api/app/Http/Resources/TokenResource.php b/api/app/Http/Resources/TokenResource.phpindex 985200fe4..3dead915d 100644--- a/api/app/Http/Resources/TokenResource.php+++ b/api/app/Http/Resources/TokenResource.php@@ -14,6 +14,7 @@ class TokenResource extends JsonResourcereturn ['id' => $this->resource->id,'name' => $this->resource->name,+ 'expires_at' => $this->resource->expires_at?->toIso8601String(),'abilities' => $this->resource->abilities,];}diff --git a/api/app/Jobs/Template/GenerateTemplateJob.php b/api/app/Jobs/Template/GenerateTemplateJob.phpindex e4cc853b4..52fe861f2 100644--- a/api/app/Jobs/Template/GenerateTemplateJob.php+++ b/api/app/Jobs/Template/GenerateTemplateJob.php@@ -20,13 +20,16 @@ class GenerateTemplateJob implements ShouldQueueuse Queueable;use SerializesModels;+ public int $tries = 1;+ public int $timeout = 60;+ public bool $failOnTimeout = true;public ?Template $generatedTemplate = null;public const MAX_RELATED_TEMPLATES = 8;/*** Create a new job instance.*/- public function __construct(public string $prompt)+ public function __construct(public string $prompt, public ?string $adminReceiptId = null){}@@ -35,6 +38,24 @@ class GenerateTemplateJob implements ShouldQueue*/public function handle(): void{+ $receipt = null;+ if ($this->adminReceiptId) {+ $receipt = \App\Models\AdminApiAction::findOrFail($this->adminReceiptId);+ if ($receipt->status !== 'running') {+ return;+ }+ $token = \Laravel\Sanctum\PersonalAccessToken::find($receipt->token_id);+ $actor = $token?->tokenable;+ if (config('app.self_hosted') || !$actor?->moderator || $actor->is_blocked || !$token->expires_at?->isFuture()+ || !in_array('admin:templates:create', $token->abilities, true)+ || (config('sanctum.expiration') && $token->created_at->addMinutes(config('sanctum.expiration'))->isPast())) {+ $receipt->update(['status' => 'uncertain']);+ return;+ }+ if (!\App\Models\AdminApiAction::whereKey($receipt->id)->where('status', 'running')->update(['status' => 'processing'])) {+ return;+ }+ }// Get form structure using the form prompt class$formData = GenerateFormPrompt::run($this->prompt);@@ -70,6 +91,14 @@ class GenerateTemplateJob implements ShouldQueue// Set reverse related Templates$this->setReverseRelatedTemplates($template);+ $receipt?->update(['status' => 'completed', 'result' => ['template_slug' => $template->slug]]);+ }++ public function failed(?\Throwable $exception): void+ {+ if ($this->adminReceiptId) {+ \App\Models\AdminApiAction::whereKey($this->adminReceiptId)->where('status', '!=', 'completed')->update(['status' => 'uncertain']);+ }}/**diff --git a/api/app/Models/AdminApiAction.php b/api/app/Models/AdminApiAction.phpnew file mode 100644index 000000000..454445a9a--- /dev/null+++ b/api/app/Models/AdminApiAction.php@@ -0,0 +1,25 @@+<?php++namespace App\Models;++use Illuminate\Database\Eloquent\Model;++class AdminApiAction extends Model+{+ public static function contentHash(string $operation, array $input): string+ {+ foreach (['user_id', 'subscription_id', 'expected_amount'] as $field) {+ if (isset($input[$field])) {+ $input[$field] = (int) $input[$field];+ }+ }+ ksort($input);+ return hash('sha256', json_encode([$operation, $input], JSON_THROW_ON_ERROR));+ }++ public $incrementing = false;+ protected $keyType = 'string';+ protected $guarded = [];+ protected $hidden = ['request_hash', 'idempotency_hash'];+ protected $casts = ['actor_id' => 'integer', 'token_id' => 'integer', 'result' => 'array'];+}diff --git a/api/app/Service/Admin/AdminBilling.php b/api/app/Service/Admin/AdminBilling.phpnew file mode 100644index 000000000..08259fd95--- /dev/null+++ b/api/app/Service/Admin/AdminBilling.php@@ -0,0 +1,95 @@+<?php++namespace App\Service\Admin;++use App\Models\User;+use Illuminate\Http\Request;++class AdminBilling+{+ use AdminResponses;++ public function getCustomer(User $user)+ {+ if (!$user->hasStripeId()) {+ return $this->error([+ "message" => "Stripe user not created",+ ]);+ }++ $stripeCustomer = $user->asStripeCustomer();++ return $this->success([+ 'billing_email' => $stripeCustomer->email,+ 'billing_name' => $stripeCustomer->name,+ ]);+ }++ public function updateCustomer(Request $request)+ {+ $request->validate([+ 'user_id' => 'required',+ 'billing_email' => 'required|email',+ 'billing_name' => 'required|string|max:255',+ ]);++ $user = User::findOrFail($request->get("user_id"));++ if (!$user->hasStripeId()) {+ return $this->error([+ "message" => "Stripe user not created",+ ]);+ }++ AdminOperations::log('Update billing customer', [+ 'user_id' => $user->id,+ 'stripe_id' => $user->stripe_id,+ ]);++ $updated = $user->updateStripeCustomer([+ 'email' => $request->billing_email,+ 'name' => $request->billing_name,+ ]);++ if ($request->attributes->has('admin_api_action_id')) {+ abort_unless($updated->email === $request->billing_email && $updated->name === $request->billing_name, 409, 'Customer update not confirmed.');+ }+ return $this->success(['message' => 'Billing info updated successfully']);+ }++ public function getSubscriptions(User $user)+ {+ if (!$user->hasStripeId()) {+ return $this->error([+ "message" => "Stripe user not created",+ ]);+ }+ $subscriptions = $user->subscriptions()->latest()->take(100)->get()->map(function ($subscription) use ($user) {+ return [+ "id" => $subscription->id,+ "stripe_id" => $subscription->stripe_id,+ "name" => ucfirst($user->name),+ "plan" => $subscription->type,+ "status" => $subscription->stripe_status,+ "creation_date" => $subscription->created_at->format('Y-m-d'),+ "canceled_at" => $subscription->ends_at ? $subscription->ends_at->format('Y-m-d') : null,+ ];+ });+ return $this->success([+ 'subscriptions' => $subscriptions,+ ]);+ }++ public function getPayments(User $user)+ {+ if (!$user->hasStripeId()) {+ return $this->error([+ "message" => "Stripe user not created",+ ]);+ }+ $payments = app(AdminStripe::class)->paymentRows($user);+ return $this->success([+ 'payments' => $payments,+ ]);+ }+}diff --git a/api/app/Service/Admin/AdminForms.php b/api/app/Service/Admin/AdminForms.phpnew file mode 100644index 000000000..ab4567add--- /dev/null+++ b/api/app/Service/Admin/AdminForms.php@@ -0,0 +1,39 @@+<?php++namespace App\Service\Admin;++use App\Models\Forms\Form;+use App\Models\User;++class AdminForms+{+ use AdminResponses;+ public function getDeletedForms(User $user)+ {+ $deletedForms = $user->forms()->with('creator')->onlyTrashed()->get()->map(function ($form) {+ return [+ "id" => $form->id,+ "slug" => $form->slug,+ "title" => $form->title,+ "created_by" => $form->creator->email,+ "deleted_at" => $form->deleted_at->format('Y-m-d'),+ ];+ });+ return $this->success(['forms' => $deletedForms]);+ }++ public function restoreDeletedForm(string $slug)+ {+ $form = Form::onlyTrashed()->whereSlug($slug)->firstOrFail();+ if (request()->attributes->has('admin_api_action_id')) {+ abort_unless(User::findOrFail(request()->integer('user_id'))->forms()->withTrashed()->where('forms.id', $form->id)->exists(), 404);+ }+ $form->restore();++ AdminOperations::log('Restore deleted form', [+ 'form_id' => $form->id,+ ]);++ return $this->success(['message' => 'Form restored successfully']);+ }+}diff --git a/api/app/Service/Admin/AdminOperations.php b/api/app/Service/Admin/AdminOperations.phpnew file mode 100644index 000000000..e9b8f5650--- /dev/null+++ b/api/app/Service/Admin/AdminOperations.php@@ -0,0 +1,414 @@+<?php++namespace App\Service\Admin;++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;++class AdminOperations+{+ use AdminResponses;+ public const ADMIN_LOG_PREFIX = '[admin_action] ';+++ public function createTemplate(Request $request)+ {+ $request->validate([+ 'template_prompt' => 'required|string|max:4000'+ ]);++ $receiptId = $request->attributes->get('admin_api_action_id');+ $job = new GenerateTemplateJob($request->template_prompt, $receiptId);+ if ($receiptId) {+ abort_if(in_array(config('queue.connections.'.config('queue.default').'.driver'), ['sync', 'null'], true), 503, 'A background queue is required for templates.');+ dispatch($job);+ return response()->json(['accepted' => true], 202);+ }+ $job->handle();++ return $this->success([+ 'template_slug' => $job->generatedTemplate?->slug ?? null+ ]);+ }++ public function fetchUser($identifier)+ {+ $user = null;+ if (is_numeric($identifier)) {+ $user = User::find($identifier);+ } elseif (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {+ $user = User::whereEmail($identifier)->first();+ } else {+ // Find by form slug+ $form = Form::whereSlug($identifier)->first();+ if ($form) {+ $user = $form->creator;+ }+ }++ if (!$user) {+ return $this->error([+ 'message' => 'User not found.'+ ]);+ } elseif ($user->admin) {+ return $this->error([+ 'message' => 'You cannot fetch an admin.'+ ]);+ }++ // Get two-factor authentication status+ $user->two_factor_enabled = $user->hasTwoFactorEnabled();++ $workspaces = $user->workspaces()+ ->withCount('forms')+ ->get()+ ->map(function ($workspace) {+ $plan = $workspace->is_trialing ? 'trialing' : $workspace->plan_tier;+ return [+ 'id' => $workspace->id,+ 'name' => $workspace->name,+ 'plan' => $plan,+ 'forms_count' => $workspace->forms_count+ ];+ });+ return $this->success([+ 'user' => request()->is('external/admin/*') ? $user->only(['id', 'email', 'name', 'blocked_at', 'two_factor_enabled']) : $user->makeVisible('meta'),+ 'workspaces' => $workspaces+ ]);+ }++ 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([+ 'user_id' => 'required|integer|exists:users,id'+ ]);+ $user = User::findOrFail($request->get("user_id"));++ $activeSubscriptions = $user->subscriptions()->where(function ($q) {+ $q->where('stripe_status', 'trialing')+ ->orWhere('stripe_status', 'active');+ })->get();++ if ($activeSubscriptions->count() != 1) {+ return $this->error([+ "message" => "The user has more than one active subscriptions or doesn't have one."+ ]);+ }++ $couponId = config('pricing.discount_coupon_id');+ if (is_null($couponId)) {+ return $this->error([+ "message" => "Coupon id not defined."+ ]);+ }++ $subscription = $activeSubscriptions->first();+ $updated = Cashier::stripe()->subscriptions->update($subscription->stripe_id, [+ 'discounts' => [['coupon' => $couponId]],+ 'expand' => ['discounts'],+ ]);+ if ($request->attributes->has('admin_api_action_id')) {+ abort_unless(collect($updated->discounts)->contains(fn ($discount) => ($discount->coupon->id ?? null) === $couponId), 409, 'Discount not confirmed.');+ }++ self::log('Applying NGO/Student discount to sub', [+ 'user_id' => $user->id,+ 'subcription_id' => $subscription->id,+ 'coupon_id' => $couponId,+ 'subscription_stripe_id' => $subscription->stripe_id,+ ]);++ return $this->success([+ "message" => "40% Discount applied for the next 12 months."+ ]);+ }++ public function extendTrial(Request $request)+ {+ $request->validate([+ 'user_id' => 'required|integer|exists:users,id',+ 'number_of_day' => 'required_without:trial_ends_at|integer|min:1|max:14',+ 'trial_ends_at' => 'sometimes|date|after:now|before_or_equal:'.now()->addDays(14)->toIso8601String()+ ]);+ $user = User::findOrFail($request->get("user_id"));++ $subscription = $user->subscriptions()+ ->where('stripe_status', 'trialing')+ ->orderBy('id')->firstOrFail();++ $trialEndDate = $request->filled('trial_ends_at')+ ? \Carbon\Carbon::parse($request->get('trial_ends_at'))+ : now()->addDays($request->get('number_of_day'));+ $subscription->extendTrial($trialEndDate);+ if ($request->attributes->has('admin_api_action_id')) {+ abort_unless($subscription->asStripeSubscription()->trial_end === $trialEndDate->timestamp, 409, 'Trial end not confirmed.');+ }++ self::log('Trial extended', [+ 'user_id' => $user->id,+ 'subcription_id' => $subscription->id,+ 'nb_days' => $request->get('number_of_day'),+ 'subscription_stripe_id' => $subscription->stripe_id,+ ]);++ return $this->success([+ "message" => "Subscription trial extend until the " . $trialEndDate->format('d/m/Y')+ ]);+ }++ public function cancelSubscription(Request $request)+ {+ $request->validate([+ 'user_id' => 'required|integer|exists:users,id',+ 'subscription_id' => 'required',+ 'cancellation_reason' => 'required'+ ]);+ $user = User::findOrFail($request->get("user_id"));+ $subscription = $user->subscriptions()->find($request->get("subscription_id"));++ if (! $subscription) {+ return $this->error([+ "message" => "Subscription not found."+ ], 404);+ }++ if ($subscription && !in_array($subscription->stripe_status, ['active', 'trialing'])) {+ return $this->error([+ "message" => "The subscription is not active or trialing."+ ]);+ }++ // Cancel the subscription+ $subscription->cancel();+ if ($request->attributes->has('admin_api_action_id')) {+ $remote = $subscription->asStripeSubscription();+ abort_unless($remote->cancel_at_period_end || $remote->status === 'canceled', 409, 'Cancellation not confirmed.');+ }++ self::log('Cancel Subscription', [+ 'user_id' => $user->id,+ 'cancel_reason' => $request->get('cancellation_reason'),+ 'subcription_id' => $subscription->id,+ 'subscription_stripe_id' => $subscription->stripe_id+ ]);++ return $this->success([+ "message" => "The subscription cancellation has been successfully completed."+ ]);+ }++ public function sendPasswordResetEmail(Request $request)+ {+ $user = User::findOrFail($request->user_id);++ $status = Password::sendResetLink(['email' => $user->email]);++ if ($status !== Password::RESET_LINK_SENT) {+ return $this->error([+ 'message' => "Password reset email failed to send"+ ]);+ }++ self::log('Sent password reset email', [+ 'user_id' => $user->id,+ ]);++ return $this->success([+ 'message' => "Password reset email has been sent to the user's email address"+ ]);+ }++ public function refundPayment(Request $request)+ {+ $request->validate([+ 'user_id' => 'required|integer|exists:users,id',+ 'invoice_id' => 'required',+ 'refund_reason' => 'required'+ ]);++ $user = User::findOrFail($request->get('user_id'));+ $latestInvoice = $user->invoices()->first();++ if (!$latestInvoice) {+ return $this->error(['message' => 'No invoices found for this user.'], 404);+ }++ if ($latestInvoice->id !== $request->get('invoice_id')) {+ return $this->error(['message' => 'You can only refund the last invoice.'], 422);+ }++ // Get the Stripe invoice to find the payment+ $payment = app(AdminStripe::class)->refundablePayment($user, $latestInvoice->asStripeInvoice());++ abort_unless($payment['amount_paid'] > $payment['amount_refunded'], 422, 'The charge has already been refunded.');+ if ($request->attributes->has('admin_api_action_id')) {+ abort_unless($request->integer('expected_amount') === $payment['amount_paid'] - $payment['amount_refunded']+ && $request->get('expected_currency') === $payment['currency'], 409, 'Approved refund amount or currency changed.');+ }+ try {+ $refund = Cashier::stripe()->refunds->create([+ 'charge' => $payment['charge_id'],+ 'amount' => $payment['amount_paid'] - $payment['amount_refunded'],+ 'reason' => 'requested_by_customer',+ 'metadata' => [+ 'refund_reason' => $request->get('refund_reason'),+ 'moderator_id' => request()->user()->id,+ 'user_id' => $user->id+ ]+ ], $request->attributes->get('admin_api_action_id')+ ? ['idempotency_key' => 'admin-api:'.$request->attributes->get('admin_api_action_id')]+ : []);++ if ($request->attributes->has('admin_api_action_id')) {+ \App\Models\AdminApiAction::whereKey($request->attributes->get('admin_api_action_id'))->update(['result' => ['refund_id' => $refund->id, 'charge_id' => $payment['charge_id']]]);+ abort_unless($refund->status === 'succeeded' && $refund->amount === $request->integer('expected_amount') && $refund->currency === $request->get('expected_currency'), 409, 'Refund is not confirmed; reconcile before retrying.');+ }+ self::log('Refund Payment', [+ 'user_id' => $user->id,+ 'invoice_id' => $latestInvoice->id,+ 'stripe_refund_id' => $refund->id,+ 'refund_reason' => $request->get('refund_reason'),+ ]);+ } catch (\Exception $e) {+ self::log('Refund Error', [+ 'user_id' => $user->id,+ 'error_type' => $e::class,+ ]);+ return $this->error(['message' => 'An error occurred while processing the refund.'], 500);+ }++ return $this->success([+ 'message' => "The payment has been successfully refunded.",+ 'refund_id' => $refund->id,+ 'charge_id' => $payment['charge_id']+ ]);+ }++ public function disableTwoFactorAuthentication(Request $request)+ {+ $request->validate([+ 'user_id' => 'required|integer|exists:users,id',+ 'reason' => 'required'+ ]);++ $user = User::findOrFail($request->get('user_id'));++ if ($user->admin) {+ return $this->error([+ 'message' => 'You cannot disable 2FA for an admin.'+ ]);+ }++ if (!$user->hasTwoFactorEnabled()) {+ return $this->error([+ 'message' => "Two-factor authentication is not enabled."+ ]);+ }++ // Disable 2FA+ $user->disableTwoFactorAuth();++ self::log('Disable Two-Factor Authentication ', [+ 'user_id' => $user->id,+ 'user_email' => $user->email,+ 'reason' => $request->get('reason')+ ]);++ $user->two_factor_enabled = false;++ return $this->success([+ 'message' => "Two-factor authentication has been disabled successfully.",+ 'user' => $user->makeVisible('meta')+ ]);+ }++ public function clearUserCache(Request $request)+ {+ $request->validate([+ 'user_id' => 'required|integer|exists:users,id'+ ]);++ $user = User::findOrFail($request->get('user_id'));+ $user->flushCache();++ self::log('Clear user cache', [+ 'user_id' => $user->id,+ ]);++ return $this->success([+ 'message' => 'User cache cleared.',+ ]);+ }++ public static function log($message, $data = [])+ {+ $moderator = request()->user();++ // Always include moderator information+ $baseData = [+ 'moderator' => $moderator->email . ' (' . $moderator->id . ')',+ ];++ // Add action button for admin panel if user_id or target_id is present+ if (isset($data['user_id'])) {+ $baseData['actions'] = [+ 'Open Admin' => front_url('/settings/admin?user_id=' . $data['user_id'])+ ];+ } elseif (isset($data['target_id'])) {+ $baseData['actions'] = [+ 'Open Admin' => front_url('/settings/admin?user_id=' . $data['target_id'])+ ];+ }++ // Merge with provided data (provided data takes precedence)+ $logData = array_merge($baseData, $data);++ Log::warning(self::ADMIN_LOG_PREFIX . $message, $data);+ Log::channel('slack_admin')->warning($message, $logData);+ }+}diff --git a/api/app/Service/Admin/AdminResponses.php b/api/app/Service/Admin/AdminResponses.phpnew file mode 100644index 000000000..c544c4cc3--- /dev/null+++ b/api/app/Service/Admin/AdminResponses.php@@ -0,0 +1,18 @@+<?php++namespace App\Service\Admin;++use Illuminate\Http\JsonResponse;++trait AdminResponses+{+ protected function success(array $data = []): JsonResponse+ {+ return response()->json(array_merge(['type' => 'success'], $data));+ }++ protected function error(array $data = [], int $statusCode = 400): JsonResponse+ {+ return response()->json(array_merge(['type' => 'error'], $data), $statusCode);+ }+}diff --git a/api/app/Service/Admin/AdminStripe.php b/api/app/Service/Admin/AdminStripe.phpnew file mode 100644index 000000000..dc1a3e6e8--- /dev/null+++ b/api/app/Service/Admin/AdminStripe.php@@ -0,0 +1,79 @@+<?php++namespace App\Service\Admin;++use App\Models\User;+use Laravel\Cashier\Cashier;+use Stripe\Invoice;++/** Stripe Basil uses invoice payments and plural subscription discounts. */+class AdminStripe+{+ public static function withTimeout(callable $callback): mixed+ {+ $client = \Stripe\ApiRequestor::httpClient();+ $retries = \Stripe\Stripe::getMaxNetworkRetries();+ $timeout = $client instanceof \Stripe\HttpClient\CurlClient ? $client->getTimeout() : null;+ $connect = $client instanceof \Stripe\HttpClient\CurlClient ? $client->getConnectTimeout() : null;+ try {+ if ($timeout !== null) {+ $client->setTimeout(4);+ $client->setConnectTimeout(2);+ }+ \Stripe\Stripe::setMaxNetworkRetries(0);+ return $callback();+ } finally {+ if ($timeout !== null) {+ $client->setTimeout($timeout);+ $client->setConnectTimeout($connect);+ }+ \Stripe\Stripe::setMaxNetworkRetries($retries);+ }+ }++ public function refundablePayment(User $user, Invoice $invoice): array+ {+ abort_unless($invoice->customer === $user->stripe_id, 403);+ $payments = Cashier::stripe()->invoicePayments->all([+ 'invoice' => $invoice->id, 'status' => 'paid', 'limit' => 2,+ 'expand' => ['data.payment.payment_intent.latest_charge', 'data.payment.charge'],+ ]);+ // A payment can cover multiple invoices. Never refund another invoice's allocation.+ abort_if($payments->has_more || count($payments->data) !== 1, 422, 'A single paid invoice payment is required for this refund.');+ $payment = $payments->data[0];+ $source = $payment->payment;+ $charge = $source->type === 'payment_intent' ? $source->payment_intent?->latest_charge : ($source->type === 'charge' ? $source->charge : null);+ abort_unless(is_object($charge) && $charge->customer === $user->stripe_id && $charge->paid, 422, 'No refundable customer charge.');+ abort_unless($payment->amount_paid === $charge->amount && $payment->amount_paid === $invoice->amount_paid, 422, 'Split or shared invoice payments require manual refund review.');+ return ['charge_id' => $charge->id, 'amount_paid' => $payment->amount_paid,+ 'amount_refunded' => $charge->amount_refunded, 'currency' => $charge->currency];+ }++ public function paymentRows(User $user): array+ {+ $invoices = $user->invoices(false, ['expand' => ['data.payments']]);+ $charges = Cashier::stripe()->charges->all(['customer' => $user->stripe_id, 'limit' => 100]);+ return $invoices->map(function ($invoice) use ($charges) {+ $payments = $invoice->payments;+ $matched = [];+ foreach ($payments?->data ?? [] as $payment) {+ $source = $payment->payment;+ foreach ($charges->data as $charge) {+ if (($source->type === 'charge' && $source->charge === $charge->id)+ || ($source->type === 'payment_intent' && $source->payment_intent === $charge->payment_intent)) {+ $matched[] = $charge;+ }+ }+ }+ $refunded = count($matched) > 0 && !($payments?->has_more ?? true)+ && count($matched) === count($payments->data)+ && collect($matched)->every(fn ($charge) => $charge->refunded);+ $single = count($matched) === 1 && count($payments->data ?? []) === 1 && !($payments?->has_more ?? true) && $matched[0]->amount === $invoice->amount_paid;+ return ['currency' => $invoice->currency, 'refundable_amount' => $single ? max(0, $matched[0]->amount - $matched[0]->amount_refunded) : null, 'id' => $invoice->id, 'amount_paid' => $invoice->amount_paid,+ 'name' => ucfirst($invoice->account_name ?? ''),+ 'creation_date' => \Carbon\Carbon::parse($invoice->created)->format('Y-m-d H:i:s'),+ 'status' => $refunded ? 'refunded' : $invoice->status,+ 'refund_status_known' => !($payments?->has_more ?? true) && count($matched) === count($payments->data ?? [])];+ })->all();+ }+}diff --git a/api/database/migrations/2026_09_17_000001_create_admin_api_actions.php b/api/database/migrations/2026_09_17_000001_create_admin_api_actions.phpnew file mode 100644index 000000000..7e21b230f--- /dev/null+++ b/api/database/migrations/2026_09_17_000001_create_admin_api_actions.php@@ -0,0 +1,35 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class () extends Migration {+ public function up(): void+ {+ Schema::create('admin_api_actions', function (Blueprint $table) {+ $table->uuid('id')->primary();+ $table->unsignedBigInteger('actor_id')->index();+ $table->unsignedBigInteger('token_id')->index();+ $table->string('operation', 64);+ $table->string('target', 255);+ $table->char('idempotency_hash', 64);+ $table->char('request_hash', 64);+ $table->text('payload'); // Encrypted cast: reasons and customer details never enter queue payloads.+ $table->string('status', 32);+ $table->json('result')->nullable();+ $table->timestamps();+ $table->unique(['token_id', 'idempotency_hash']);+ });+ Schema::create('admin_api_action_locks', function (Blueprint $table) {+ $table->string('target', 255)->primary();+ $table->uuid('action_id')->unique();+ });+ }++ public function down(): void+ {+ Schema::dropIfExists('admin_api_action_locks');+ Schema::dropIfExists('admin_api_actions');+ }+};diff --git a/api/database/migrations/2026_09_18_000001_simplify_admin_request_receipts.php b/api/database/migrations/2026_09_18_000001_simplify_admin_request_receipts.phpnew file mode 100644index 000000000..79d09383e--- /dev/null+++ b/api/database/migrations/2026_09_18_000001_simplify_admin_request_receipts.php@@ -0,0 +1,21 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class () extends Migration {+ public function up(): void+ {+ Schema::dropIfExists('admin_api_action_locks');+ Schema::table('admin_api_actions', fn (Blueprint $table) => $table->dropColumn('payload'));+ }+ public function down(): void+ {+ Schema::table('admin_api_actions', fn (Blueprint $table) => $table->text('payload')->nullable());+ Schema::create('admin_api_action_locks', function (Blueprint $table) {+ $table->string('target', 255)->primary();+ $table->uuid('action_id')->unique();+ });+ }+};diff --git a/api/routes/api-external.php b/api/routes/api-external.phpindex a20ba7bd7..76813f781 100644--- a/api/routes/api-external.php+++ b/api/routes/api-external.php@@ -37,3 +37,36 @@ Route::prefix('external')->name('forms');});});++// Internal managed-cloud support routes. No wildcard token authorization.+Route::prefix('external/admin/v1')->middleware(['auth:sanctum', 'moderator'])->name('admin-api.')->group(function () {+ Route::get('users/{identifier}', [\App\Http\Controllers\Admin\AdminController::class, 'fetchUser'])->defaults('admin_scope', 'admin:users:read');+ Route::get('users/{user}/billing/customer', [\App\Http\Controllers\Admin\BillingController::class, 'getCustomer'])->defaults('admin_scope', 'admin:billing:read');+ Route::get('users/{user}/billing/subscriptions', [\App\Http\Controllers\Admin\BillingController::class, 'getSubscriptions'])->defaults('admin_scope', 'admin:billing:read');+ Route::get('users/{user}/billing/payments', [\App\Http\Controllers\Admin\BillingController::class, 'getPayments'])->defaults('admin_scope', 'admin:billing:read');+ Route::get('users/{user}/deleted-forms', [\App\Http\Controllers\Admin\FormController::class, 'getDeletedForms'])->defaults('admin_scope', 'admin:forms:read');+ Route::post('actions/block-user', [\App\Http\Controllers\Admin\AdminController::class, 'blockUser'])->defaults('operation', 'block-user')->defaults('admin_scope', 'admin:users:block')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/block-user/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'block-user')->defaults('admin_scope', 'admin:users:block');+ Route::post('actions/unblock-user', [\App\Http\Controllers\Admin\AdminController::class, 'unblockUser'])->defaults('operation', 'unblock-user')->defaults('admin_scope', 'admin:users:unblock')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/unblock-user/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'unblock-user')->defaults('admin_scope', 'admin:users:unblock');+ Route::post('actions/send-password-reset-email', [\App\Http\Controllers\Admin\AdminController::class, 'sendPasswordResetEmail'])->defaults('operation', 'send-password-reset-email')->defaults('admin_scope', 'admin:users:password-reset')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/send-password-reset-email/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'send-password-reset-email')->defaults('admin_scope', 'admin:users:password-reset');+ Route::post('actions/disable-two-factor-authentication', [\App\Http\Controllers\Admin\AdminController::class, 'disableTwoFactorAuthentication'])->defaults('operation', 'disable-two-factor-authentication')->defaults('admin_scope', 'admin:users:disable-2fa')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/disable-two-factor-authentication/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'disable-two-factor-authentication')->defaults('admin_scope', 'admin:users:disable-2fa');+ Route::post('actions/clear-user-cache', [\App\Http\Controllers\Admin\AdminController::class, 'clearUserCache'])->defaults('operation', 'clear-user-cache')->defaults('admin_scope', 'admin:users:clear-cache')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/clear-user-cache/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'clear-user-cache')->defaults('admin_scope', 'admin:users:clear-cache');+ Route::post('actions/apply-discount', [\App\Http\Controllers\Admin\AdminController::class, 'applyDiscount'])->defaults('operation', 'apply-discount')->defaults('admin_scope', 'admin:billing:discount')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/apply-discount/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'apply-discount')->defaults('admin_scope', 'admin:billing:discount');+ Route::post('actions/extend-trial', [\App\Http\Controllers\Admin\AdminController::class, 'extendTrial'])->defaults('operation', 'extend-trial')->defaults('admin_scope', 'admin:billing:extend-trial')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/extend-trial/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'extend-trial')->defaults('admin_scope', 'admin:billing:extend-trial');+ Route::post('actions/cancel-subscription', [\App\Http\Controllers\Admin\AdminController::class, 'cancelSubscription'])->defaults('operation', 'cancel-subscription')->defaults('admin_scope', 'admin:billing:cancel')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/cancel-subscription/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'cancel-subscription')->defaults('admin_scope', 'admin:billing:cancel');+ Route::post('actions/refund-payment', [\App\Http\Controllers\Admin\AdminController::class, 'refundPayment'])->defaults('operation', 'refund-payment')->defaults('admin_scope', 'admin:billing:refund')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/refund-payment/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'refund-payment')->defaults('admin_scope', 'admin:billing:refund');+ Route::post('actions/update-customer', [\App\Http\Controllers\Admin\BillingController::class, 'updateCustomer'])->defaults('operation', 'update-customer')->defaults('admin_scope', 'admin:billing:update')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/update-customer/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'update-customer')->defaults('admin_scope', 'admin:billing:update');+ Route::post('actions/restore-form', [\App\Http\Controllers\Admin\FormController::class, 'restoreDeletedForm'])->defaults('operation', 'restore-form')->defaults('admin_scope', 'admin:forms:restore')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/restore-form/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'restore-form')->defaults('admin_scope', 'admin:forms:restore');+ Route::post('actions/create-template', [\App\Http\Controllers\Admin\AdminController::class, 'createTemplate'])->defaults('operation', 'create-template')->defaults('admin_scope', 'admin:templates:create')->middleware(\App\Http\Middleware\AdminRequestReceipt::class);+ Route::get('actions/create-template/{actionId}', [\App\Http\Controllers\Admin\AdminController::class, 'receipt'])->defaults('operation', 'create-template')->defaults('admin_scope', 'admin:templates:create');+});diff --git a/api/routes/api.php b/api/routes/api.phpindex ecc10c884..d597c3a48 100644--- a/api/routes/api.php+++ b/api/routes/api.php@@ -119,6 +119,7 @@ Route::group(['middleware' => 'auth.multi'], function () {Route::patch('/password', [PasswordController::class, 'update']);Route::prefix('/tokens')->name('tokens.')->group(function () {+ Route::get('/abilities', [\App\Http\Controllers\Settings\TokenController::class, 'abilities'])->name('abilities');Route::get('/', [TokenController::class, 'index'])->name('index');Route::post('/', [TokenController::class, 'store'])->name('store');Route::delete('{token}', [TokenController::class, 'destroy'])->name('destroy');diff --git a/api/tests/Feature/AdminApiTest.php b/api/tests/Feature/AdminApiTest.phpnew file mode 100644index 000000000..372cb4b50--- /dev/null+++ b/api/tests/Feature/AdminApiTest.php@@ -0,0 +1,304 @@+<?php++use App\Models\AdminApiAction;+use App\Models\User;+use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Mail;+use Illuminate\Support\Str;++function adminApiCredentials(array $scopes = []): array+{+ $actor = User::factory()->create();+ config(['opnform.moderator_emails' => [$actor->email], 'app.self_hosted' => false]);+ return [$actor, $actor->createToken('Support', $scopes, now()->addDay())];+}++beforeEach(function () {+ Mail::fake();+ Log::spy();+ Log::shouldReceive('channel')->andReturnSelf();+});++it('requires cloud and an explicit live moderator PAT scope', function () {+ $target = User::factory()->create();+ [$actor, $token] = adminApiCredentials(['admin:users:read']);+ $url = '/external/admin/v1/users/'.$target->id;+ $this->getJson($url)->assertUnauthorized();+ Auth::forgetGuards();+ $this->withToken($token->plainTextToken)->getJson($url)->assertOk()->assertJsonPath('user.id', $target->id)->assertJsonMissingPath('user.meta');+ foreach ([['*'], ['forms-read']] as $scopes) {+ Auth::forgetGuards();+ $this->withToken($actor->createToken('legacy', $scopes, now()->addDay())->plainTextToken)->getJson($url)->assertForbidden();+ }+ Auth::forgetGuards();+ config(['opnform.moderator_emails' => []]);+ $this->withToken($token->plainTextToken)->getJson($url)->assertForbidden();+ config(['app.self_hosted' => true]);+ $this->getJson($url)->assertNotFound();+});++it('executes once and binds receipt to exact content key actor token and operation', function () {+ [$actor, $token] = adminApiCredentials(['admin:users:block', 'admin:users:unblock']);+ $user = User::factory()->create();+ $id = (string) Str::uuid();+ $read = '/external/admin/v1/actions/block-user/'.$id.'?'.http_build_query(['user_id' => $user->id, 'reason' => 'Confirmed spam']);+ $body = ['action_id' => $id, 'user_id' => $user->id, 'reason' => 'Confirmed spam'];+ $this->withToken($token->plainTextToken)->getJson($read)->assertOk()->assertJsonPath('status', 'not_started');+ $this->withHeader('Idempotency-Key', 'block-request-1')->postJson('/external/admin/v1/actions/block-user', $body)->assertOk()->assertJsonPath('status', 'completed');+ expect($user->fresh()->is_blocked)->toBeTrue();+ $this->postJson('/external/admin/v1/actions/block-user', array_reverse($body, true))->assertOk();+ Mail::assertSentCount(1);+ $this->getJson($read)->assertOk()->assertJsonPath('status', 'completed');+ $this->getJson(str_replace('Confirmed+spam', 'Other+reason', $read))->assertConflict();+ $this->getJson(str_replace('user_id='.$user->id, 'user_id=99999', $read))->assertConflict();+ $this->getJson('/external/admin/v1/actions/unblock-user/'.$id.'?'.http_build_query(['user_id' => $user->id, 'reason' => 'Confirmed spam']))->assertNotFound();+ $this->postJson('/external/admin/v1/actions/block-user', [...$body, 'reason' => 'changed'])->assertConflict();+ $this->withHeader('Idempotency-Key', 'another-key-1')->postJson('/external/admin/v1/actions/block-user', $body)->assertConflict();+ Auth::forgetGuards();+ $this->withToken($actor->createToken('other', ['admin:users:block'], now()->addDay())->plainTextToken)->getJson($read)->assertNotFound();+ expect(AdminApiAction::count())->toBe(1);+});++it('refuses invalid payloads before receipt and never exposes impersonation', function () {+ [$actor, $token] = adminApiCredentials(['admin:users:block']);+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'bad-body-123')->postJson('/external/admin/v1/actions/block-user', ['action_id' => (string) Str::uuid(), 'user_id' => $actor->id, 'reason' => 'reason', 'extra' => 'no'])->assertUnprocessable();+ expect(AdminApiAction::count())->toBe(0);+ $this->postJson('/external/admin/v1/actions/impersonate', [])->assertNotFound();+});++it('keeps uncertain requests non replayable', function () {+ [$actor, $token] = adminApiCredentials(['admin:users:clear-cache']);+ $user = User::factory()->create();+ $id = (string) Str::uuid();+ $body = ['action_id' => $id, 'user_id' => $user->id];+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'cache-key-123')->postJson('/external/admin/v1/actions/clear-user-cache', $body)->assertOk();+ AdminApiAction::find($id)->update(['status' => 'uncertain']);+ $this->postJson('/external/admin/v1/actions/clear-user-cache', $body)->assertConflict()->assertJsonPath('status', 'uncertain');+});++it('admin token settings require cloud moderator and expiration', function () {+ $user = $this->actingAsUser();+ $body = ['name' => 'Bureau', 'abilities' => ['admin:users:block'], 'expires_at' => now()->addDay()->toIso8601String()];+ $this->postJson(route('settings.tokens.store'), $body)->assertForbidden();+ config(['opnform.moderator_emails' => [$user->email]]);+ $this->postJson(route('settings.tokens.store'), [...$body, 'expires_at' => null])->assertUnprocessable();+ $this->postJson(route('settings.tokens.store'), $body)->assertOk();+ expect($user->tokens()->latest('id')->first()->abilities)->toBe(['admin:users:block']);+ $this->getJson(route('settings.tokens.index'))->assertOk()->assertJsonStructure([['expires_at']]);+ config(['app.self_hosted' => true]);+ $this->postJson(route('settings.tokens.store'), $body)->assertForbidden();+ $this->getJson(route('settings.tokens.abilities'))->assertExactJson([]);+});++it('refunds through the shared service with a provider key and verifies the remote receipt', function ($refundStatus) {+ [$actor, $token] = adminApiCredentials(['admin:billing:refund']);+ $target = User::factory()->create(['stripe_id' => 'cus_test']);+ $refundRequests = [];+ $invoiceReadsForbidden = false;+ $fake = Mockery::mock(\Stripe\HttpClient\ClientInterface::class);+ $fake->shouldReceive('request')->andReturnUsing(function ($method, $url, $headers, $params) use (&$refundRequests, &$invoiceReadsForbidden, $refundStatus) {+ if ($invoiceReadsForbidden && str_contains($url, '/invoices')) {+ throw new RuntimeException('Current invoice unavailable');+ }+ expect(implode(' ', $headers))->toContain('Stripe-Version: 2025-08-27.basil');+ $invoice = ['object' => 'invoice', 'id' => 'in_test', 'customer' => 'cus_test', 'status' => 'paid', 'paid' => true, 'amount_paid' => 500, 'currency' => 'usd', 'created' => 1700000000];+ $data = match (parse_url($url, PHP_URL_PATH)) {+ '/v1/customers/cus_test' => ['object' => 'customer', 'id' => 'cus_test', 'name' => 'Test', 'email' => '[email protected]'],+ '/v1/subscriptions' => ['object' => 'list', 'data' => [], 'has_more' => false],+ '/v1/invoices' => ['object' => 'list', 'data' => [$invoice], 'has_more' => false],+ '/v1/invoice_payments' => ['object' => 'list', 'has_more' => false, 'data' => [[+ 'object' => 'invoice_payment', 'id' => 'inpay_test', 'invoice' => 'in_test', 'amount_paid' => 500, 'status' => 'paid',+ 'payment' => ['type' => 'payment_intent', 'payment_intent' => ['object' => 'payment_intent', 'id' => 'pi_test',+ 'latest_charge' => ['object' => 'charge', 'id' => 'ch_test', 'customer' => 'cus_test', 'paid' => true, 'amount' => 500,+ 'currency' => 'usd', 'amount_refunded' => count($refundRequests) ? 500 : 0]]],+ ]]],+ '/v1/refunds', '/v1/refunds/re_test' => ['object' => 'refund', 'id' => 're_test', 'status' => $refundStatus, 'charge' => 'ch_test', 'amount' => 500, 'currency' => 'usd'],+ default => throw new RuntimeException('Unexpected Stripe path'),+ };+ if ($method === 'post' && str_ends_with($url, '/refunds')) {+ $refundRequests[] = ['headers' => $headers, 'params' => $params];+ }+ return [json_encode($data), 200, []];+ });+ $originalClient = \Stripe\ApiRequestor::httpClient();+ \Stripe\ApiRequestor::setHttpClient($fake);+ try {+ $body = ['action_id' => (string) Str::uuid(), 'user_id' => $target->id, 'invoice_id' => 'in_test', 'refund_reason' => 'Customer request', 'expected_amount' => 500, 'expected_currency' => 'usd'];+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'test-refund-0001')->postJson('/external/admin/v1/actions/refund-payment', $body)->assertStatus($refundStatus === 'succeeded' ? 200 : 500);+ $this->postJson('/external/admin/v1/actions/refund-payment', $body)->assertStatus($refundStatus === 'succeeded' ? 200 : 409);+ $this->postJson('/external/admin/v1/actions/refund-payment', $body)->assertStatus($refundStatus === 'succeeded' ? 200 : 409);+ expect(AdminApiAction::find($body['action_id'])->status)->toBe($refundStatus === 'succeeded' ? 'completed' : 'uncertain');+ expect($refundRequests)->toHaveCount(1);+ expect(implode(' ', $refundRequests[0]['headers']))->toContain('admin-api:'.$body['action_id']);+ expect($refundRequests[0]['params']['charge'])->toBe('ch_test');+ $invoiceReadsForbidden = true;+ $this->getJson('/external/admin/v1/actions/refund-payment/'.$body['action_id'].'?'.http_build_query(\Illuminate\Support\Arr::except($body, 'action_id')))+ ->assertOk()->assertJsonPath('status', $refundStatus === 'succeeded' ? 'completed' : 'uncertain')->assertJsonPath('result.refund_id', 're_test');+ } finally {+ \Stripe\ApiRequestor::setHttpClient($originalClient);+ }+})->with(['succeeded', 'pending']);++it('refuses refunding a payment whose charge also covers another invoice', function () {+ $target = User::factory()->create(['stripe_id' => 'cus_test']);+ $fake = Mockery::mock(\Stripe\HttpClient\ClientInterface::class);+ $fake->shouldReceive('request')->once()->andReturn([json_encode(['object' => 'list', 'has_more' => false, 'data' => [[+ 'object' => 'invoice_payment', 'id' => 'inpay_test', 'amount_paid' => 500,+ 'payment' => ['type' => 'charge', 'charge' => ['object' => 'charge', 'id' => 'ch_test', 'customer' => 'cus_test', 'paid' => true, 'amount' => 1000, 'amount_refunded' => 0, 'currency' => 'usd']],+ ]]]), 200, []]);+ $previous = \Stripe\ApiRequestor::httpClient();+ \Stripe\ApiRequestor::setHttpClient($fake);+ try {+ $invoice = \Stripe\Invoice::constructFrom(['id' => 'in_test', 'customer' => 'cus_test', 'amount_paid' => 500]);+ app(\App\Service\Admin\AdminStripe::class)->refundablePayment($target, $invoice);+ $this->fail('Shared payment should be rejected.');+ } catch (\Symfony\Component\HttpKernel\Exception\HttpException $exception) {+ expect($exception->getStatusCode())->toBe(422);+ } finally {+ \Stripe\ApiRequestor::setHttpClient($previous);+ }+});+++it('validates ownership before restoring and restores once', function () {+ [, $token] = adminApiCredentials(['admin:forms:restore']);+ $owner = User::factory()->create();+ $other = User::factory()->create();+ $form = $this->createForm($owner, $this->createUserWorkspace($owner));+ $form->delete();+ $body = ['action_id' => (string) Str::uuid(), 'user_id' => $other->id, 'slug' => $form->slug];+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'restore-wrong-1')->postJson('/external/admin/v1/actions/restore-form', $body)->assertNotFound();+ expect($form->fresh()->deleted_at)->not->toBeNull();+ $body['action_id'] = (string) Str::uuid();+ $body['user_id'] = $owner->id;+ $this->withHeader('Idempotency-Key', 'restore-right-1')->postJson('/external/admin/v1/actions/restore-form', $body)->assertOk();+ expect($form->fresh()->deleted_at)->toBeNull();+});++it('queues only the template job and rechecks token revocation before generation', function () {+ \Illuminate\Support\Facades\Bus::fake([\App\Jobs\Template\GenerateTemplateJob::class]);+ [, $token] = adminApiCredentials(['admin:templates:create']);+ config(['queue.default' => 'database']);+ $id = (string) Str::uuid();+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'template-key-1')->postJson('/external/admin/v1/actions/create-template', ['action_id' => $id, 'template_prompt' => 'Contact template'])->assertAccepted()->assertJsonPath('status', 'running');+ $token->accessToken->delete();+ \Illuminate\Support\Facades\Bus::assertDispatched(\App\Jobs\Template\GenerateTemplateJob::class, function ($job) {+ $job->handle();+ return true;+ });+ expect(AdminApiAction::find($id)->status)->toBe('uncertain');+});++it('restores Stripe settings even on errors and preserves injected clients', function () {+ $original = \Stripe\ApiRequestor::httpClient();+ $client = new \Stripe\HttpClient\CurlClient();+ $client->setTimeout(45);+ $client->setConnectTimeout(10);+ \Stripe\ApiRequestor::setHttpClient($client);+ \Stripe\Stripe::setMaxNetworkRetries(2);+ try {+ try {+ \App\Service\Admin\AdminStripe::withTimeout(function () use ($client) {+ expect($client->getTimeout())->toBe(4);+ expect(\Stripe\Stripe::getMaxNetworkRetries())->toBe(0);+ throw new RuntimeException('test');+ });+ } catch (RuntimeException) {+ }+ expect($client->getTimeout())->toBe(45)->and($client->getConnectTimeout())->toBe(10)->and(\Stripe\Stripe::getMaxNetworkRetries())->toBe(2);+ $fake = Mockery::mock(\Stripe\HttpClient\ClientInterface::class);+ \Stripe\ApiRequestor::setHttpClient($fake);+ \App\Service\Admin\AdminStripe::withTimeout(fn () => expect(\Stripe\ApiRequestor::httpClient())->toBe($fake));+ } finally {+ \Stripe\ApiRequestor::setHttpClient($original);+ \Stripe\Stripe::setMaxNetworkRetries(0);+ }+});++it('allows public token creation with omitted or null abilities', function () {+ $this->actingAsUser();+ $this->postJson(route('settings.tokens.store'), ['name' => 'empty'])->assertOk();+ $this->postJson(route('settings.tokens.store'), ['name' => 'empty', 'abilities' => null])->assertOk();+});++it('rejects revoked expired blocked and non PAT authentication', function () {+ [$actor, $token] = adminApiCredentials(['admin:users:read']);+ $target = User::factory()->create();+ $url = '/external/admin/v1/users/'.$target->id;+ $actor->update(['blocked_at' => now()]);+ $this->withToken($token->plainTextToken)->getJson($url)->assertForbidden();+ $actor->update(['blocked_at' => null]);+ $token->accessToken->update(['expires_at' => now()->subMinute()]);+ Auth::forgetGuards();+ $this->getJson($url)->assertUnauthorized();+ $token->accessToken->delete();+ Auth::forgetGuards();+ $this->getJson($url)->assertUnauthorized();+ \Laravel\Sanctum\Sanctum::actingAs($actor, ['admin:users:read']);+ $this->getJson($url)->assertUnauthorized();+});++it('routes explicit actions to their existing admin services', function ($operation, $method, $scope, $parameters, $class) {+ [, $token] = adminApiCredentials([$scope]);+ $user = User::factory()->create();+ $service = Mockery::mock($class);+ $service->shouldReceive($method)->once()->andReturn(response()->json(['type' => 'success']));+ app()->instance($class, $service);+ $body = ['action_id' => (string) Str::uuid(), ...($operation === 'create-template' ? [] : ['user_id' => $user->id]), ...$parameters];+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'dispatch-'.$operation)->postJson('/external/admin/v1/actions/'.$operation, $body)->assertOk()->assertJsonPath('status', 'completed');+})->with([+ ['block-user', 'blockUser', 'admin:users:block', ['reason' => 'Spam'], \App\Service\Admin\AdminOperations::class],+ ['unblock-user', 'unblockUser', 'admin:users:unblock', ['reason' => 'Reviewed'], \App\Service\Admin\AdminOperations::class],+ ['send-password-reset-email', 'sendPasswordResetEmail', 'admin:users:password-reset', [], \App\Service\Admin\AdminOperations::class],+ ['disable-two-factor-authentication', 'disableTwoFactorAuthentication', 'admin:users:disable-2fa', ['reason' => 'Confirmed'], \App\Service\Admin\AdminOperations::class],+ ['clear-user-cache', 'clearUserCache', 'admin:users:clear-cache', [], \App\Service\Admin\AdminOperations::class],+ ['apply-discount', 'applyDiscount', 'admin:billing:discount', [], \App\Service\Admin\AdminOperations::class],+ ['extend-trial', 'extendTrial', 'admin:billing:extend-trial', ['trial_ends_at' => '2030-01-01T00:00:00Z'], \App\Service\Admin\AdminOperations::class],+ ['cancel-subscription', 'cancelSubscription', 'admin:billing:cancel', ['subscription_id' => 1, 'cancellation_reason' => 'Requested'], \App\Service\Admin\AdminOperations::class],+ ['refund-payment', 'refundPayment', 'admin:billing:refund', ['invoice_id' => 'in_test', 'refund_reason' => 'Requested', 'expected_amount' => 100, 'expected_currency' => 'usd'], \App\Service\Admin\AdminOperations::class],+ ['update-customer', 'updateCustomer', 'admin:billing:update', ['billing_email' => '[email protected]', 'billing_name' => 'Name'], \App\Service\Admin\AdminBilling::class],+ ['restore-form', 'restoreDeletedForm', 'admin:forms:restore', ['slug' => 'form'], \App\Service\Admin\AdminForms::class],+ ['create-template', 'createTemplate', 'admin:templates:create', ['template_prompt' => 'Contact form'], \App\Service\Admin\AdminOperations::class],+]);++it('routes explicit reads to existing services with their scope', function ($path, $method, $scope, $class) {+ [, $token] = adminApiCredentials([$scope]);+ $user = User::factory()->create();+ $service = Mockery::mock($class);+ $service->shouldReceive($method)->once()->andReturn(response()->json(['type' => 'success']));+ app()->instance($class, $service);+ $this->withToken($token->plainTextToken)->getJson('/external/admin/v1/users/'.$user->id.$path)->assertOk();+})->with([+ ['', 'fetchUser', 'admin:users:read', \App\Service\Admin\AdminOperations::class],+ ['/billing/customer', 'getCustomer', 'admin:billing:read', \App\Service\Admin\AdminBilling::class],+ ['/billing/subscriptions', 'getSubscriptions', 'admin:billing:read', \App\Service\Admin\AdminBilling::class],+ ['/billing/payments', 'getPayments', 'admin:billing:read', \App\Service\Admin\AdminBilling::class],+ ['/deleted-forms', 'getDeletedForms', 'admin:forms:read', \App\Service\Admin\AdminForms::class],+]);++it('does not downgrade a completed template when dispatch acknowledgement fails', function () {+ [, $token] = adminApiCredentials(['admin:templates:create']);+ $id = (string) Str::uuid();+ $service = Mockery::mock(\App\Service\Admin\AdminOperations::class);+ $service->shouldReceive('createTemplate')->once()->andReturnUsing(function () use ($id) {+ AdminApiAction::whereKey($id)->update(['status' => 'completed', 'result' => ['template_slug' => 'generated-template']]);+ throw new RuntimeException('Queue acknowledgement failed after processing');+ });+ app()->instance(\App\Service\Admin\AdminOperations::class, $service);+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'concurrent-template-2')+ ->postJson('/external/admin/v1/actions/create-template', ['action_id' => $id, 'template_prompt' => 'Contact form'])->assertStatus(500);+ expect(AdminApiAction::find($id)->status)->toBe('completed');+ expect(AdminApiAction::find($id)->result)->toBe(['template_slug' => 'generated-template']);+});++it('rejects query parameters that can shadow the approved JSON target', function () {+ [, $token] = adminApiCredentials(['admin:users:block']);+ $approved = User::factory()->create();+ $other = User::factory()->create();+ $this->withToken($token->plainTextToken)->withHeader('Idempotency-Key', 'shadow-target-1')+ ->postJson('/external/admin/v1/actions/block-user?user_id='.$other->id, ['action_id' => (string) Str::uuid(), 'user_id' => $approved->id, 'reason' => 'Approved target only'])+ ->assertUnprocessable();+ expect($approved->fresh()->is_blocked)->toBeFalse()->and($other->fresh()->is_blocked)->toBeFalse();+ expect(AdminApiAction::count())->toBe(0);+});diff --git a/client/api/tokens.js b/client/api/tokens.jsindex 16e011858..bf135bc28 100644--- a/client/api/tokens.js+++ b/client/api/tokens.js@@ -4,6 +4,7 @@ const BASE_PATH = '/settings/tokens'export const tokensApi = {// Token operations+ abilities: () => apiService.get(`${BASE_PATH}/abilities`),list: (options) => apiService.get(BASE_PATH, options),create: (data) => apiService.post(BASE_PATH, data),delete: (tokenId) => apiService.delete(`${BASE_PATH}/${tokenId}`)diff --git a/client/components/users/settings/AccessTokenModal.vue b/client/components/users/settings/AccessTokenModal.vueindex 27cb728c6..79961ecc0 100644--- a/client/components/users/settings/AccessTokenModal.vue+++ b/client/components/users/settings/AccessTokenModal.vue@@ -1,7 +1,6 @@<template><UModalv-model:open="isOpen"- @close="closeModal"><template #header><div class="flex items-center w-full gap-4 px-2">@@ -48,6 +47,9 @@label="Name"/>+ <UFormField v-if="hasAdminAbilities" label="Expires in days" :error="tokenForm.errors.get('expires_at')">+ <UInput v-model="expiryDays" type="number" min="1" max="90" />+ </UFormField><FlatSelectInput:form="tokenForm"name="abilities"@@ -83,6 +85,8 @@</template><script setup>+import { useQuery } from '@tanstack/vue-query'+import { tokensApi } from '~/api/tokens'import CopyContent from "~/components/open/forms/components/CopyContent.vue"const props = defineProps({@@ -96,38 +100,63 @@ const emit = defineEmits(['close'])const { abilities, create } = useTokens()const alert = useAlert()+const crisp = useCrisp()-const abilitiesOptions = computed(() => abilities.map(ability => ({+const { data: adminAbilities } = useQuery({ queryKey: ['tokens', 'abilities'], queryFn: tokensApi.abilities })+const abilitiesOptions = computed(() => [...abilities, ...(adminAbilities.value ?? []).map(name => ({ name, title: name.replace('admin:', 'Admin – ').replaceAll(':', ' – ').replaceAll('-', ' ') }))].map(ability => ({name: ability.title,value: ability.name})))const token = ref('')+const expiryDays = ref(30)const tokenForm = useForm({name: "",- abilities: abilitiesOptions.value.map(ability => ability.value),+ abilities: abilities.map(ability => ability.name),+ expires_at: "",})+const hasAdminAbilities = computed(() => tokenForm.abilities.some(ability => ability.startsWith('admin:')))// Create token mutationconst createTokenMutation = create()+let formGeneration = 0++const resetForm = () => {+ formGeneration+++ tokenForm.reset()+ expiryDays.value = 30+ token.value = ''+}// Modal stateconst isOpen = computed({get: () => props.modelValue,- set: (value) => emit('close', value)+ set: (value) => {+ if (!value) resetForm()+ emit('close', value)+ }+})+watch(() => props.modelValue, (open) => {+ if (!open) resetForm()})// Methodsconst closeModal = () => {- tokenForm.reset()- token.value = ''isOpen.value = false}function createToken() {+ const days = Number(expiryDays.value)+ if (hasAdminAbilities.value && (!Number.isInteger(days) || days < 1 || days > 90)) {+ tokenForm.errors.set('expires_at', 'Choose an expiration between 1 and 90 days.')+ return+ }+ tokenForm.expires_at = hasAdminAbilities.value ? new Date(Date.now() + days * 86400000).toISOString() : null+ const generation = formGenerationtokenForm.mutate(createTokenMutation).then((response) => {- // Assuming the response contains the token- token.value = response.token || response.data?.token || response+ if (generation === formGeneration && props.modelValue) {+ token.value = response.token || response.data?.token || response+ }}).catch(() => {alert.error("An error occurred while creating the token")})diff --git a/client/components/users/settings/AccessTokens.vue b/client/components/users/settings/AccessTokens.vueindex 5f58f45b7..d2250dc79 100644--- a/client/components/users/settings/AccessTokens.vue+++ b/client/components/users/settings/AccessTokens.vue@@ -58,6 +58,7 @@><template #name-cell="{ row: { original: item } }"><span class="font-semibold">{{ item.name }}</span>+ <p v-if="item.expires_at" class="text-xs text-neutral-500">Expires {{ new Date(item.expires_at).toLocaleString() }}</p></template><template #abilities-cell="{ row: { original: item } }">diff --git a/client/composables/query/useTokens.js b/client/composables/query/useTokens.jsindex 44a184b93..79b6a90a4 100644--- a/client/composables/query/useTokens.js+++ b/client/composables/query/useTokens.js@@ -74,17 +74,10 @@ export function useTokens() {const create = (options = {}) => {return useMutation({mutationFn: (data) => tokensApi.create(data),- onSuccess: (newToken) => {- // Built-in cache management- queryClient.setQueryData(['tokens', newToken.id], newToken)-- // Add to list query data- const currentList = queryClient.getQueryData(['tokens', 'list'])- if (currentList) {- queryClient.setQueryData(['tokens', 'list'], [newToken, ...currentList])- }- useAlert().success('Token created successfully')- },+ // Creation returns a one-time secret, not a token metadata resource.+ onSuccess: () => queryClient.invalidateQueries({ queryKey: ['tokens', 'list'] }).then(() => {+ useAlert().success('Token created successfully')+ }),...options})}@@ -147,4 +140,4 @@ export function useTokens() {abilities,getAbility}-}\ No newline at end of file+}diff --git a/client/test/nuxt/access-token-list.spec.ts b/client/test/nuxt/access-token-list.spec.tsnew file mode 100644index 000000000..a03961c51--- /dev/null+++ b/client/test/nuxt/access-token-list.spec.ts@@ -0,0 +1,40 @@+import { describe, it, expect, vi } from 'vitest'+import { mount, flushPromises } from '@vue/test-utils'+import { defineComponent, h } from 'vue'+import { QueryClient, VueQueryPlugin } from '@tanstack/vue-query'+import { mockNuxtImport } from '@nuxt/test-utils/runtime'+import { useTokens } from '~/composables/query/useTokens'++const mocks = vi.hoisted(() => ({ list: vi.fn(), create: vi.fn(), remove: vi.fn() }))+vi.mock('~/api/tokens', () => ({ tokensApi: { list: mocks.list, create: mocks.create, delete: mocks.remove } }))+mockNuxtImport('useAlert', () => () => ({ success: vi.fn() }))++describe('token list after creation', () => {+ it('reloads revocable metadata without putting the one-time secret into query data', async () => {+ const metadata = { id: 42, name: 'Bureau', abilities: ['admin:users:block'], expires_at: '2026-10-01T12:00:00Z' }+ mocks.list.mockResolvedValueOnce([]).mockResolvedValueOnce([metadata])+ mocks.create.mockResolvedValue({ token: 'fake-one-time-secret', message: 'Created' })+ mocks.remove.mockResolvedValue({})+ const client = new QueryClient({ defaultOptions: { queries: { retry: false }, mutations: { retry: false } } })+ let createToken: ReturnType<ReturnType<typeof useTokens>['create']>+ let removeToken: ReturnType<ReturnType<typeof useTokens>['remove']>+ const wrapper = mount(defineComponent({ setup() {+ const tokens = useTokens()+ const list = tokens.list()+ createToken = tokens.create()+ removeToken = tokens.remove()+ return () => h('div', JSON.stringify(list.data.value))+ } }), { global: { plugins: [[VueQueryPlugin, { queryClient: client }]] } })+ await vi.waitFor(() => expect(client.getQueryData(['tokens', 'list'])).toEqual([]))+ const result = await createToken!.mutateAsync({ name: 'Bureau', abilities: ['admin:users:block'] })+ expect(result.token).toBe('fake-one-time-secret')+ await flushPromises()+ expect(client.getQueryData(['tokens', 'list'])).toEqual([metadata])+ expect(JSON.stringify(client.getQueriesData({ queryKey: ['tokens'] }))).not.toContain('fake-one-time-secret')+ await removeToken!.mutateAsync(metadata.id)+ expect(mocks.remove).toHaveBeenCalledWith(42)+ expect(client.getQueryData(['tokens', 'list'])).toEqual([])+ wrapper.unmount()+ client.clear()+ })+})diff --git a/client/test/nuxt/access-token-modal.spec.ts b/client/test/nuxt/access-token-modal.spec.tsnew file mode 100644index 000000000..8de84d797--- /dev/null+++ b/client/test/nuxt/access-token-modal.spec.ts@@ -0,0 +1,109 @@+import { describe, it, expect, vi, afterEach } from 'vitest'+import { mount, flushPromises } from '@vue/test-utils'+import { mockNuxtImport } from '@nuxt/test-utils/runtime'+import AccessTokenModal from '~/components/users/settings/AccessTokenModal.vue'++vi.mock('@tanstack/vue-query', () => ({ useQuery: () => ({ data: { value: ['admin:users:block'] } }) }))+mockNuxtImport('useTokens', () => () => ({ abilities: [{ name: 'forms-read', title: 'Read forms' }], create: () => ({}) }))+mockNuxtImport('useAlert', () => () => ({ error: vi.fn() }))+mockNuxtImport('useCrisp', () => () => ({ openHelpdesk: vi.fn() }))+mockNuxtImport('useForm', () => (initial: Record<string, unknown>) => {+ const form = reactive({+ ...initial,+ errors: { get: vi.fn(), set: vi.fn() },+ reset() { Object.assign(form, initial) },+ mutate: vi.fn().mockResolvedValue({ token: 'fake-test-token' }),+ })+ return form+})++function mountModal() {+ return mount(AccessTokenModal, { props: { modelValue: true }, global: { stubs: {+ UModal: { name: 'UModal', emits: ['update:open'], template: '<div><slot name="body"/><slot name="footer"/></div>' },+ VForm: { template: '<div><slot/></div>' },+ FlatSelectInput: { name: 'FlatSelectInput', props: ['form', 'options'], template: '<div/>' },+ TextInput: true,+ UAlert: true,+ CopyContent: true,+ UFormField: { template: '<div><slot/></div>', props: ['label', 'error'] },+ UInput: { name: 'UInput', props: ['modelValue'], emits: ['update:modelValue'], template: '<input :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)"/>' },+ UButton: { emits: ['click'], template: '<button @click="$emit(\'click\')"><slot/></button>' },+ } } })+}++describe('admin token opt-in', () => {+ afterEach(() => vi.useRealTimers())++ it('offers admin scopes without default selection and resets selection', async () => {+ const wrapper = mountModal()+ const select = wrapper.findComponent({ name: 'FlatSelectInput' })+ const form = select.props('form')+ expect(select.props('options').map((option: {value: string}) => option.value)).toContain('admin:users:block')+ expect(form.abilities).toEqual(['forms-read'])+ expect(wrapper.find('input').exists()).toBe(false)+ form.abilities = ['admin:users:block']+ await wrapper.vm.$nextTick()+ await wrapper.get('input').setValue('7')+ await wrapper.findAll('button')[0].trigger('click')+ expect(form.abilities).toEqual(['forms-read'])+ form.abilities = ['admin:users:block']+ await wrapper.vm.$nextTick()+ expect((wrapper.get('input').element as HTMLInputElement).value).toBe('30')+ })++ it('submits a timezone-qualified expiry only when admin scopes are selected', async () => {+ vi.useFakeTimers()+ vi.setSystemTime(new Date('2026-09-18T10:00:00Z'))+ const wrapper = mountModal()+ const form = wrapper.findComponent({ name: 'FlatSelectInput' }).props('form')+ form.abilities = ['admin:users:block']+ await wrapper.vm.$nextTick()+ await wrapper.get('input').setValue('7')+ await wrapper.findAll('button')[1].trigger('click')+ expect(form.expires_at).toBe('2026-09-25T10:00:00.000Z')+ expect(form.mutate).toHaveBeenCalledOnce()+ await flushPromises()+ wrapper.unmount()++ const publicWrapper = mountModal()+ const publicForm = publicWrapper.findComponent({ name: 'FlatSelectInput' }).props('form')+ await publicWrapper.findAll('button')[1].trigger('click')+ expect(publicForm.expires_at).toBeNull()+ expect(publicForm.mutate).toHaveBeenCalledOnce()+ })++ it('rejects an invalid admin expiry before submitting', async () => {+ const wrapper = mountModal()+ const form = wrapper.findComponent({ name: 'FlatSelectInput' }).props('form')+ form.abilities = ['admin:users:block']+ await wrapper.vm.$nextTick()+ await wrapper.get('input').setValue('91')+ await wrapper.findAll('button')[1].trigger('click')+ expect(form.errors.set).toHaveBeenCalledWith('expires_at', expect.any(String))+ expect(form.mutate).not.toHaveBeenCalled()+ })++ it('clears admin selection when the dialog emits an Escape or overlay close', async () => {+ const wrapper = mountModal()+ const form = wrapper.findComponent({ name: 'FlatSelectInput' }).props('form')+ form.abilities = ['admin:users:block']+ wrapper.findComponent({ name: 'UModal' }).vm.$emit('update:open', false)+ await wrapper.vm.$nextTick()+ expect(wrapper.emitted('close')?.at(-1)).toEqual([false])+ expect(form.abilities).toEqual(['forms-read'])+ })++ it('does not show a previous creation secret after closing and reopening the form', async () => {+ const wrapper = mountModal()+ const form = wrapper.findComponent({ name: 'FlatSelectInput' }).props('form')+ let finish: (value: { token: string }) => void = () => {}+ form.mutate.mockReturnValue(new Promise(resolve => { finish = resolve }))+ await wrapper.findAll('button')[1].trigger('click')+ await wrapper.setProps({ modelValue: false })+ await wrapper.setProps({ modelValue: true })+ finish({ token: 'old-fake-secret' })+ await flushPromises()+ expect(wrapper.findComponent({ name: 'FlatSelectInput' }).exists()).toBe(true)+ expect(wrapper.find('copy-content-stub').exists()).toBe(false)+ })+})