adjust webhooks

app/controllers/api/submissions_controller.rb

@@ -67,10 +67,10 @@ module Api
 
       submissions = create_submissions(@template, params)
 
-      @template.account.webhook_urls.with_event('submission.created').each do |webhook_url|
+      WebhookUrls.for_account_id(@template.account_id, 'submission.created').each do |webhook_url|
         submissions.each do |submission|
-          SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id,
-                                                                 'webhook_url_id' => webhook_url.id })
+          SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => submission.id,
+                                                               'webhook_url_id' => webhook_url.id)
         end
       end
 
@@ -78,7 +78,7 @@ module Api
 
       submissions.each do |submission|
         submission.submitters.each do |submitter|
-          ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => submitter.id }) if submitter.completed_at?
+          ProcessSubmitterCompletionJob.perform_async('submitter_id' => submitter.id) if submitter.completed_at?
         end
       end
 
@@ -96,9 +96,9 @@ module Api
       else
         @submission.update!(archived_at: Time.current)
 
-        @submission.account.webhook_urls.with_event('submission.archived').each do |webhook_url|
-          SendSubmissionArchivedWebhookRequestJob.perform_async({ 'submission_id' => @submission.id,
-                                                                  'webhook_url_id' => webhook_url.id })
+        WebhookUrls.for_account_id(@submission.account_id, 'submission.archived').each do |webhook_url|
+          SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id,
+                                                                'webhook_url_id' => webhook_url.id)
         end
       end
 

app/controllers/api/submitter_form_views_controller.rb

@@ -13,9 +13,9 @@ module Api
 
       SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)
 
-      submitter.account.webhook_urls.with_event('form.viewed').each do |webhook_url|
-        SendFormViewedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                        'webhook_url_id' => webhook_url.id })
+      WebhookUrls.for_account_id(submitter.account_id, 'form.viewed').each do |webhook_url|
+        SendFormViewedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                      'webhook_url_id' => webhook_url.id)
       end
 
       render json: {}

app/controllers/api/submitters_controller.rb

@@ -68,7 +68,7 @@ module Api
       end
 
       if @submitter.completed_at?
-        ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => @submitter.id })
+        ProcessSubmitterCompletionJob.perform_async('submitter_id' => @submitter.id)
       elsif normalized_params[:send_email] || normalized_params[:send_sms]
         Submitters.send_signature_requests([@submitter])
       end

app/controllers/api/templates_clone_controller.rb

@@ -25,9 +25,9 @@ module Api
 
       schema_documents = Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
 
-      cloned_template.account.webhook_urls.with_event('template.created').each do |webhook_url|
-        SendTemplateCreatedWebhookRequestJob.perform_async({ 'template_id' => cloned_template.id,
-                                                             'webhook_url_id' => webhook_url.id })
+      WebhookUrls.for_account_id(cloned_template.account_id, 'template.created').each do |webhook_url|
+        SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id,
+                                                           'webhook_url_id' => webhook_url.id)
       end
 
       render json: Templates::SerializeForApi.call(cloned_template, schema_documents)

app/controllers/api/templates_controller.rb

@@ -65,9 +65,9 @@ module Api
 
       @template.update!(template_params)
 
-      @template.account.webhook_urls.with_event('template.updated').each do |webhook_url|
-        SendTemplateUpdatedWebhookRequestJob.perform_async({ 'template_id' => @template.id,
-                                                             'webhook_url_id' => webhook_url.id })
+      WebhookUrls.for_account_id(@template.account_id, 'template.updated').each do |webhook_url|
+        SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id,
+                                                           'webhook_url_id' => webhook_url.id)
       end
 
       render json: @template.as_json(only: %i[id updated_at])

app/controllers/start_form_controller.rb

@@ -38,9 +38,9 @@ class StartFormController < ApplicationController
 
       if @submitter.save
         if is_new_record
-          @submitter.account.webhook_urls.with_event('submission.created').each do |webhook_url|
-            SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => @submitter.submission_id,
-                                                                   'webhook_url_id' => webhook_url.id })
+          WebhookUrls.for_account_id(@submitter.account_id, 'submission.created').each do |webhook_url|
+            SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => @submitter.submission_id,
+                                                                 'webhook_url_id' => webhook_url.id)
           end
         end
 

app/controllers/submissions_controller.rb

@@ -66,9 +66,9 @@ class SubmissionsController < ApplicationController
       else
         @submission.update!(archived_at: Time.current)
 
-        @submission.account.webhook_urls.with_event('submission.archived').each do |webhook_url|
-          SendSubmissionArchivedWebhookRequestJob.perform_async({ 'submission_id' => @submission.id,
-                                                                  'webhook_url_id' => webhook_url.id })
+        WebhookUrls.for_account_id(@submission.account_id, 'submission.archived').each do |webhook_url|
+          SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id,
+                                                                'webhook_url_id' => webhook_url.id)
         end
 
         I18n.t('submission_has_been_archived')
@@ -87,10 +87,10 @@ class SubmissionsController < ApplicationController
   end
 
   def enqueue_submission_created_webhooks(template, submissions)
-    template.account.webhook_urls.with_event('submission.created').each do |webhook_url|
+    WebhookUrls.for_account_id(template.account_id, 'submission.created').each do |webhook_url|
       submissions.each do |submission|
-        SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id,
-                                                               'webhook_url_id' => webhook_url.id })
+        SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => submission.id,
+                                                             'webhook_url_id' => webhook_url.id)
       end
     end
   end

app/controllers/submit_form_decline_controller.rb

@@ -25,9 +25,9 @@ class SubmitFormDeclineController < ApplicationController
       SubmitterMailer.declined_email(submitter, user).deliver_later!
     end
 
-    submitter.account.webhook_urls.with_event('form.declined').each do |webhook_url|
-      SendFormDeclinedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                        'webhook_url_id' => webhook_url.id })
+    WebhookUrls.for_account_id(submitter.account_id, 'form.declined').each do |webhook_url|
+      SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                      'webhook_url_id' => webhook_url.id)
     end
 
     redirect_to submit_form_path(submitter.slug)

app/controllers/templates_controller.rb

@@ -129,16 +129,16 @@ class TemplatesController < ApplicationController
   end
 
   def enqueue_template_created_webhooks(template)
-    template.account.webhook_urls.with_event('template.updated').each do |webhook_url|
-      SendTemplateCreatedWebhookRequestJob.perform_async({ 'template_id' => template.id,
-                                                           'webhook_url_id' => webhook_url.id })
+    WebhookUrls.for_account_id(template.account_id, 'template.created').each do |webhook_url|
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
     end
   end
 
   def enqueue_template_updated_webhooks(template)
-    template.account.webhook_urls.with_event('template.updated').each do |webhook_url|
-      SendTemplateUpdatedWebhookRequestJob.perform_async({ 'template_id' => template.id,
-                                                           'webhook_url_id' => webhook_url.id })
+    WebhookUrls.for_account_id(template.account_id, 'template.updated').each do |webhook_url|
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
     end
   end
 

app/controllers/templates_uploads_controller.rb

@@ -67,9 +67,9 @@ class TemplatesUploadsController < ApplicationController
   end
 
   def enqueue_template_created_webhooks(template)
-    template.account.webhook_urls.with_event('template.created').each do |webhook_url|
-      SendTemplateCreatedWebhookRequestJob.perform_async({ 'template_id' => template.id,
-                                                           'webhook_url_id' => webhook_url.id })
+    WebhookUrls.for_account_id(template.account_id, 'template.created').each do |webhook_url|
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => template.id,
+                                                         'webhook_url_id' => webhook_url.id)
     end
   end
 end

app/controllers/webhook_preferences_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class WebhookPreferencesController < ApplicationController
+  load_and_authorize_resource :webhook_url, parent: false
+
+  def update
+    webhook_preferences_params[:events].each do |event, val|
+      @webhook_url.events.delete(event) if val == '0'
+      @webhook_url.events.push(event) if val == '1' && @webhook_url.events.exclude?(event)
+    end
+
+    @webhook_url.save!
+
+    head :ok
+  end
+
+  private
+
+  def webhook_preferences_params
+    params.require(:webhook_url).permit(events: {})
+  end
+end

app/controllers/webhook_settings_controller.rb

@@ -17,8 +17,8 @@ class WebhookSettingsController < ApplicationController
   def update
     submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last
 
-    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                       'webhook_url_id' => @webhook_url.id })
+    SendFormCompletedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+                                                     'webhook_url_id' => @webhook_url.id)
 
     redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_request_has_been_sent'))
   end
@@ -30,6 +30,6 @@ class WebhookSettingsController < ApplicationController
   end
 
   def webhook_params
-    params.require(:webhook_url).permit(:url, events: [])
+    params.require(:webhook_url).permit(:url)
   end
 end