chat_sdk-teams 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6410c72972c0210380902fcf4a176c992c68d7c18154ff55f2a286fe1823a2
-  data.tar.gz: 59897106f6792d7ec3c73b76de36019fa1eb40126ec120bf28060fe35cc47cc2
+  metadata.gz: f16daba221cded2918a20444a752ac5c47d62579091e385fc09a916f9886cee9
+  data.tar.gz: 84470e0eaf8edc9eaeafd70d5e541ed0553c1ede14a1ee627f735d9f31aa8081
 SHA512:
-  metadata.gz: 485f8fea6b1f2702b71a7b1a78cbef630255c0a88d92d5b8e04a723bc30fd7629746eb9a84fc6e99871baec9dc488aeb7ee2bfebfaacf60a95e298f48a3b4571
-  data.tar.gz: f25e032254fee24a840cd7c14afd317ea45c279e404f2bfb6cf5a494d20803f980f2452d7e6a99e6f3d7b485a435c6cf4316682b3cdc3737fcd45eb5072ef8ab
+  metadata.gz: ea22ecba125cdbc9865e043d570ea2641cd4df7bd6cb841fed57e2fe999a9027c1194b874d07e6757ca9033268ec82466ec982ea41e1362695b356dd0f33f9e9
+  data.tar.gz: 140ab32b11655a4732c06d15d0911600d6730d92f8f49963340b7e7a056b9e3050e893cd67e923bd32dccf4ab7b06e7d1797538c267322fea093c379e2a55702

data/lib/chat_sdk/teams/activity_parser.rb

@@ -133,6 +133,10 @@ module ChatSDK
           action_id ||= action["verb"] if action.is_a?(Hash)
           action_id ||= data["actionId"] || data["action"] ||
             (action unless action.is_a?(Hash)) || activity["name"] || "invoke"
+          if action_id == AUTO_SUBMIT_ACTION_ID
+            return auto_submit_actions(data, activity, conversation_id, user)
+          end
+
           value = data["value"] || (nested_data unless nested_data.is_a?(Hash)) || data
           value = value.is_a?(Hash) ? JSON.generate(value) : value.to_s
 
@@ -223,6 +227,41 @@ module ChatSDK
           values.empty? ? nil : values
         end
 
+        def auto_submit_actions(data, activity, conversation_id, user)
+          values = auto_submit_values(data)
+          values = nil if values.empty?
+
+          data.each_with_object([]) do |(action_id, input_value), events|
+            next if %w[actionId msteams].include?(action_id)
+
+            events << ChatSDK::Events::Action.new(
+              action_id: action_id,
+              value: submit_value_to_string(input_value),
+              values: values,
+              user: user,
+              thread_id: conversation_id,
+              channel_id: conversation_id,
+              platform: :teams,
+              adapter_name: :teams,
+              raw: activity
+            )
+          end
+        end
+
+        def auto_submit_values(data)
+          data.each_with_object({}) do |(key, value), inputs|
+            next if %w[actionId msteams].include?(key)
+
+            input_value = submit_value_to_string(value)
+            inputs[key] = input_value unless input_value.nil?
+          end
+        end
+
+        def submit_value_to_string(value)
+          return value if value.is_a?(String)
+          value.to_s if value.is_a?(Numeric)
+        end
+
         def bot_mentioned?(activity, bot_app_id)
           return false unless bot_app_id
 

data/lib/chat_sdk/teams/adapter.rb

@@ -6,6 +6,7 @@ module ChatSDK
   module Teams
     class Adapter < ChatSDK::Adapter::Base
       DEFAULT_SERVICE_URL = "https://smba.trafficmanager.net/teams/"
+      USER_SERVICE_URL_TTL = 30 * 24 * 60 * 60
       VERIFIED_JWT_CLAIMS_ENV_KEY = "chat_sdk.teams.verified_jwt_claims"
 
       capabilities :edit_messages, :delete_messages, :threads, :direct_messages,
@@ -58,8 +59,10 @@ module ChatSDK
 
         conversation_id = activity.dig("conversation", "id")
         claims = rack_request.env[VERIFIED_JWT_CLAIMS_ENV_KEY]
-        if conversation_id && trusted_service_url?(activity["serviceUrl"], claims)
-          register_service_url(conversation_id, activity["serviceUrl"])
+        if trusted_service_url?(activity["serviceUrl"], claims)
+          register_service_url(conversation_id, activity["serviceUrl"]) if conversation_id
+          user_id = activity.dig("from", "id")
+          @state&.set(user_service_url_key(user_id), activity["serviceUrl"], ttl: USER_SERVICE_URL_TTL) if user_id
         end
 
         ActivityParser.parse(activity, bot_app_id: @app_id)
@@ -149,7 +152,7 @@ module ChatSDK
 
       def open_dm(user_id)
         require_capability!(:direct_messages)
-        service_url = @service_urls.values.first || @default_service_url
+        service_url = @state&.get(user_service_url_key(user_id)) || @service_urls.values.first || @default_service_url
 
         payload = {
           "bot" => {"id" => @app_id},
@@ -208,8 +211,10 @@ module ChatSDK
         @state&.set(service_url_key(conversation_id), service_url)
       end
 
-      def webhook_response(events)
-        return unless events.any? { |event| event.raw.is_a?(Hash) && event.raw["type"] == "invoke" }
+      def webhook_response(events, rack_request = nil)
+        invoke_activity = rack_request&.respond_to?(:body) && invoke_activity?(rack_request)
+        invoke_event = events.any? { |event| event.raw.is_a?(Hash) && event.raw["type"] == "invoke" }
+        return unless invoke_activity || invoke_event
 
         body = {
           "statusCode" => 200,
@@ -221,6 +226,13 @@ module ChatSDK
 
       private
 
+      def invoke_activity?(rack_request)
+        activity = read_json_body(rack_request)
+        activity.is_a?(Hash) && activity["type"] == "invoke"
+      rescue JSON::ParserError
+        false
+      end
+
       def build_activity(postable_message)
         activity = {"type" => "message"}
 
@@ -248,12 +260,7 @@ module ChatSDK
       end
 
       def service_url_for(channel_id)
-        url = @service_urls[channel_id]
-        if !url && @state
-          url = @state.get(service_url_key(channel_id))
-          @service_urls[channel_id] = url if url
-        end
-        url ||= @default_service_url
+        url = @service_urls[channel_id] || @state&.get(service_url_key(channel_id)) || @default_service_url
         unless url
           raise ChatSDK::PlatformError.new(
             "No service URL for conversation #{channel_id}. Register it first or receive an activity.",
@@ -267,6 +274,10 @@ module ChatSDK
         "chat_sdk:teams:service_url:#{conversation_id}"
       end
 
+      def user_service_url_key(user_id)
+        "chat_sdk:teams:user_service_url:#{user_id}"
+      end
+
       def trusted_service_url?(service_url, claims)
         return false unless service_url.is_a?(String)
 

data/lib/chat_sdk/teams/adaptive_card_renderer.rb

@@ -6,7 +6,10 @@ module ChatSDK
       def render(node)
         case node.type
         when :card then render_card(node)
-        else wrap_card([render_node(node)].compact)
+        else
+          rendered = render_node(node)
+          elements = rendered.is_a?(Array) ? rendered.flatten.compact : [rendered].compact
+          wrap_card(elements)
         end
       end
 
@@ -15,6 +18,13 @@ module ChatSDK
       def render_card(node)
         body = []
         pending_separator = false
+        if node.attributes[:image_url] && !node.attributes[:image_url].empty?
+          body << {
+            "type" => "Image",
+            "url" => node.attributes[:image_url],
+            "size" => "Stretch"
+          }
+        end
 
         node.children.each do |child|
           if child.type == :divider
@@ -25,16 +35,15 @@ module ChatSDK
           element = render_node(child)
           next unless element
 
+          elements = element.is_a?(Array) ? element.compact : [element]
+          next if elements.empty?
+
           if pending_separator
-            element["separator"] = true
+            elements.first["separator"] = true
             pending_separator = false
           end
 
-          if element.is_a?(Array)
-            body.concat(element)
-          else
-            body << element
-          end
+          body.concat(elements)
         end
 
         wrap_card(body, width: node.attributes[:width])
@@ -54,6 +63,7 @@ module ChatSDK
       def render_node(node)
         case node.type
         when :text then render_text(node)
+        when :link then render_link(node)
         when :divider then nil # handled in render_card
         when :image then render_image(node)
         when :fields then render_fields(node)
@@ -62,6 +72,7 @@ module ChatSDK
         when :button then render_action_submit(node)
         when :link_button then render_action_open_url(node)
         when :select then render_select(node)
+        when :radio_select then render_radio_select(node)
         when :text_input then render_text_input(node)
         when :table then render_table(node)
         when :chart then render_chart(node)
@@ -69,11 +80,22 @@ module ChatSDK
       end
 
       def render_text(node)
-        {
+        text = {
           "type" => "TextBlock",
           "text" => node.attributes[:content],
           "wrap" => true
         }
+        text["weight"] = "Bolder" if node.attributes[:style] == :bold
+        text["isSubtle"] = true if node.attributes[:style] == :muted
+        text
+      end
+
+      def render_link(node)
+        {
+          "type" => "TextBlock",
+          "text" => "[#{node.attributes[:label]}](#{node.attributes[:url]})",
+          "wrap" => true
+        }
       end
 
       def render_image(node)
@@ -124,19 +146,37 @@ module ChatSDK
       end
 
       def render_actions(node)
-        actions = node.children.filter_map { |child| render_action_element(child) }
-        {
-          "type" => "ActionSet",
-          "actions" => actions
-        }
-      end
+        elements = []
+        actions = []
+        has_inputs = false
+        has_buttons = false
 
-      def render_action_element(node)
-        case node.type
-        when :button then render_action_submit(node)
-        when :link_button then render_action_open_url(node)
-        when :select then render_select(node)
+        node.children.each do |child|
+          case child.type
+          when :button
+            has_buttons = true
+            actions << render_action_submit(child)
+          when :link_button
+            actions << render_action_open_url(child)
+          when :select
+            has_inputs = true
+            elements << render_select(child)
+          when :radio_select
+            has_inputs = true
+            elements << render_radio_select(child)
+          end
         end
+
+        if has_inputs && !has_buttons
+          actions << {
+            "type" => "Action.Submit",
+            "title" => "Submit",
+            "data" => {"actionId" => AUTO_SUBMIT_ACTION_ID}
+          }
+        end
+
+        elements << {"type" => "ActionSet", "actions" => actions} unless actions.empty?
+        elements
       end
 
       def render_action_submit(node)
@@ -163,6 +203,11 @@ module ChatSDK
         }
         action["id"] = node.attributes[:id] if node.attributes[:id]
         action["tooltip"] = node.attributes[:tooltip] if node.attributes[:tooltip]
+        if node.attributes[:style] == :primary
+          action["style"] = "positive"
+        elsif node.attributes[:style] == :danger
+          action["style"] = "destructive"
+        end
         action
       end
 
@@ -178,6 +223,30 @@ module ChatSDK
           end
         }
         input["placeholder"] = node.attributes[:placeholder] if node.attributes[:placeholder]
+        if [node.attributes[:label], node.attributes[:initial_option], node.attributes[:optional]].any? { |value| !value.nil? }
+          input["label"] = node.attributes[:label] if node.attributes[:label]
+          input["style"] = "compact"
+          input["isRequired"] = !node.attributes[:optional]
+        end
+        input["value"] = node.attributes[:initial_option] unless node.attributes[:initial_option].nil?
+        input
+      end
+
+      def render_radio_select(node)
+        input = {
+          "type" => "Input.ChoiceSet",
+          "id" => node.attributes[:id],
+          "label" => node.attributes[:label],
+          "style" => "expanded",
+          "isRequired" => !node.attributes[:optional],
+          "choices" => node.children.map do |option|
+            {
+              "title" => option.attributes[:text],
+              "value" => option.attributes[:value]
+            }
+          end
+        }
+        input["value"] = node.attributes[:initial_option] unless node.attributes[:initial_option].nil?
         input
       end
 
@@ -191,6 +260,7 @@ module ChatSDK
         }
         input["placeholder"] = node.attributes[:placeholder] if node.attributes[:placeholder]
         input["value"] = node.attributes[:value] unless node.attributes[:value].nil?
+        input["maxLength"] = node.attributes[:max_length] unless node.attributes[:max_length].nil?
         input
       end
 

data/lib/chat_sdk/teams.rb

@@ -8,6 +8,8 @@ require "zeitwerk"
 
 module ChatSDK
   module Teams
+    AUTO_SUBMIT_ACTION_ID = "__auto_submit"
+
     class << self
       def loader
         @loader ||= begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-teams
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Quentin Rousseau
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement