collavre_slack 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8e800e1e2f729af9f99e0ebedc8e070723ba61f194ee9df766fcdfdd27c933
-  data.tar.gz: 2737d507f261c19b3446afd84f8747d21cb849fcddfa5d139b2dbd9a9a7f96ad
+  metadata.gz: 8d470cccf0cf90daff6918a44ff263700803a3a51114003be481d51fc38431f9
+  data.tar.gz: 63c5cbebe3fd89218f494a41530e190d1ba85ca419e1baccc45914a40c6995aa
 SHA512:
-  metadata.gz: c66ed359c01fc4d3c8f95badd2a9b692c01369187da548f5c9620fde05c7391c8e9c9011b8ba5f98f5f3bcb6925d97b2491992a38258a85b1a6999f330180bb0
-  data.tar.gz: a86dad280226ab1c787e9c959b134fa4b1dde7245726a748620a396058171a3c21d2b469034c2bd2444fa9fbfc493d37b9980bf606a0f6ac2af6fad776426265
+  metadata.gz: 982316ca1c8c573d38b8f5c95003da48503153067be902844c9462458df362b46d6c2cc9188134d20cec78426355058ded4a54d155e17e3e966eef16a7646ba5
+  data.tar.gz: 5252ff282030eba366c99c0dbc9c11bb356c824fd65b505d37d0234b51d15fb35be6b68de435713ecd5739573963f0fa5fa689eb09a8cf08113a2132aee476c9

data/app/controllers/collavre_slack/creatives/slack_integrations_controller.rb

@@ -1,12 +1,14 @@
 module CollavreSlack
   module Creatives
     class SlackIntegrationsController < ApplicationController
+      include Collavre::IntegrationSetup
+      include Collavre::IntegrationPermission
+
       before_action :set_creative
+      before_action :set_origin
 
       def index
-        # Always use origin creative for Slack links (chat messages are on origin)
-        target_creative = @creative.effective_origin
-        @links = SlackChannelLink.where(creative: target_creative)
+        @links = SlackChannelLink.where(creative: @origin)
         respond_to do |format|
           format.json do
             slack_account = Current.user ? SlackAccount.find_by(user: Current.user) : nil
@@ -31,13 +33,13 @@ module CollavreSlack
 
       def create
         unless @creative.has_permission?(Current.user, :feedback)
-          render json: { success: false, error: I18n.t("collavre_slack.errors.forbidden") }, status: :forbidden
+          render json: { success: false, error: integration_forbidden_message }, status: :forbidden
           return
         end
 
         # Find the user's Slack account
         slack_account = if params[:slack_account_id].present?
-          SlackAccount.find(params[:slack_account_id])
+          SlackAccount.find_by!(id: params[:slack_account_id], user: Current.user)
         else
           SlackAccount.find_by(user: Current.user)
         end
@@ -47,11 +49,8 @@ module CollavreSlack
           return
         end
 
-        # Always link to origin creative (chat messages are on origin)
-        target_creative = @creative.effective_origin
-
         service = SlackIntegrationService.new(user: Current.user, slack_account: slack_account)
-        link = service.link_channel(creative: target_creative, channel_id: params[:channel_id], channel_name: params[:channel_name])
+        link = service.link_channel(creative: @origin, channel_id: params[:channel_id], channel_name: params[:channel_name])
 
         if link.persisted?
           render json: { success: true, link: { id: link.id, channel_id: link.channel_id, channel_name: link.channel_name } }, status: :created
@@ -60,10 +59,8 @@ module CollavreSlack
         end
       end
 
-      # Lightweight endpoint for badge display — returns only existing links, no Slack API calls
       def badge
