chat_sdk-x 0.8.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0268010c9db7fac8c879b00c0612242482c6d8a482b3a301b6817205c514a52
-  data.tar.gz: f5099d980b6c5c20731811fd48f560a88e8f9d79df40f08d37ecd699907fd4d9
+  metadata.gz: 257778cbe6b641d2d3183654dd217cc8e64fd0b82285192b25261f6b4cddf50f
+  data.tar.gz: 331da1b589a8eb037f5c74a78a41b32fe531602b377e70b340b1f8741a1df6d5
 SHA512:
-  metadata.gz: decc80efcb1b116b2cda75678f3f2ab53d42aafffe5f71d4a1bb0e1a6bce9befd91ed42017b7adea69ec5b1f6d0f8d1ef14aeb97acacea8aa54ad229b2ae7970
-  data.tar.gz: f9665c2b2642fab38b369888e88cfd3b5384b6d21d1da0f83e32157a4e1942eca97e6e39233ff64c6f827ec9f28ae253ed604eaf3708fb1fba23e0d19c86e5ea
+  metadata.gz: fba627f9a528ba56e8510aca008cd6500f9fd4c305853844e2c19c53c8d01d21449ceb4ff4c38a6383c0ebb92047716722bc6d0a5ec04d7ddc102340108d255c
+  data.tar.gz: b35c9f9f56f881c2f7f298746dca29a0cf50fba7f262516c80f37c2505a135510d9e88b6d32ea06fa794436ae8ce82b7c11ddcf46350cc0a1c43751a10a0856f

data/lib/chat_sdk/x/adapter.rb

@@ -13,15 +13,37 @@ module ChatSDK
 
       attr_reader :client
 
-      def initialize(access_token: nil, consumer_secret: nil, user_id: nil)
+      def initialize(access_token: nil, consumer_secret: nil, user_id: nil,
+        client_id: nil, client_secret: nil, refresh_token: nil)
         @access_token = access_token || ENV["X_ACCESS_TOKEN"]
         @consumer_secret = consumer_secret || ENV["X_CONSUMER_SECRET"]
         @user_id = user_id || ENV["X_USER_ID"]
-
-        raise ChatSDK::ConfigurationError, "X access_token required" unless @access_token
+        @client_id = client_id || ENV["X_CLIENT_ID"]
+        @client_secret = client_secret || ENV["X_CLIENT_SECRET"]
+        @refresh_token = refresh_token || ENV["X_REFRESH_TOKEN"]
+
+        # Validate: need either access_token (static) or client_id + refresh_token (managed OAuth)
+        has_oauth = @client_id && @refresh_token
+        if !@access_token && !has_oauth
+          raise ChatSDK::ConfigurationError,
+            "X requires either access_token or client_id + refresh_token"
+        end
         raise ChatSDK::ConfigurationError, "X consumer_secret required" unless @consumer_secret
 
-        @client = ApiClient.new(@access_token)
+        @client = ApiClient.new(
+          access_token: @access_token,
+          client_id: @client_id,
+          client_secret: @client_secret,
+          refresh_token: @refresh_token
+        )
+      end
+
+      # Inject state store after initialization (e.g., from Chat instance).
+      # Loads any previously persisted tokens so auth survives restarts.
+      def set_state(state)
+        @state = state
+        @client.state = state
+        @client.load_stored_token if @client_id
       end
 
       def name

data/lib/chat_sdk/x/api_client.rb

@@ -6,11 +6,23 @@ module ChatSDK
   module X
     class ApiClient < ChatSDK::ApiClient::Base
       BASE_URL = "https://api.x.com"
+      TOKEN_URL = "https://api.x.com/2/oauth2/token"
+      TOKEN_EXPIRY_MARGIN = 60 # seconds before expiry to trigger proactive refresh
 
-      def initialize(access_token)
+      def initialize(access_token: nil, client_id: nil, client_secret: nil,
+        refresh_token: nil, state: nil)
         @access_token = access_token
+        @client_id = client_id
+        @client_secret = client_secret
+        @refresh_token = refresh_token
+        @state = state
+        @token_expires_at = nil
+        @refresh_mutex = Mutex.new
       end
 
+      # Allow post-init state injection (called by adapter's set_state)
+      attr_writer :state
+
       def create_tweet(text:, reply_to: nil, media_ids: nil)
         body = {"text" => text}
         body["reply"] = {"in_reply_to_tweet_id" => reply_to} if reply_to
@@ -73,8 +85,26 @@ module ChatSDK
         request(:get, "/2/dm_conversations/with/#{participant_id}/dm_events?#{query}")
       end
 
+      # Load stored token data from state store (survives restarts)
+      def load_stored_token
+        return unless @state && @client_id
+
+        stored = @state.get(token_state_key)
+        return unless stored.is_a?(Hash)
+
+        @access_token = stored["access_token"] if stored["access_token"]
+        @refresh_token = stored["refresh_token"] if stored["refresh_token"]
+        @token_expires_at = Time.at(stored["expires_at"]) if stored["expires_at"]
+        @connection = nil # rebuild connection with loaded token
+      end
+
       private
 
+      def request(method, path, body = nil)
+        ensure_valid_token
+        super
+      end
+
       def base_url
         BASE_URL
       end
@@ -101,6 +131,78 @@ module ChatSDK
         seconds = reset.to_i - Time.now.to_i
         [seconds, 1].max
       end
+
+      # OAuth2 token refresh support
+
+      def ensure_valid_token
+        return unless @client_id # static token mode — no refresh
+        return if @token_expires_at && Time.now < @token_expires_at
+
+        @refresh_mutex.synchronize do
+          # Double-check after acquiring lock (another thread may have refreshed)
+          return if @token_expires_at && Time.now < @token_expires_at
+
+          refresh_access_token
+        end
+      end
+
+      def refresh_access_token
+        params = {
+          "grant_type" => "refresh_token",
+          "refresh_token" => @refresh_token
+        }
+        # Public client: client_id in body; Confidential client: Basic auth header
+        params["client_id"] = @client_id unless @client_secret
+
+        headers = {"Content-Type" => "application/x-www-form-urlencoded"}
+        if @client_secret
+          encoded = Base64.strict_encode64("#{@client_id}:#{@client_secret}")
+          headers["Authorization"] = "Basic #{encoded}"
+        end
+
+        response = Faraday.post(TOKEN_URL) do |req|
+          req.headers = headers
+          req.body = URI.encode_www_form(params)
+        end
+
+        unless response.success?
+          data = begin
+            JSON.parse(response.body)
+          rescue JSON::ParserError
+            {}
+          end
+          raise ChatSDK::PlatformError.new(
+            "X token refresh failed: #{data["error_description"] || response.status}",
+            status: response.status,
+            body: response.body,
+            adapter_name: :x
+          )
+        end
+
+        data = JSON.parse(response.body)
+        @access_token = data["access_token"]
+        @refresh_token = data["refresh_token"] # ROTATED — must persist
+        @token_expires_at = Time.now + (data["expires_in"]&.to_i || 7200) - TOKEN_EXPIRY_MARGIN
+
+        # Rebuild Faraday connection with new token
+        @connection = nil
+
+        persist_token
+      end
+
+      def token_state_key
+        "x:oauth:#{@client_id}"
+      end
+
+      def persist_token
+        return unless @state
+
+        @state.set(token_state_key, {
+          "access_token" => @access_token,
+          "refresh_token" => @refresh_token,
+          "expires_at" => @token_expires_at&.to_f
+        })
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-x
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  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