chat_sdk-whatsapp 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a9c659c8408890113cd3a76002744ec05805a84b7f931bc3f5af5d3c8f12b92
-  data.tar.gz: f75e6904f0de6b2f29b3a7b069abc773044a31cfb189aa4f92ba9b25a9a1ef62
+  metadata.gz: b50c0867485e3db72c8642600094c6a648cd4c5f5030357d7b75c4448b3ddd86
+  data.tar.gz: 607a03f130b22a02077456128ec0490dd54d2df0d4789739a185c6ce72725191
 SHA512:
-  metadata.gz: 2a38e860754f4f1950c9e1353e46a1ab26bd16ab2e8ef4c18861ec79fc2a4a8d17c9a1e79b8e3a2bd8e6b2d305f74f6c08ebbb1a83c6dabc5274c5ab2c841113
-  data.tar.gz: 7b1be833a9084bd3e65b7a9ba27c795b61323115ae7c0457a3ab24bec9a26e95375f6de6d638f3c56def3895362ebee343df067aa555d0f3c87c21dbdf4569e1
+  metadata.gz: 8033901c11f50fe2d076a1f56db90d6c9f0793371c2a313841e7b09a2af76de34d9bcdb665125e8580fa30c77f6235ef3354da85ae9fbab1b536c5353a3426a6
+  data.tar.gz: e9e4577b34adeaaeded3213517a3c7ccfb41e4cda3f75577bd02f15134c2d9dd62a757114c284f27bd167ffac40df6b5876be77719d7cea6262bdaa6766f23aa

data/lib/chat_sdk/whatsapp/adapter.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "openssl"
-require "rack/utils"
-
 module ChatSDK
   module WhatsApp
     class Adapter < ChatSDK::Adapter::Base
+      include ChatSDK::Adapter::MetaVerification
+
       capabilities :direct_messages, :file_uploads, :reactions
 
       attr_reader :client
@@ -29,42 +28,15 @@ module ChatSDK
 
       # Inbound
       def verify_request!(rack_request)
-        signature = rack_request.get_header("HTTP_X_HUB_SIGNATURE_256")
-
-        unless signature
-          raise ChatSDK::SignatureVerificationError, "Missing WhatsApp signature header"
-        end
-
-        body = rack_request.body.read
-        rack_request.body.rewind
-
-        expected = "sha256=#{OpenSSL::HMAC.hexdigest("SHA256", @app_secret, body)}"
-
-        unless Rack::Utils.secure_compare(signature, expected)
-          raise ChatSDK::SignatureVerificationError, "Invalid WhatsApp signature"
-        end
-
-        true
+        verify_meta_signature!(rack_request, secret: @app_secret, platform_name: "WhatsApp")
       end
 
       def ack_response(rack_request)
-        return nil unless rack_request.get?
-
-        params = rack_request.params
-        mode = params["hub.mode"]
-        token = params["hub.verify_token"]
-        challenge = params["hub.challenge"]
-
-        if mode == "subscribe" && token == @verify_token
-          [200, {}, [challenge.to_s]]
-        end
+        meta_ack_response(rack_request, verify_token: @verify_token)
       end
 
       def parse_events(rack_request)
-        body = rack_request.body.read
-        rack_request.body.rewind
-
-        payload = JSON.parse(body)
+        payload = read_json_body(rack_request)
         EventParser.parse(payload, @phone_number_id)
       rescue JSON::ParserError
         []

data/lib/chat_sdk/whatsapp/api_client.rb

@@ -2,7 +2,7 @@
 
 module ChatSDK
   module WhatsApp
-    class ApiClient
+    class ApiClient < ChatSDK::ApiClient::Base
       BASE_URL = "https://graph.facebook.com/v21.0"
 
       def initialize(access_token, phone_number_id)
@@ -30,7 +30,7 @@ module ChatSDK
       end
 
       def upload_media(io:, filename:, content_type:)
-        response = media_connection.post("#{@phone_number_id}/media") do |req|
+        response = upload_connection.post("#{@phone_number_id}/media") do |req|
           req.body = {
             "messaging_product" => "whatsapp",
             "file" => Faraday::Multipart::FilePart.new(io, content_type, filename),
@@ -43,52 +43,21 @@ module ChatSDK
 
       private
 
-      def connection
-        @connection ||= build_connection { |f| f.request :json }
+      def base_url
+        BASE_URL
       end
 
-      def media_connection
-        @media_connection ||= build_connection { |f| f.request :multipart }
+      def adapter_name
+        :whatsapp
       end
 
-      def build_connection
-        Faraday.new(url: BASE_URL) do |f|
-          yield f
-          f.response :json
-          f.adapter :net_http
-          f.headers["Authorization"] = "Bearer #{@access_token}"
-        end
-      end
-
-      def request(method, path, body = nil)
-        response = connection.public_send(method, path) do |req|
-          req.body = body if body && method != :get
-        end
-
-        handle_response(response)
+      def configure_auth(faraday)
+        faraday.headers["Authorization"] = "Bearer #{@access_token}"
       end
 
-      def handle_response(response)
+      def extract_error_message(response)
         body = response.body
-        return body.is_a?(Hash) ? body : {} if response.success?
-
-        if response.status == 429
-          raise ChatSDK::RateLimitedError.new(
-            "WhatsApp API rate limited",
-            retry_after: nil,
-            status: response.status,
-            body: body,
-            adapter_name: :whatsapp
-          )
-        end
-
-        error_message = body.is_a?(Hash) ? body.dig("error", "message") : response.status
-        raise ChatSDK::PlatformError.new(
-          "WhatsApp API error: #{error_message}",
-          status: response.status,
-          body: body,
-          adapter_name: :whatsapp
-        )
+        body.is_a?(Hash) ? body.dig("error", "message") : response.status.to_s
       end
     end
   end

data/lib/chat_sdk/whatsapp/interactive_renderer.rb

@@ -3,6 +3,8 @@
 module ChatSDK
   module WhatsApp
     class InteractiveRenderer
+      include ChatSDK::Cards::TextHelpers
+
       def render(node)
         case node.type
         when :card then render_card(node)
@@ -75,26 +77,6 @@ module ChatSDK
         buttons
       end
 
-      def collect_text_parts(node)
-        parts = []
-        node.children.each do |child|
-          case child.type
-          when :text
-            parts << child.attributes[:content]
-          when :divider
-            parts << "---"
-          when :fields
-            child.children.each do |field|
-              parts << "#{field.attributes[:label]}: #{field.attributes[:value]}"
-            end
-          when :section
-            parts << child.attributes[:title] if child.attributes[:title]
-            parts.concat(collect_text_parts(child))
-          end
-        end
-        parts
-      end
-
       def render_single(node)
         case node.type
         when :text
@@ -103,12 +85,6 @@ module ChatSDK
           {text: node.fallback_text}
         end
       end
-
-      def truncate(text, max)
-        return "" unless text
-
-        (text.length > max) ? "#{text[0..max - 4]}..." : text
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-whatsapp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Quentin Rousseau