-        target_creative = @creative.effective_origin
-        links = SlackChannelLink.where(creative: target_creative)
+        links = SlackChannelLink.where(creative: @origin)
         render json: {
           links: links.map { |link|
             { channel_name: link.channel_name }
@@ -73,15 +70,13 @@ module CollavreSlack
 
       def destroy
         link = SlackChannelLink.find(params[:id])
-        # Check against origin creative
-        target_creative = @creative.effective_origin
-        unless link.creative_id == target_creative.id
+        unless link.creative_id == @origin.id
           render json: { success: false, error: I18n.t("collavre_slack.errors.not_found") }, status: :not_found
           return
         end
 
         unless @creative.has_permission?(Current.user, :feedback)
-          render json: { success: false, error: I18n.t("collavre_slack.errors.forbidden") }, status: :forbidden
+          render json: { success: false, error: integration_forbidden_message }, status: :forbidden
           return
         end
 
@@ -91,8 +86,8 @@ module CollavreSlack
 
       private
 
-      def set_creative
-        @creative = Collavre::Creative.find(params[:creative_id])
+      def integration_forbidden_message
+        I18n.t("collavre_slack.errors.forbidden")
       end
 
       def fetch_channels(slack_account)

data/app/controllers/collavre_slack/slack_auth_controller.rb

@@ -65,7 +65,7 @@ module CollavreSlack
 
       if account.save
         # Render HTML that closes the popup and notifies the parent window
-        render html: close_popup_html.html_safe, layout: false
+        render template: "collavre_slack/slack_auth/callback_success", layout: false
       else
         Rails.logger.error("[SlackAuth] Failed to save account: #{account.errors.full_messages.join(', ')}")
         render json: { error: I18n.t("collavre_slack.errors.save_failed", errors: account.errors.full_messages.join(", ")) }, status: :unprocessable_entity
@@ -81,25 +81,5 @@ module CollavreSlack
     def message_verifier
       @message_verifier ||= Rails.application.message_verifier("slack_oauth")
     end
-
-    def close_popup_html
-      title = I18n.t("collavre_slack.views.auth.success_title")
-      message = I18n.t("collavre_slack.views.auth.success_message")
-      <<~HTML
-        <!DOCTYPE html>
-        <html>
-        <head><title>#{title}</title></head>
-        <body>
-          <p>#{message}</p>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ type: 'slack-auth-success' }, '*');
-            }
-            window.close();
-          </script>
-        </body>
-        </html>
-      HTML
-    end
   end
 end

data/app/javascript/collavre_slack.js

@@ -1,4 +1,5 @@
 import { filterChannels, reconcileSelection, buildChannelViewModels } from './slack_channel_list.js';
+import { csrfToken, showError, clearError, updateStepVisibility, openOAuthPopup, fetchWithCsrf, setupModalClose } from 'collavre/modules/integration_wizard';
 
 let slackIntegrationInitialized = false;
 
@@ -35,10 +36,6 @@ if (!slackIntegrationInitialized) {
     let selectedChannel = null;
     let existingLinks = [];
 
-    function csrfToken() {
-      return document.querySelector('meta[name="csrf-token"]')?.content;
-    }
-
     function resetWizard() {
       currentStep = 'connect';
       hasExistingIntegration = false;
@@ -46,8 +43,7 @@ if (!slackIntegrationInitialized) {
       selectedChannel = null;
       existingLinks = [];
       statusEl.textContent = '';
-      errorEl.style.display = 'none';
-      errorEl.textContent = '';
+      clearError(errorEl);
       if (connectedStatus) {
         connectedStatus.style.display = 'none';
       }
@@ -69,12 +65,7 @@ if (!slackIntegrationInitialized) {
     }
 
     function updateStep() {
-      ['connect', 'channels', 'summary']
-        .forEach(function (step) {
-          const el = document.getElementById(`slack-step-${step}`);
-          if (!el) return;
-          el.style.display = (step === currentStep) ? 'block' : 'none';
-        });
+      updateStepVisibility(currentStep, ['connect', 'channels', 'summary'], 'slack-step');
 
       if (currentStep === 'connect') {
         prevBtn.style.display = 'none';
@@ -99,29 +90,13 @@ if (!slackIntegrationInitialized) {
       }
     }
 
-    function showError(message) {
-      errorEl.textContent = message;
-      errorEl.style.display = 'block';
-    }
-
-    function clearError() {
-      errorEl.style.display = 'none';
-      errorEl.textContent = '';
-    }
-
     function loadIntegrationStatus() {
       if (!creativeId) return;
 
       statusEl.textContent = modal.dataset.loading || 'Loading...';
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/slack/creatives/${creativeId}/slack_integrations`, {
-        method: 'GET',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Accept': 'application/json'
-        }
-      })
+      fetchWithCsrf(`/slack/creatives/${creativeId}/slack_integrations`)
         .then(response => response.json())
         .then(data => {
           console.log('Slack integration status:', data);
@@ -147,7 +122,7 @@ if (!slackIntegrationInitialized) {
         .catch(error => {
           console.error('Error loading integration status:', error);
           statusEl.textContent = '';
-          showError('Failed to load integration status');
+          showError(errorEl, 'Failed to load integration status');
         });
     }
 
@@ -160,7 +135,9 @@ if (!slackIntegrationInitialized) {
         li.style.cssText = 'display:flex;align-items:center;justify-content:space-between;padding:0.5em 0.75em;margin-bottom:0.5em;background:var(--color-bg-alt);border-radius:4px;';
 
         const channelInfo = document.createElement('div');
-        channelInfo.innerHTML = `<strong>#${link.channel_name || link.channel_id}</strong>`;
+        const channelStrong = document.createElement('strong');
+        channelStrong.textContent = `#${link.channel_name || link.channel_id}`;
+        channelInfo.appendChild(channelStrong);
 
         if (link.last_synced_at) {
           const syncInfo = document.createElement('span');
@@ -218,15 +195,9 @@ if (!slackIntegrationInitialized) {
       const btn = event.target;
       btn.disabled = true;
       btn.textContent = '...';
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/slack/creatives/${creativeId}/slack_integrations/${link.id}`, {
-        method: 'DELETE',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Accept': 'application/json'
-        }
-      })
+      fetchWithCsrf(`/slack/creatives/${creativeId}/slack_integrations/${link.id}`, { method: 'DELETE' })
         .then(response => response.json())
         .then(data => {
           if (data.success) {
@@ -240,14 +211,14 @@ if (!slackIntegrationInitialized) {
             statusEl.textContent = modal.dataset.deleteSuccess || 'Channel link removed';
             statusEl.style.color = 'green';
           } else {
-            showError(data.message || data.error || 'Deletion failed');
+            showError(errorEl, data.message || data.error || 'Deletion failed');
             btn.disabled = false;
             btn.textContent = modal.dataset.deleteButtonLabel || 'Remove';
           }
         })
         .catch(error => {
           console.error('Delete error:', error);
-          showError('Deletion failed');
+          showError(errorEl, 'Deletion failed');
           btn.disabled = false;
           btn.textContent = modal.dataset.deleteButtonLabel || 'Remove';
         });
@@ -281,10 +252,15 @@ if (!slackIntegrationInitialized) {
         div.className = 'slack-channel-item';
 
         const linkedLabel = modal.dataset.linkedLabel || '(linked)';
-        div.innerHTML = `
-          <strong>#${channel.name}</strong>
-          ${isLinked ? `<span style="color:green;margin-left:0.5em;">${linkedLabel}</span>` : ''}
-        `;
+        const nameStrong = document.createElement('strong');
+        nameStrong.textContent = `#${channel.name}`;
+        div.appendChild(nameStrong);
+        if (isLinked) {
+          const linkedSpan = document.createElement('span');
+          linkedSpan.style.cssText = 'color:green;margin-left:0.5em;';
+          linkedSpan.textContent = linkedLabel;
+          div.appendChild(linkedSpan);
+        }
 
         if (isSelected) {
           div.classList.add('active');
@@ -316,25 +292,20 @@ if (!slackIntegrationInitialized) {
 
     function performLink() {
       if (!creativeId || !selectedChannel) {
-        showError(modal.dataset.noCreative);
+        showError(errorEl, modal.dataset.noCreative);
         return;
       }
 
       finishBtn.disabled = true;
       finishBtn.textContent = modal.dataset.linking || 'Linking...';
-      clearError();
+      clearError(errorEl);
 
-      fetch(`/slack/creatives/${creativeId}/slack_integrations`, {
+      fetchWithCsrf(`/slack/creatives/${creativeId}/slack_integrations`, {
         method: 'POST',
-        headers: {
-          'X-CSRF-Token': csrfToken(),
-          'Content-Type': 'application/json',
-          'Accept': 'application/json'
-        },
-        body: JSON.stringify({
+        body: {
           channel_id: selectedChannel.id,
           channel_name: selectedChannel.name
-        })
+        }
       })
         .then(response => response.json())
         .then(data => {
@@ -346,12 +317,12 @@ if (!slackIntegrationInitialized) {
               resetWizard();
             }, 2000);
           } else {
-            showError(data.message || data.error || 'Failed to link channel');
+            showError(errorEl, data.message || data.error || 'Failed to link channel');
           }
         })
         .catch(error => {
           console.error('Link error:', error);
-          showError('Failed to link channel');
+          showError(errorEl, 'Failed to link channel');
         })
         .finally(() => {
           finishBtn.disabled = false;
@@ -371,34 +342,20 @@ if (!slackIntegrationInitialized) {
       loadIntegrationStatus();
     });
 
-    closeBtn.addEventListener('click', function () {
-      modal.style.display = 'none';
-      resetWizard();
-    });
+    setupModalClose(modal, closeBtn, resetWizard);
 
     loginBtn.addEventListener('click', function (e) {
       e.preventDefault();
       console.log('Slack login button clicked');
-      const width = parseInt(this.dataset.windowWidth) || 600;
-      const height = parseInt(this.dataset.windowHeight) || 700;
-      const left = (screen.width - width) / 2;
-      const top = (screen.height - height) / 2;
-
-      const authUrl = this.href;
-      const authWindow = window.open(authUrl, 'slack-auth-window',
-        `width=${width},height=${height},left=${left},top=${top},scrollbars=yes,resizable=yes`);
-
-      if (authWindow) {
-        console.log('Auth window opened');
-
-        const checkClosed = setInterval(() => {
-          if (authWindow.closed) {
-            clearInterval(checkClosed);
-            console.log('Auth window closed, reloading integration status');
-            setTimeout(() => loadIntegrationStatus(), 1000);
-          }
-        }, 1000);
-      }
+      openOAuthPopup('slack-auth-window', {
+        width: parseInt(this.dataset.windowWidth) || 600,
+        height: parseInt(this.dataset.windowHeight) || 700,
+        url: this.href,
+        onClose: function () {
+          console.log('Auth window closed, reloading integration status');
+          loadIntegrationStatus();
+        }
+      });
     });
 
     prevBtn.addEventListener('click', function () {
@@ -411,14 +368,14 @@ if (!slackIntegrationInitialized) {
     });
 
     nextBtn.addEventListener('click', function () {
-      clearError();
+      clearError(errorEl);
       if (currentStep === 'connect') {
         currentStep = 'channels';
         if (channelSearchEl) channelSearchEl.value = '';
         renderChannelList();
       } else if (currentStep === 'channels') {
         if (!selectedChannel) {
-          showError('Please select a channel');
+          showError(errorEl, 'Please select a channel');
           return;
         }
         updateSummary();
@@ -451,13 +408,7 @@ if (!slackIntegrationInitialized) {
         refreshBtn.textContent = modal.dataset.loading || 'Loading...';
         selectedChannel = null;
 
-        fetch(`/slack/creatives/${creativeId}/slack_integrations`, {
-          method: 'GET',
-          headers: {
-            'X-CSRF-Token': csrfToken(),
-            'Accept': 'application/json'
-          }
-        })
+        fetchWithCsrf(`/slack/creatives/${creativeId}/slack_integrations`)
           .then(response => response.json())
           .then(data => {
             if (data.connected) {
@@ -468,7 +419,7 @@ if (!slackIntegrationInitialized) {
           })
           .catch(error => {
             console.error('Error refreshing channels:', error);
-            showError(modal.dataset.refreshError || 'Failed to refresh channels');
+            showError(errorEl, modal.dataset.refreshError || 'Failed to refresh channels');
           })
           .finally(() => {
             refreshBtn.disabled = false;
@@ -478,12 +429,6 @@ if (!slackIntegrationInitialized) {
       });
     }
 
-    modal.addEventListener('click', function (e) {
-      if (e.target === modal) {
-        modal.style.display = 'none';
-        resetWizard();
-      }
-    });
   });
 
   // Slack badge for comments popup

data/app/jobs/collavre_slack/slack_inbound_message_delete_job.rb

@@ -1,24 +1,26 @@
 module CollavreSlack
   class SlackInboundMessageDeleteJob < ApplicationJob
+    include ErrorLoggable
+
     queue_as :default
 
     def perform(payload)
-      data = payload.with_indifferent_access
-      comment = Collavre::Comment.find_by(id: data[:comment_id])
+      with_slack_error_handling("SlackInboundMessageDeleteJob") do
+        data = payload.with_indifferent_access
+        comment = Collavre::Comment.find_by(id: data[:comment_id])
 
-      if comment
-        # Mark as coming from Slack to prevent loop
-        comment.instance_variable_set(:@from_slack, true)
-        comment.destroy!
-        Rails.logger.info("[CollavreSlack] Deleted comment #{data[:comment_id]} from Slack deletion")
-      end
+        if comment
+          # Mark as coming from Slack to prevent loop
+          comment.instance_variable_set(:@from_slack, true)
+          comment.destroy!
+          Rails.logger.info("[CollavreSlack] Deleted comment #{data[:comment_id]} from Slack deletion")
+        end
 
-      # Clean up the comment link record
-      if data[:slack_comment_link_id].present?
-        SlackCommentLink.find_by(id: data[:slack_comment_link_id])&.destroy
+        # Clean up the comment link record
+        if data[:slack_comment_link_id].present?
+          SlackCommentLink.find_by(id: data[:slack_comment_link_id])&.destroy
+        end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] SlackInboundMessageDeleteJob error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
   end
 end

data/app/jobs/collavre_slack/slack_inbound_message_update_job.rb

@@ -1,22 +1,24 @@
 module CollavreSlack
   class SlackInboundMessageUpdateJob < ApplicationJob
+    include ErrorLoggable
+
     queue_as :default
 
     def perform(payload)
-      data = payload.with_indifferent_access
-      comment = Collavre::Comment.find_by(id: data[:comment_id])
-      return unless comment
+      with_slack_error_handling("SlackInboundMessageUpdateJob") do
+        data = payload.with_indifferent_access
+        comment = Collavre::Comment.find_by(id: data[:comment_id])
+        return unless comment
 
-      new_content = data[:content]
-      return if new_content.blank?
+        new_content = data[:content]
+        return if new_content.blank?
 
-      # Mark as coming from Slack to prevent loop
-      comment.instance_variable_set(:@from_slack, true)
-      comment.update!(content: new_content)
+        # Mark as coming from Slack to prevent loop
+        comment.instance_variable_set(:@from_slack, true)
+        comment.update!(content: new_content)
 
-      Rails.logger.info("[CollavreSlack] Updated comment #{comment.id} from Slack edit")
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] SlackInboundMessageUpdateJob error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
+        Rails.logger.info("[CollavreSlack] Updated comment #{comment.id} from Slack edit")
+      end
     end
   end
 end

data/app/jobs/collavre_slack/slack_message_delete_job.rb

@@ -1,29 +1,31 @@
 module CollavreSlack
   class SlackMessageDeleteJob < ApplicationJob
+    include ErrorLoggable
+
     queue_as :default
 
     def perform(slack_channel_link_id:, message_ts:)
-      Rails.logger.info("[CollavreSlack] SlackMessageDeleteJob performing for channel_link_id=#{slack_channel_link_id}, ts=#{message_ts}")
+      with_slack_error_handling("SlackMessageDeleteJob") do
+        Rails.logger.info("[CollavreSlack] SlackMessageDeleteJob performing for channel_link_id=#{slack_channel_link_id}, ts=#{message_ts}")
 
-      channel_link = SlackChannelLink.find_by(id: slack_channel_link_id)
-      return unless channel_link
+        channel_link = SlackChannelLink.find_by(id: slack_channel_link_id)
+        return unless channel_link
 
-      client = SlackClient.new(access_token: channel_link.slack_account.access_token)
-      response = client.delete_message(
-        channel: channel_link.channel_id,
-        timestamp: message_ts
-      )
+        client = SlackClient.new(access_token: channel_link.slack_account.access_token)
+        response = client.delete_message(
+          channel: channel_link.channel_id,
+          timestamp: message_ts
+        )
 
-      if response[:ok]
-        Rails.logger.info("[CollavreSlack] Message deleted successfully, ts=#{message_ts}")
-      else
-        # message_not_found is not an error - message may have been deleted on Slack already
-        unless response[:error] == "message_not_found"
-          Rails.logger.error("[CollavreSlack] Failed to delete message: #{response[:error]}")
+        if response[:ok]
+          Rails.logger.info("[CollavreSlack] Message deleted successfully, ts=#{message_ts}")
+        else
+          # message_not_found is not an error - message may have been deleted on Slack already
+          unless response[:error] == "message_not_found"
+            Rails.logger.error("[CollavreSlack] Failed to delete message: #{response[:error]}")
+          end
         end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] SlackMessageDeleteJob error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
   end
 end

data/app/jobs/collavre_slack/slack_message_update_job.rb

@@ -1,32 +1,34 @@
 module CollavreSlack
   class SlackMessageUpdateJob < ApplicationJob
+    include ErrorLoggable
+
     queue_as :default
 
     def perform(slack_comment_link_id:, message:)
-      Rails.logger.info("[CollavreSlack] SlackMessageUpdateJob performing for link_id=#{slack_comment_link_id}")
+      with_slack_error_handling("SlackMessageUpdateJob") do
+        Rails.logger.info("[CollavreSlack] SlackMessageUpdateJob performing for link_id=#{slack_comment_link_id}")
 
-      comment_link = SlackCommentLink.find_by(id: slack_comment_link_id)
-      return unless comment_link
+        comment_link = SlackCommentLink.find_by(id: slack_comment_link_id)
+        return unless comment_link
 
-      channel_link = comment_link.slack_channel_link
-      return unless channel_link
+        channel_link = comment_link.slack_channel_link
+        return unless channel_link
 
-      formatted_message = MentionMapping.to_slack(message, channel_link.slack_account)
+        formatted_message = MentionMapping.to_slack(message, channel_link.slack_account)
 
-      client = SlackClient.new(access_token: channel_link.slack_account.access_token)
-      response = client.update_message(
-        channel: channel_link.channel_id,
-        timestamp: comment_link.message_ts,
-        text: formatted_message
-      )
+        client = SlackClient.new(access_token: channel_link.slack_account.access_token)
+        response = client.update_message(
+          channel: channel_link.channel_id,
+          timestamp: comment_link.message_ts,
+          text: formatted_message
+        )
 
-      if response[:ok]
-        Rails.logger.info("[CollavreSlack] Message updated successfully, ts=#{comment_link.message_ts}")
-      else
-        Rails.logger.error("[CollavreSlack] Failed to update message: #{response[:error]}")
+        if response[:ok]
+          Rails.logger.info("[CollavreSlack] Message updated successfully, ts=#{comment_link.message_ts}")
+        else
+          Rails.logger.error("[CollavreSlack] Failed to update message: #{response[:error]}")
+        end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] SlackMessageUpdateJob error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
   end
 end

data/app/models/concerns/collavre_slack/error_loggable.rb

@@ -0,0 +1,20 @@
+module CollavreSlack
+  module ErrorLoggable
+    extend ActiveSupport::Concern
+
+    private
+
+    # Wraps a block with standardized Slack error handling.
+    # Logs the error message and first 5 backtrace lines.
+    #
+    # @param context_name [String] identifies the caller in the log (e.g. "SlackMessageJob")
+    # @param reraise [Boolean] whether to re-raise after logging (default: false)
+    # @yield the block to execute with error handling
+    def with_slack_error_handling(context_name, reraise: false)
+      yield
+    rescue StandardError => e
+      Rails.logger.error("[CollavreSlack] #{context_name} error: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
+      raise if reraise
+    end
+  end
+end

data/app/models/concerns/collavre_slack/slack_dispatchable.rb

@@ -3,6 +3,8 @@ module CollavreSlack
     extend ActiveSupport::Concern
 
     included do
+      include ErrorLoggable
+
       after_create_commit :dispatch_to_slack_channels
       after_update_commit :update_slack_messages, if: :saved_change_to_content?
       before_destroy :prepare_slack_message_deletion
@@ -12,61 +14,61 @@ module CollavreSlack
     private
 
     def dispatch_to_slack_channels
-      # Don't dispatch if this comment came from Slack (prevent loop)
-      if instance_variable_get(:@from_slack)
-        Rails.logger.info("[CollavreSlack] Skipping dispatch - comment came from Slack")
-        return
-      end
+      with_slack_error_handling("Failed to dispatch to Slack") do
+        # Don't dispatch if this comment came from Slack (prevent loop)
+        if instance_variable_get(:@from_slack)
+          Rails.logger.info("[CollavreSlack] Skipping dispatch - comment came from Slack")
+          return
+        end
 
-      # Use effective_origin since Slack links are on origin creative
-      target_creative_id = creative.effective_origin.id
+        # Use effective_origin since Slack links are on origin creative
+        target_creative_id = creative.effective_origin.id
 
-      return unless CollavreSlack::SlackChannelLink.where(creative_id: target_creative_id).exists?
+        return unless CollavreSlack::SlackChannelLink.where(creative_id: target_creative_id).exists?
 
-      Rails.logger.info("[CollavreSlack] dispatch_to_slack_channels called for comment #{id}, creative_id=#{creative_id}, target_creative_id=#{target_creative_id}")
+        Rails.logger.info("[CollavreSlack] dispatch_to_slack_channels called for comment #{id}, creative_id=#{creative_id}, target_creative_id=#{target_creative_id}")
 
-      links = CollavreSlack::SlackChannelLink.where(creative_id: target_creative_id)
-      Rails.logger.info("[CollavreSlack] Found #{links.count} active Slack links")
+        links = CollavreSlack::SlackChannelLink.where(creative_id: target_creative_id)
+        Rails.logger.info("[CollavreSlack] Found #{links.count} active Slack links")
 
-      links.find_each do |link|
-        Rails.logger.info("[CollavreSlack] Dispatching to channel #{link.channel_name} (#{link.channel_id})")
-        dispatcher = CollavreSlack::SlackMessageDispatcher.new(channel_link: link)
-        dispatcher.enqueue(message: format_slack_message, sender: user, comment: self)
+        links.find_each do |link|
+          Rails.logger.info("[CollavreSlack] Dispatching to channel #{link.channel_name} (#{link.channel_id})")
+          dispatcher = CollavreSlack::SlackMessageDispatcher.new(channel_link: link)
+          dispatcher.enqueue(message: format_slack_message, sender: user, comment: self)
+        end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] Failed to dispatch to Slack: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
 
     def update_slack_messages
-      return if instance_variable_get(:@from_slack)
-
-      comment_links = CollavreSlack::SlackCommentLink.where(comment_id: id)
-      return if comment_links.empty?
-
-      comment_links.each do |link|
-        CollavreSlack::SlackMessageUpdateJob.perform_later(
-          slack_comment_link_id: link.id,
-          message: format_slack_message
-        )
+      with_slack_error_handling("Failed to update Slack messages") do
+        return if instance_variable_get(:@from_slack)
+
+        comment_links = CollavreSlack::SlackCommentLink.where(comment_id: id)
+        return if comment_links.empty?
+
+        comment_links.each do |link|
+          CollavreSlack::SlackMessageUpdateJob.perform_later(
+            slack_comment_link_id: link.id,
+            message: format_slack_message
+          )
+        end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] Failed to update Slack messages: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
 
     def prepare_slack_message_deletion
-      Rails.logger.info("[CollavreSlack] prepare_slack_message_deletion called for comment #{id}")
-      return if instance_variable_get(:@from_slack)
-
-      # Save link info before the comment is deleted
-      # The database will cascade delete the records, but we need the info for Slack API
-      comment_links = CollavreSlack::SlackCommentLink.where(comment_id: id)
-      Rails.logger.info("[CollavreSlack] Found #{comment_links.count} slack comment links")
-      @slack_links_to_delete = comment_links.map do |link|
-        { slack_channel_link_id: link.slack_channel_link_id, message_ts: link.message_ts }
+      with_slack_error_handling("Failed to prepare Slack message deletion") do
+        Rails.logger.info("[CollavreSlack] prepare_slack_message_deletion called for comment #{id}")
+        return if instance_variable_get(:@from_slack)
+
+        # Save link info before the comment is deleted
+        # The database will cascade delete the records, but we need the info for Slack API
+        comment_links = CollavreSlack::SlackCommentLink.where(comment_id: id)
+        Rails.logger.info("[CollavreSlack] Found #{comment_links.count} slack comment links")
+        @slack_links_to_delete = comment_links.map do |link|
+          { slack_channel_link_id: link.slack_channel_link_id, message_ts: link.message_ts }
+        end
+        Rails.logger.info("[CollavreSlack] Saved #{@slack_links_to_delete.size} links for deletion")
       end
-      Rails.logger.info("[CollavreSlack] Saved #{@slack_links_to_delete.size} links for deletion")
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] Failed to prepare Slack message deletion: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
 
     def format_slack_message
@@ -76,22 +78,22 @@ module CollavreSlack
     end
 
     def delete_slack_messages
-      Rails.logger.info("[CollavreSlack] delete_slack_messages called")
-      return if instance_variable_get(:@from_slack)
-
-      links_to_delete = instance_variable_get(:@slack_links_to_delete) || []
-      Rails.logger.info("[CollavreSlack] Links to delete: #{links_to_delete.size}")
-      return if links_to_delete.empty?
-
-      links_to_delete.each do |link_info|
-        Rails.logger.info("[CollavreSlack] Enqueuing SlackMessageDeleteJob for ts=#{link_info[:message_ts]}")
-        CollavreSlack::SlackMessageDeleteJob.perform_later(
-          slack_channel_link_id: link_info[:slack_channel_link_id],
-          message_ts: link_info[:message_ts]
-        )
+      with_slack_error_handling("Failed to delete Slack messages") do
+        Rails.logger.info("[CollavreSlack] delete_slack_messages called")
+        return if instance_variable_get(:@from_slack)
+
+        links_to_delete = instance_variable_get(:@slack_links_to_delete) || []
+        Rails.logger.info("[CollavreSlack] Links to delete: #{links_to_delete.size}")
+        return if links_to_delete.empty?
+
+        links_to_delete.each do |link_info|
+          Rails.logger.info("[CollavreSlack] Enqueuing SlackMessageDeleteJob for ts=#{link_info[:message_ts]}")
+          CollavreSlack::SlackMessageDeleteJob.perform_later(
+            slack_channel_link_id: link_info[:slack_channel_link_id],
+            message_ts: link_info[:message_ts]
+          )
+        end
       end
-    rescue StandardError => e
-      Rails.logger.error("[CollavreSlack] Failed to delete Slack messages: #{e.message}\n#{e.backtrace.first(5).join("\n")}")
     end
   end
 end

data/app/views/collavre_slack/slack_auth/callback_success.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head><title><%= t("collavre_slack.views.auth.success_title") %></title></head>
+<body>
+  <p><%= t("collavre_slack.views.auth.success_message") %></p>
+  <script>
+    if (window.opener) {
+      window.opener.postMessage({ type: 'slack-auth-success' }, window.location.origin);
+    }
+    window.close();
+  </script>
+</body>
+</html>

data/lib/collavre_slack/version.rb

@@ -1,3 +1,3 @@
 module CollavreSlack
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_slack
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Collavre
@@ -100,6 +100,7 @@ files:
 - app/models/collavre_slack/slack_comment_link.rb
 - app/models/collavre_slack/slack_message_log.rb
 - app/models/collavre_slack/slack_user_mapping.rb
+- app/models/concerns/collavre_slack/error_loggable.rb
 - app/models/concerns/collavre_slack/slack_dispatchable.rb
 - app/models/concerns/collavre_slack/slack_reaction_dispatchable.rb
 - app/services/collavre_slack/emoji_mapping.rb
@@ -110,6 +111,7 @@ files:
 - app/services/collavre_slack/slack_message_dispatcher.rb
 - app/views/collavre_slack/creatives/slack_integrations/index.html.erb
 - app/views/collavre_slack/integrations/_modal.html.erb
+- app/views/collavre_slack/slack_auth/callback_success.html.erb
 - config/initializers/collavre_slack.rb
 - config/locales/en.yml
 - config/locales/ko.yml