chat_sdk-slack 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c350492bf0bf3f0398f8146794cfd21c57218ac69c0eaa2fca06123e1ebd91cd
-  data.tar.gz: a538ab5f51da90868d3fd4b018ba33d98b97d703d952844909cdc614e5a08e10
+  metadata.gz: 17c05a1b3391a1d2f8a4a248fc2ee2e4048b5fbdf608cfd10becba0239f76cde
+  data.tar.gz: a5be2b1d3ac3738c28d92e53bc3209b4d565ceb3f08635e469c65e606e43cdc7
 SHA512:
-  metadata.gz: e5b9e7c785c898a7826562ce527b3a9dc5753adf42459f6248e3e0f363e5ec5478af2a959f8b2d30978ff8e7234c63838d8ee96a68172ac20c647f512073d61a
-  data.tar.gz: 0b78d5335690d409deedc6a69f45a57093ab559a35a0e20f1ee4518b883afc924f5919a4b2f46e1b50dc12fd443ae7eb9547c3c268daff1928c6db37244f1902
+  metadata.gz: f405de4643b259ed5477d52f2f6b733b4af2fb12eeb184a019ac9ac98d0aa982a8a156752f48aae95989e3ff6a1d5bf236255056e2e75c0d2ea58f7f886a1320
+  data.tar.gz: 99a0b0a0e7b9d85f17b203c483252dadd24a82269cce6b8776fe09153bc99215372c6275975dbef80c810a46aba34752efc85946546107cb21927edd11350d4d

data/lib/chat_sdk/slack/adapter.rb

@@ -8,22 +8,92 @@ module ChatSDK
         :streaming_edit, :threads, :direct_messages, :message_history,
         :scheduled_messages
 
-      attr_reader :client
-
-      def initialize(bot_token: nil, signing_secret: nil)
+      def initialize(bot_token: nil, signing_secret: nil,
+        client_id: nil, client_secret: nil)
         @bot_token = bot_token || ENV["SLACK_BOT_TOKEN"]
         @signing_secret = signing_secret || ENV["SLACK_SIGNING_SECRET"]
+        @client_id = client_id || ENV["SLACK_CLIENT_ID"]
+        @client_secret = client_secret || ENV["SLACK_CLIENT_SECRET"]
 
-        raise ChatSDK::ConfigurationError, "Slack bot_token required" unless @bot_token
+        unless @bot_token || @client_id
+          raise ChatSDK::ConfigurationError, "Slack bot_token or client_id required"
+        end
         raise ChatSDK::ConfigurationError, "Slack signing_secret required" unless @signing_secret
 
-        ::Slack.configure do |config|
-          config.token = @bot_token
+        if @bot_token
+          ::Slack.configure do |config|
+            config.token = @bot_token
+          end
+          @client = ::Slack::Web::Client.new(token: @bot_token)
         end
 
-        @client = ::Slack::Web::Client.new(token: @bot_token)
         @renderer = BlockKitRenderer.new
         @modal_renderer = ModalRenderer.new
+        @team_clients = {}
+      end
+
+      # Returns the per-request client (multi-workspace) or the static client (single-workspace).
+      def client
+        ::Thread.current[:chat_sdk_slack_client] || @client
+      end
+
+      # Inject state store after initialization (e.g., from Chat instance).
+      def set_state(state)
+        @state = state
+      end
+
+      # --- Multi-workspace installation management ---
+
+      def set_installation(team_id, bot_token:, bot_user_id: nil, team_name: nil)
+        raise ChatSDK::ConfigurationError, "Multi-workspace mode requires state" unless @state
+
+        @team_clients.delete(team_id)
+        @state.set(installation_key(team_id), {
+          "bot_token" => bot_token,
+          "bot_user_id" => bot_user_id,
+          "team_name" => team_name
+        })
+      end
+
+      def get_installation(team_id)
+        return nil unless @state
+
+        @state.get(installation_key(team_id))
+      end
+
+      def delete_installation(team_id)
+        @team_clients.delete(team_id)
+        return unless @state
+
+        @state.delete(installation_key(team_id))
+      end
+
+      def handle_oauth_callback(code:, redirect_uri: nil)
+        raise ChatSDK::ConfigurationError, "client_id required for OAuth" unless @client_id
+
+        temp_client = ::Slack::Web::Client.new
+        params = {
+          client_id: @client_id,
+          client_secret: @client_secret,
+          code: code
+        }
+        params[:redirect_uri] = redirect_uri if redirect_uri
+
+        result = temp_client.oauth_v2_access(**params)
+
+        team_id = result["team"]["id"]
+        installation = {
+          "bot_token" => result["access_token"],
+          "bot_user_id" => result["bot_user_id"],
+          "team_name" => result["team"]["name"]
+        }
+
+        set_installation(team_id,
+          bot_token: installation["bot_token"],
+          bot_user_id: installation["bot_user_id"],
+          team_name: installation["team_name"])
+
+        {team_id: team_id, installation: installation}
       end
 
       def name
@@ -74,6 +144,14 @@ module ChatSDK
         parsed = parse_body(body, rack_request.content_type)
         return [] unless parsed
 
+        # Multi-workspace: resolve per-team client from payload
+        # Clear any stale client from a previous request on this thread (Puma thread pool safety)
+        if @client_id
+          ::Thread.current[:chat_sdk_slack_client] = nil
+          team_id = parsed["team_id"] || parsed.dig("team", "id")
+          resolve_team_client(team_id) if team_id
+        end
+
         EventParser.parse(parsed)
       end
 
@@ -85,7 +163,7 @@ module ChatSDK
 
         apply_message_params(params, msg)
 
-        result = @client.chat_postMessage(**params)
+        result = client.chat_postMessage(**params)
 
         ChatSDK::Message.new(
           id: result["ts"],
@@ -104,11 +182,11 @@ module ChatSDK
 
         apply_message_params(params, msg)
 
-        @client.chat_update(**params)
+        client.chat_update(**params)
       end
 
       def delete_message(channel_id:, message_id:)
-        @client.chat_delete(channel: channel_id, ts: message_id)
+        client.chat_delete(channel: channel_id, ts: message_id)
       end
 
       def post_ephemeral(channel_id:, user_id:, message:, thread_id: nil)
@@ -118,26 +196,26 @@ module ChatSDK
 
         apply_message_params(params, msg)
 
-        @client.chat_postEphemeral(**params)
+        client.chat_postEphemeral(**params)
       end
 
       def upload_file(channel_id:, io:, filename:, thread_id: nil, comment: nil)
         params = {channels: channel_id, file: Faraday::Multipart::FilePart.new(io, nil, filename)}
         params[:thread_ts] = thread_id if thread_id
         params[:initial_comment] = comment if comment
-        @client.files_upload(**params)
+        client.files_upload(**params)
       end
 
       def add_reaction(channel_id:, message_id:, emoji:)
-        @client.reactions_add(channel: channel_id, timestamp: message_id, name: emoji)
+        client.reactions_add(channel: channel_id, timestamp: message_id, name: emoji)
       end
 
       def remove_reaction(channel_id:, message_id:, emoji:)
-        @client.reactions_remove(channel: channel_id, timestamp: message_id, name: emoji)
+        client.reactions_remove(channel: channel_id, timestamp: message_id, name: emoji)
       end
 
       def get_user(user_id)
-        result = @client.users_info(user: user_id)
+        result = client.users_info(user: user_id)
         return nil unless result&.dig("user", "id")
 
         ChatSDK::Author.new(
@@ -150,7 +228,7 @@ module ChatSDK
       end
 
       def open_dm(user_id)
-        result = @client.conversations_open(users: user_id)
+        result = client.conversations_open(users: user_id)
         result["channel"]["id"]
       end
 
@@ -161,7 +239,7 @@ module ChatSDK
         params = {channel: channel_id, text: text, post_at: post_at.to_i}
         params[:thread_ts] = thread_id if thread_id
 
-        result = @client.chat_scheduleMessage(**params)
+        result = client.chat_scheduleMessage(**params)
 
         ChatSDK::Message.new(
           id: result["scheduled_message_id"],
@@ -176,9 +254,9 @@ module ChatSDK
 
       def fetch_messages(channel_id:, thread_id: nil, cursor: nil, limit: 50)
         result = if thread_id
-          @client.conversations_replies(channel: channel_id, ts: thread_id, cursor: cursor, limit: limit)
+          client.conversations_replies(channel: channel_id, ts: thread_id, cursor: cursor, limit: limit)
         else
-          @client.conversations_history(channel: channel_id, cursor: cursor, limit: limit)
+          client.conversations_history(channel: channel_id, cursor: cursor, limit: limit)
         end
         messages = result["messages"].map { |m| parse_slack_message(m, channel_id) }
         [messages, result["response_metadata"]&.dig("next_cursor")]
@@ -186,15 +264,15 @@ module ChatSDK
 
       def open_modal(trigger_id:, modal:)
         view = @modal_renderer.render(modal)
-        @client.views_open(trigger_id: trigger_id, view: view)
+        client.views_open(trigger_id: trigger_id, view: view)
       end
 
       def publish_home_view(user_id:, view:)
-        @client.views_publish(user_id: user_id, view: view)
+        client.views_publish(user_id: user_id, view: view)
       end
 
       def set_suggested_prompts(channel_id:, thread_id:, prompts:)
-        @client.assistant_threads_setSuggestedPrompts(
+        client.assistant_threads_setSuggestedPrompts(
           channel_id: channel_id,
           thread_ts: thread_id,
           prompts: prompts
@@ -202,7 +280,7 @@ module ChatSDK
       end
 
       def set_assistant_status(channel_id:, thread_id:, status:)
-        @client.assistant_threads_setStatus(
+        client.assistant_threads_setStatus(
           channel_id: channel_id,
           thread_ts: thread_id,
           status: status
@@ -210,7 +288,7 @@ module ChatSDK
       end
 
       def set_assistant_title(channel_id:, thread_id:, title:)
-        @client.assistant_threads_setTitle(
+        client.assistant_threads_setTitle(
           channel_id: channel_id,
           thread_ts: thread_id,
           title: title
@@ -234,7 +312,7 @@ module ChatSDK
         app_token ||= ENV["SLACK_APP_TOKEN"]
         raise ChatSDK::ConfigurationError, "Slack app_token required for socket mode" unless app_token
 
-        socket = SocketMode.new(app_token: app_token, bot_client: @client)
+        socket = SocketMode.new(app_token: app_token, bot_client: client)
         socket.start(&block)
       end
 
@@ -252,6 +330,27 @@ module ChatSDK
 
       private
 
+      def resolve_team_client(team_id)
+        return unless @client_id && @state
+
+        cached = @team_clients[team_id]
+        if cached
+          ::Thread.current[:chat_sdk_slack_client] = cached
+          return
+        end
+
+        installation = get_installation(team_id)
+        return unless installation
+
+        new_client = ::Slack::Web::Client.new(token: installation["bot_token"])
+        @team_clients[team_id] = new_client
+        ::Thread.current[:chat_sdk_slack_client] = new_client
+      end
+
+      def installation_key(team_id)
+        "slack:installation:#{team_id}"
+      end
+
       def apply_message_params(params, msg)
         if msg.card?
           params[:blocks] = @renderer.render(msg.card)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-slack
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Quentin Rousseau
@@ -13,14 +13,14 @@ dependencies:
   name: chat_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency