collavre_slack 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8e800e1e2f729af9f99e0ebedc8e070723ba61f194ee9df766fcdfdd27c933
-  data.tar.gz: 2737d507f261c19b3446afd84f8747d21cb849fcddfa5d139b2dbd9a9a7f96ad
+  metadata.gz: 9f8c6e3a4ad1e73641c6b9318e37714534c8e07b0a8d967c457f4ca1747eaa8e
+  data.tar.gz: '09e4084c8402be38a3429342d1b0988719338c584fee5002cef81b2462c3d7f4'
 SHA512:
-  metadata.gz: c66ed359c01fc4d3c8f95badd2a9b692c01369187da548f5c9620fde05c7391c8e9c9011b8ba5f98f5f3bcb6925d97b2491992a38258a85b1a6999f330180bb0
-  data.tar.gz: a86dad280226ab1c787e9c959b134fa4b1dde7245726a748620a396058171a3c21d2b469034c2bd2444fa9fbfc493d37b9980bf606a0f6ac2af6fad776426265
+  metadata.gz: db89b0c760d4a20219b0795aed1e127b230393fe8c2855556d812ce9ff7f6694725399815d962bbc872c9769cb136641f2b2288d58e09a74a05fc718211e7728
+  data.tar.gz: 23c172e7f68e4981d1c64ccb02a71418dc437ff91c2f4d218870dcde838e9d58e76f1472cca9a7564a57610f3a6f08d286747c1add643438686145a6ebbb1316

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

@@ -2,11 +2,10 @@ module CollavreSlack
   module Creatives
     class SlackIntegrationsController < ApplicationController
       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
@@ -37,7 +36,7 @@ module CollavreSlack
 
         # 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 +46,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 +56,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,9 +67,7 @@ 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
@@ -95,6 +87,10 @@ module CollavreSlack
         @creative = Collavre::Creative.find(params[:creative_id])
       end
 
+      def set_origin
+        @origin = @creative.effective_origin
+      end
+
       def fetch_channels(slack_account)
         client = SlackClient.new(access_token: slack_account.access_token)
         client.list_all_channels.map do |channel|

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/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.5"
 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.5
 platform: ruby
 authors:
 - Collavre
@@ -110,6 +110,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