diff --git a/api/app/Http/Controllers/Auth/RegisterController.php b/api/app/Http/Controllers/Auth/RegisterController.php index 81675f614..447689a1c 100644 --- a/api/app/Http/Controllers/Auth/RegisterController.php +++ b/api/app/Http/Controllers/Auth/RegisterController.php @@ -12,6 +12,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; +use App\Rules\ValidHCaptcha; class RegisterController extends Controller { @@ -27,6 +28,9 @@ class RegisterController extends Controller public function __construct() { $this->middleware('guest'); + + $this->middleware('throttle:5,1')->only('register'); // 5 attempts per minute + $this->middleware('throttle:30,60')->only('register'); // 30 attempts per hour } /** @@ -56,7 +60,7 @@ protected function registered(Request $request, User $user) */ protected function validator(array $data) { - return Validator::make($data, [ + $rules = [ 'name' => 'required|max:255', 'email' => 'required|email:filter|max:255|unique:users|indisposable', 'password' => 'required|min:6|confirmed', @@ -64,8 +68,14 @@ protected function validator(array $data) 'agree_terms' => ['required', Rule::in([true])], 'appsumo_license' => ['nullable'], 'invite_token' => ['nullable', 'string'], - 'utm_data' => ['nullable', 'array'] - ], [ + 'utm_data' => ['nullable', 'array'], + ]; + + if (config('services.h_captcha.secret_key')) { + $rules['h-captcha-response'] = [new ValidHCaptcha()]; + } + + return Validator::make($data, $rules, [ 'agree_terms' => 'Please agree with the terms and conditions.', ]); } @@ -84,6 +94,7 @@ protected function create(array $data) 'password' => bcrypt($data['password']), 'hear_about_us' => $data['hear_about_us'], 'utm_data' => array_key_exists('utm_data', $data) ? $data['utm_data'] : null, + 'meta' => ['registration_ip' => request()->ip()], ]); // Add relation with user diff --git a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php b/api/app/Http/Requests/Integration/FormIntegrationsRequest.php index 128a4c0e0..7856548e4 100644 --- a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php +++ b/api/app/Http/Requests/Integration/FormIntegrationsRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests\Integration; +use App\Models\Forms\Form; use App\Models\Integration\FormIntegration; use App\Rules\IntegrationLogicRule; use Illuminate\Foundation\Http\FormRequest; @@ -14,9 +15,11 @@ class FormIntegrationsRequest extends FormRequest public array $integrationRules = []; private ?string $integrationClassName = null; + private ?Form $form = null; public function __construct(Request $request) { + $this->form = Form::findOrFail(request()->route('id')); if ($request->integration_id) { // Load integration class, and get rules $integration = FormIntegration::getIntegration($request->integration_id); @@ -77,7 +80,7 @@ protected function isOAuthRequired(): bool private function loadIntegrationRules() { - foreach ($this->integrationClassName::getValidationRules() as $key => $value) { + foreach ($this->integrationClassName::getValidationRules($this->form) as $key => $value) { $this->integrationRules['settings.' . $key] = $value; } } diff --git a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php index 47fc78cbd..cf90f267f 100644 --- a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php +++ b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php @@ -94,7 +94,7 @@ public function handle(): void Http::throw()->post($this->getWebhookUrl(), $this->getWebhookData()); } - abstract public static function getValidationRules(): array; + abstract public static function getValidationRules(?Form $form): array; public static function isOAuthRequired(): bool { diff --git a/api/app/Integrations/Handlers/DiscordIntegration.php b/api/app/Integrations/Handlers/DiscordIntegration.php index 1a3fbaf1a..e9977fd16 100644 --- a/api/app/Integrations/Handlers/DiscordIntegration.php +++ b/api/app/Integrations/Handlers/DiscordIntegration.php @@ -2,6 +2,7 @@ namespace App\Integrations\Handlers; +use App\Models\Forms\Form; use App\Open\MentionParser; use App\Service\Forms\FormSubmissionFormatter; use Illuminate\Support\Arr; @@ -9,7 +10,7 @@ class DiscordIntegration extends AbstractIntegrationHandler { - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { return [ 'discord_webhook_url' => 'required|url|starts_with:https://discord.com/api/webhooks', diff --git a/api/app/Integrations/Handlers/EmailIntegration.php b/api/app/Integrations/Handlers/EmailIntegration.php index b20a31e74..834f63dba 100644 --- a/api/app/Integrations/Handlers/EmailIntegration.php +++ b/api/app/Integrations/Handlers/EmailIntegration.php @@ -2,20 +2,23 @@ namespace App\Integrations\Handlers; +use App\Models\Forms\Form; +use App\Models\Integration\FormIntegration; use App\Notifications\Forms\FormEmailNotification; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Notification; use App\Open\MentionParser; use App\Service\Forms\FormSubmissionFormatter; +use Illuminate\Validation\ValidationException; class EmailIntegration extends AbstractEmailIntegrationHandler { public const RISKY_USERS_LIMIT = 120; - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { - return [ - 'send_to' => 'required', + $rules = [ + 'send_to' => ['required'], 'sender_name' => 'required', 'sender_email' => 'email|nullable', 'subject' => 'required', @@ -24,6 +27,31 @@ public static function getValidationRules(): array 'include_hidden_fields_submission_data' => ['nullable', 'boolean'], 'reply_to' => 'nullable', ]; + + if ($form->is_pro || config('app.self_hosted')) { + return $rules; + } + + // Free plan users can only send to a single email address (avoid spam) + $rules['send_to'][] = function ($attribute, $value, $fail) use ($form) { + if (count(explode("\n", trim($value))) > 1 || count(explode(',', $value)) > 1) { + $fail('You can only send to a single email address on the free plan. Please upgrade to the Pro plan to create a new integration.'); + } + }; + + // Free plan users can only have a single email integration per form (avoid spam) + if (!request()->route('integrationid')) { + $existingEmailIntegrations = FormIntegration::where('form_id', $form->id) + ->where('integration_id', 'email') + ->count(); + if ($existingEmailIntegrations > 0) { + throw ValidationException::withMessages([ + 'settings.send_to' => ['Free users are limited to 1 email integration per form.'] + ]); + } + } + + return $rules; } protected function shouldRun(): bool diff --git a/api/app/Integrations/Handlers/GoogleSheetsIntegration.php b/api/app/Integrations/Handlers/GoogleSheetsIntegration.php index d2fd3ff7e..c903a79f7 100644 --- a/api/app/Integrations/Handlers/GoogleSheetsIntegration.php +++ b/api/app/Integrations/Handlers/GoogleSheetsIntegration.php @@ -4,6 +4,7 @@ use App\Events\Forms\FormSubmitted; use App\Integrations\Google\Google; +use App\Models\Forms\Form; use App\Models\Integration\FormIntegration; use Exception; use Illuminate\Support\Facades\Log; @@ -22,11 +23,9 @@ public function __construct( $this->client = new Google($formIntegration); } - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { - return [ - - ]; + return []; } public static function isOAuthRequired(): bool diff --git a/api/app/Integrations/Handlers/SlackIntegration.php b/api/app/Integrations/Handlers/SlackIntegration.php index c34b664fa..41978f08b 100644 --- a/api/app/Integrations/Handlers/SlackIntegration.php +++ b/api/app/Integrations/Handlers/SlackIntegration.php @@ -2,6 +2,7 @@ namespace App\Integrations\Handlers; +use App\Models\Forms\Form; use App\Open\MentionParser; use App\Service\Forms\FormSubmissionFormatter; use Illuminate\Support\Arr; @@ -9,7 +10,7 @@ class SlackIntegration extends AbstractIntegrationHandler { - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { return [ 'slack_webhook_url' => 'required|url|starts_with:https://hooks.slack.com/', diff --git a/api/app/Integrations/Handlers/WebhookIntegration.php b/api/app/Integrations/Handlers/WebhookIntegration.php index f5d98ec50..2d745743a 100644 --- a/api/app/Integrations/Handlers/WebhookIntegration.php +++ b/api/app/Integrations/Handlers/WebhookIntegration.php @@ -2,9 +2,11 @@ namespace App\Integrations\Handlers; +use App\Models\Forms\Form; + class WebhookIntegration extends AbstractIntegrationHandler { - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { return [ 'webhook_url' => 'required|url' diff --git a/api/app/Integrations/Handlers/ZapierIntegration.php b/api/app/Integrations/Handlers/ZapierIntegration.php index 4a71ad40d..c3c218840 100644 --- a/api/app/Integrations/Handlers/ZapierIntegration.php +++ b/api/app/Integrations/Handlers/ZapierIntegration.php @@ -3,6 +3,7 @@ namespace App\Integrations\Handlers; use App\Events\Forms\FormSubmitted; +use App\Models\Forms\Form; use App\Models\Integration\FormIntegration; use Exception; @@ -16,7 +17,7 @@ public function __construct( parent::__construct($event, $formIntegration, $integration); } - public static function getValidationRules(): array + public static function getValidationRules(?Form $form): array { return []; } diff --git a/api/app/Models/User.php b/api/app/Models/User.php index 3c5624cdd..3180c1c10 100644 --- a/api/app/Models/User.php +++ b/api/app/Models/User.php @@ -33,6 +33,7 @@ class User extends Authenticatable implements JWTSubject 'password', 'hear_about_us', 'utm_data', + 'meta' ]; /** @@ -44,6 +45,7 @@ class User extends Authenticatable implements JWTSubject 'password', 'remember_token', 'hear_about_us', + 'meta' ]; /** @@ -56,6 +58,7 @@ protected function casts() return [ 'email_verified_at' => 'datetime', 'utm_data' => 'array', + 'meta' => 'array', ]; } diff --git a/api/database/migrations/2024_12_10_094605_add_meta_to_users_table.php b/api/database/migrations/2024_12_10_094605_add_meta_to_users_table.php new file mode 100644 index 000000000..f92a24098 --- /dev/null +++ b/api/database/migrations/2024_12_10_094605_add_meta_to_users_table.php @@ -0,0 +1,35 @@ +json('meta')->default(new Expression('(JSON_OBJECT())')); + } else { + $table->json('meta')->default('{}'); + } + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('meta'); + }); + } +}; diff --git a/api/phpunit.xml b/api/phpunit.xml index 52e0c90b0..b16ee9a21 100644 --- a/api/phpunit.xml +++ b/api/phpunit.xml @@ -27,6 +27,8 @@ + + diff --git a/api/resources/data/forms/integrations.json b/api/resources/data/forms/integrations.json index a61ff56db..07bcf4329 100644 --- a/api/resources/data/forms/integrations.json +++ b/api/resources/data/forms/integrations.json @@ -4,6 +4,7 @@ "icon": "heroicons:envelope-20-solid", "section_name": "Notifications", "file_name": "EmailIntegration", + "actions_file_name": "EmailIntegrationActions", "is_pro": false, "crisp_help_page_slug": "can-i-receive-notifications-on-form-submissions-134svqv" }, @@ -12,6 +13,7 @@ "icon": "mdi:slack", "section_name": "Notifications", "file_name": "SlackIntegration", + "actions_file_name": "SlackIntegrationActions", "is_pro": true }, "discord": { @@ -19,6 +21,7 @@ "icon": "ic:baseline-discord", "section_name": "Notifications", "file_name": "DiscordIntegration", + "actions_file_name": "DiscordIntegrationActions", "is_pro": true }, "webhook": { @@ -26,6 +29,7 @@ "icon": "material-symbols:webhook", "section_name": "Automation", "file_name": "WebhookIntegration", + "actions_file_name": "WebhookIntegrationActions", "is_pro": false }, "zapier": { diff --git a/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php new file mode 100644 index 000000000..241c56398 --- /dev/null +++ b/api/tests/Feature/Integrations/Email/EmailIntegrationTest.php @@ -0,0 +1,175 @@ +actingAsUser(); + $workspace = $this->createUserWorkspace($user); + $form = $this->createForm($user, $workspace); + + // First email integration should succeed + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'test@example.com', + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + expect(FormIntegration::where('form_id', $form->id)->count())->toBe(1); + + // Second email integration should fail + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'another@example.com', + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertStatus(422) + ->assertJson([ + 'errors' => [ + 'settings.send_to' => ['Free users are limited to 1 email integration per form.'] + ] + ]); +}); + +test('pro user can create multiple email integrations', function () { + $user = $this->actingAsProUser(); + $workspace = $this->createUserWorkspace($user); + $form = $this->createForm($user, $workspace); + + // First email integration + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'test@example.com', + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + + // Second email integration should also succeed for pro users + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'another@example.com', + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + expect(FormIntegration::where('form_id', $form->id)->count())->toBe(2); +}); + +test('free user cannot add multiple emails', function () { + $user = $this->actingAsUser(); + $workspace = $this->createUserWorkspace($user); + $form = $this->createForm($user, $workspace); + + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => "test@example.com\nanother@example.com", + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertStatus(422) + ->assertJsonValidationErrors(['settings.send_to']) + ->assertJson([ + 'errors' => [ + 'settings.send_to' => ['You can only send to a single email address on the free plan. Please upgrade to the Pro plan to create a new integration.'] + ] + ]); +}); + +test('pro user can add multiple emails', function () { + $user = $this->actingAsProUser(); + $workspace = $this->createUserWorkspace($user); + $form = $this->createForm($user, $workspace); + + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => "test@example.com\nanother@example.com\nthird@example.com", + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + + $integration = FormIntegration::where('form_id', $form->id)->first(); + expect($integration)->not->toBeNull(); + expect($integration->data->send_to)->toContain('test@example.com'); + expect($integration->data->send_to)->toContain('another@example.com'); + expect($integration->data->send_to)->toContain('third@example.com'); +}); + +test('free user can update their single email integration', function () { + $user = $this->actingAsUser(); + $workspace = $this->createUserWorkspace($user); + $form = $this->createForm($user, $workspace); + + // Create initial integration + $response = $this->postJson(route('open.forms.integration.create', $form), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'test@example.com', + 'sender_name' => 'Test Sender', + 'subject' => 'Test Subject', + 'email_content' => 'Test Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + $integrationId = $response->json('form_integration.id'); + + // Update the integration + $response = $this->putJson(route('open.forms.integration.update', [$form, $integrationId]), [ + 'integration_id' => 'email', + 'status' => true, + 'settings' => [ + 'send_to' => 'updated@example.com', + 'sender_name' => 'Updated Sender', + 'subject' => 'Updated Subject', + 'email_content' => 'Updated Content', + 'include_submission_data' => true + ] + ]); + + $response->assertSuccessful(); + + $integration = FormIntegration::find($integrationId); + expect($integration->data->send_to)->toBe('updated@example.com'); + expect($integration->data->sender_name)->toBe('Updated Sender'); +}); diff --git a/api/tests/Feature/RegisterTest.php b/api/tests/Feature/RegisterTest.php index 05a0277e8..598374cd4 100644 --- a/api/tests/Feature/RegisterTest.php +++ b/api/tests/Feature/RegisterTest.php @@ -1,8 +1,15 @@ Http::response(['success' => true]) + ]); + $this->postJson('/register', [ 'name' => 'Test User', 'email' => 'test@test.app', @@ -10,13 +17,15 @@ 'password' => 'secret', 'password_confirmation' => 'secret', 'agree_terms' => true, + 'h-captcha-response' => 'test-token', // Mock token for testing ]) ->assertSuccessful() ->assertJsonStructure(['id', 'name', 'email']); - $this->assertDatabaseHas('users', [ - 'name' => 'Test User', - 'email' => 'test@test.app', - ]); + + $user = User::where('email', 'test@test.app')->first(); + expect($user)->not->toBeNull(); + expect($user->meta)->toHaveKey('registration_ip'); + expect($user->meta['registration_ip'])->toBe(request()->ip()); }); it('cannot register with existing email', function () { @@ -27,12 +36,17 @@ 'email' => 'test@test.app', 'password' => 'secret', 'password_confirmation' => 'secret', + 'h-captcha-response' => 'test-token', ]) ->assertStatus(422) ->assertJsonValidationErrors(['email']); }); it('cannot register with disposable email', function () { + Http::fake([ + ValidHCaptcha::H_CAPTCHA_VERIFY_URL => Http::response(['success' => true]) + ]); + // Select random email $email = [ 'dumliyupse@gufum.com', @@ -48,6 +62,7 @@ 'password' => 'secret', 'password_confirmation' => 'secret', 'agree_terms' => true, + 'h-captcha-response' => 'test-token', ]) ->assertStatus(422) ->assertJsonValidationErrors(['email']) @@ -60,3 +75,22 @@ ], ]); }); + +it('requires hcaptcha token in production', function () { + config(['services.h_captcha.secret_key' => 'test-key']); + + Http::fake([ + ValidHCaptcha::H_CAPTCHA_VERIFY_URL => Http::response(['success' => true]) + ]); + + $this->postJson('/register', [ + 'name' => 'Test User', + 'email' => 'test@test.app', + 'hear_about_us' => 'google', + 'password' => 'secret', + 'password_confirmation' => 'secret', + 'agree_terms' => true, + ]) + ->assertStatus(422) + ->assertJsonValidationErrors(['h-captcha-response']); +}); diff --git a/api/tests/Feature/UserManagementTest.php b/api/tests/Feature/UserManagementTest.php index 3113b4e24..e3b5531b8 100644 --- a/api/tests/Feature/UserManagementTest.php +++ b/api/tests/Feature/UserManagementTest.php @@ -2,10 +2,15 @@ use App\Models\UserInvite; use Carbon\Carbon; +use App\Rules\ValidHCaptcha; +use Illuminate\Support\Facades\Http; beforeEach(function () { $this->user = $this->actingAsProUser(); $this->workspace = $this->createUserWorkspace($this->user); + Http::fake([ + ValidHCaptcha::H_CAPTCHA_VERIFY_URL => Http::response(['success' => true]) + ]); }); @@ -31,6 +36,7 @@ 'password_confirmation' => 'secret', 'agree_terms' => true, 'invite_token' => $token, + 'h-captcha-response' => 'test-token', ]); $response->assertSuccessful(); expect($this->workspace->users()->count())->toBe(2); @@ -59,6 +65,7 @@ 'password_confirmation' => 'secret', 'agree_terms' => true, 'invite_token' => $token, + 'h-captcha-response' => 'test-token', ]); $response->assertStatus(400)->assertJson([ 'message' => 'Invite token has expired.', @@ -88,6 +95,7 @@ 'password_confirmation' => 'secret', 'agree_terms' => true, 'invite_token' => $token, + 'h-captcha-response' => 'test-token', ]); $response->assertSuccessful(); expect($this->workspace->users()->count())->toBe(2); @@ -104,6 +112,7 @@ 'password_confirmation' => 'secret', 'agree_terms' => true, 'invite_token' => $token, + 'h-captcha-response' => 'test-token', ]); $response->assertStatus(422)->assertJson([ @@ -138,6 +147,7 @@ 'password_confirmation' => 'secret', 'agree_terms' => true, 'invite_token' => $token, + 'h-captcha-response' => 'test-token', ]); $response->assertStatus(400)->assertJson([ 'message' => 'Invite token is invalid.', diff --git a/api/tests/TestCase.php b/api/tests/TestCase.php index 6f91c23ad..eed4d6515 100644 --- a/api/tests/TestCase.php +++ b/api/tests/TestCase.php @@ -4,10 +4,19 @@ use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; +use Illuminate\Routing\Middleware\ThrottleRequests; abstract class TestCase extends BaseTestCase { use CreatesApplication; use RefreshDatabase; use TestHelpers; + + protected function setUp(): void + { + parent::setUp(); + $this->withoutMiddleware( + ThrottleRequests::class + ); + } } diff --git a/client/components/open/integrations/components/DiscordIntegrationActions.vue b/client/components/open/integrations/components/DiscordIntegrationActions.vue new file mode 100644 index 000000000..1ae2ac0bc --- /dev/null +++ b/client/components/open/integrations/components/DiscordIntegrationActions.vue @@ -0,0 +1,46 @@ + + + diff --git a/client/components/open/integrations/components/EmailIntegrationActions.vue b/client/components/open/integrations/components/EmailIntegrationActions.vue new file mode 100644 index 000000000..c3a61835e --- /dev/null +++ b/client/components/open/integrations/components/EmailIntegrationActions.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue index eb47176e3..223ebe753 100644 --- a/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue +++ b/client/components/open/integrations/components/GoogleSheetsIntegrationActions.vue @@ -4,14 +4,12 @@ v-if="integration.provider" class="hidden md:block space-y-1" > -
- {{ integration.provider.name }} -
-
- {{ integration.provider.email }} -
+
diff --git a/client/components/open/integrations/components/SlackIntegrationActions.vue b/client/components/open/integrations/components/SlackIntegrationActions.vue new file mode 100644 index 000000000..7a119521e --- /dev/null +++ b/client/components/open/integrations/components/SlackIntegrationActions.vue @@ -0,0 +1,46 @@ + + + diff --git a/client/components/open/integrations/components/WebhookIntegrationActions.vue b/client/components/open/integrations/components/WebhookIntegrationActions.vue new file mode 100644 index 000000000..05d619ea2 --- /dev/null +++ b/client/components/open/integrations/components/WebhookIntegrationActions.vue @@ -0,0 +1,44 @@ + + + diff --git a/client/components/pages/auth/components/RegisterForm.vue b/client/components/pages/auth/components/RegisterForm.vue index d927b762d..01dd3538c 100644 --- a/client/components/pages/auth/components/RegisterForm.vue +++ b/client/components/pages/auth/components/RegisterForm.vue @@ -52,6 +52,21 @@ label="Confirm Password" /> + +
+ + +
+ import {opnFetch} from "~/composables/useOpnApi.js" -import {fetchAllWorkspaces} from "~/stores/workspaces.js" +import { fetchAllWorkspaces } from "~/stores/workspaces.js" +import VueHcaptcha from '@hcaptcha/vue3-hcaptcha' export default { name: "RegisterForm", - components: {}, + components: {VueHcaptcha}, props: { isQuick: { type: Boolean, @@ -146,6 +162,7 @@ export default { formsStore: useFormsStore(), workspaceStore: useWorkspacesStore(), providersStore: useOAuthProvidersStore(), + runtimeConfig: useRuntimeConfig(), logEvent: useAmplitude().logEvent, $utm } @@ -159,12 +176,17 @@ export default { password_confirmation: "", agree_terms: false, appsumo_license: null, - utm_data: null + utm_data: null, + 'h-captcha-response': null }), - disableEmail:false + disableEmail: false, + hcaptcha: null }), computed: { + hCaptchaSiteKey() { + return this.runtimeConfig.public.hCaptchaSiteKey + }, hearAboutUsOptions() { const options = [ {name: "Facebook", value: "facebook"}, @@ -187,6 +209,10 @@ export default { }, mounted() { + if (this.hCaptchaSiteKey) { + this.hcaptcha = this.$refs.hcaptcha + } + // Set appsumo license if ( this.$route.query.appsumo_license !== undefined && @@ -208,6 +234,10 @@ export default { async register() { let data this.form.utm_data = this.$utm.value + if (this.hCaptchaSiteKey) { + this.form['h-captcha-response'] = document.getElementsByName('h-captcha-response')[0].value + this.hcaptcha.reset() + } try { // Register the user. data = await this.form.post("/register") diff --git a/client/data/forms/integrations.json b/client/data/forms/integrations.json index a61ff56db..07bcf4329 100644 --- a/client/data/forms/integrations.json +++ b/client/data/forms/integrations.json @@ -4,6 +4,7 @@ "icon": "heroicons:envelope-20-solid", "section_name": "Notifications", "file_name": "EmailIntegration", + "actions_file_name": "EmailIntegrationActions", "is_pro": false, "crisp_help_page_slug": "can-i-receive-notifications-on-form-submissions-134svqv" }, @@ -12,6 +13,7 @@ "icon": "mdi:slack", "section_name": "Notifications", "file_name": "SlackIntegration", + "actions_file_name": "SlackIntegrationActions", "is_pro": true }, "discord": { @@ -19,6 +21,7 @@ "icon": "ic:baseline-discord", "section_name": "Notifications", "file_name": "DiscordIntegration", + "actions_file_name": "DiscordIntegrationActions", "is_pro": true }, "webhook": { @@ -26,6 +29,7 @@ "icon": "material-symbols:webhook", "section_name": "Automation", "file_name": "WebhookIntegration", + "actions_file_name": "WebhookIntegrationActions", "is_pro": false }, "zapier": { diff --git a/client/lib/utils.js b/client/lib/utils.js index d1339a50e..8838818ca 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -109,3 +109,15 @@ export const customDomainUsed = function () { return host !== appDomain && getDomain(host) !== appDomain } + +export const mentionAsText = (content) => { + if (!content) return '' + + // Parse the content and style mentions + return content.replace( + /]*>([^<]+)<\/span>/g, + (match, fieldId, fieldName, text) => { + return `${text}` + } + ) +} \ No newline at end of file