followupboss_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e09dc895a09a254ed74cc7386a63c7d9e6fd4122c7aebe84a510111c79a44c
-  data.tar.gz: f2a2891e76c6ae01b836c70a56e0912327512b201639800eb591bfbc3f3552bb
+  metadata.gz: 1d1312cbac7957779291cc5318bd1935c88c3b01d3dfa05aab44ceee9fdd6d84
+  data.tar.gz: b7970a95962e3be54613ffd330f75201664a26c235815a0795223e004b8ff03d
 SHA512:
-  metadata.gz: fd32c62a15dd9de0dc40ebb494f681d8651dfda05aea30f3e3a3ecb96b308b17b1afc85ead1786660deac7d822d24a4e6a5390811a27a9e17b8bf3a0977581df
-  data.tar.gz: 211789660757346070247a8a2a8618d73f682e3f6ee7f6e8b34c55ac5e53cd4f8bdd62c71c26250ad704cde3f07a7c7b24a9792e9e932176d34cda980a559728
+  metadata.gz: b6dad911222d02c831b051d44f1e79c5de579c3bf2d4521b4fd605ff61304dece6fdcf2fbb7f1fabb20f60383917b32b829d4492eea41fba36b0c57c7ffc6714
+  data.tar.gz: 12048f77d3a9c3ca7c785b813032b14a14ccbd5ac65611fd0a2395f587947386408be399f81d75d9f18eea05ee8f0a5ff89ac2e22f1e872a0ec163f9bfa8dace

data/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2025-07-13
+
+### Fixed
+- **Multi-authentication system improvements**
+  - Enhanced client authentication handling
+  - Improved cookie-based authentication flow
+  - Better authentication middleware integration
+  - Fixed authentication configuration issues
+
+### Enhanced
+- **SharedInbox functionality** with improved authentication support
+- **User authentication** with additional auth features
+- **Cookie client** with better multi-auth support
+- **Configuration system** for handling multiple authentication methods
+
+### Updated
+- Documentation with multi-auth usage examples
+- README with enhanced authentication guidance
+
 ## [1.0.0] - 2025-01-07
 
 ### Major Release - Enhanced Fork

data/README.md

@@ -91,7 +91,15 @@ export FUB_API_KEY=your_api_key
 **Configuration Block:**
 ```ruby
 FubClient.configure do |config|
-  config.api_key = 'your_api_key'
+  # For Her-based resources
+  config.api_key = 'your_api_key_here'
+  
+  # Option 1: Direct cookie (use this OR the GIST option below, not both)
+  config.cookie = 'cookie string'
+
+  # Option 2: GIST + Encryption (cookie comes from encrypted GIST)
+  config.gist_url = "gist url"
+  config.encryption_key = "encryption key"
 end
 ```
 

data/followupboss_client.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.match(%r{\.gem$}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

data/lib/fub_client/client.rb

@@ -9,10 +9,18 @@ module FubClient
     # Allow explicitly setting the instance (for testing)
     class << self
       attr_writer :instance
+      
+      # Convenience method to access configuration
+      def config
+        FubClient.configuration
+      end
+      
+      # Alias for configuration
+      def configuration
+        FubClient.configuration
+      end
     end
 
-    attr_writer :api_key
-    attr_accessor :cookies, :subdomain
     attr_reader :her_api
 
     def initialize
@@ -20,19 +28,40 @@ module FubClient
     end
 
     def api_key
-      @api_key ||= ENV['FUB_API_KEY']
+      return @api_key if defined?(@api_key) && @api_key
+      FubClient.configuration.api_key || ENV['FUB_API_KEY']
+    end
+
+    def api_key=(value)
+      @api_key = value
+    end
+
+    def subdomain
+      return @subdomain if defined?(@subdomain) && @subdomain
+      FubClient.configuration.subdomain || ENV['FUB_SUBDOMAIN']
+    end
+
+    def subdomain=(value)
+      @subdomain = value
+    end
+
+    def cookies
+      return @cookies if defined?(@cookies) && @cookies
+      FubClient.configuration.cookie || ENV['FUB_COOKIE']
+    end
+
+    def cookies=(value)
+      @cookies = value
     end
 
     def api_uri
-      return @api_uri if @api_uri
-
-      @api_uri = if subdomain
-                   # Use subdomain-specific URL for cookie-based auth
-                   URI::HTTPS.build(host: "#{subdomain}.followupboss.com", path: "/api/#{API_VERSION}")
-                 else
-                   # Use default API URL for API key auth
-                   URI::HTTPS.build(host: API_URL, path: "/#{API_VERSION}")
-                 end
+      if use_cookies? && subdomain
+        # Use subdomain-specific URL for cookie-based auth
+        URI::HTTPS.build(host: "#{subdomain}.followupboss.com", path: "/api/#{API_VERSION}")
+      else
+        # Use default API URL for API key auth
+        URI::HTTPS.build(host: API_URL, path: "/#{API_VERSION}")
+      end
     end
 
     # Login to obtain cookies
@@ -164,7 +193,8 @@ module FubClient
 
     # Use cookie authentication?
     def use_cookies?
-      !@cookies.nil? && !@cookies.empty?
+      current_cookies = cookies
+      !current_cookies.nil? && !current_cookies.empty?
     end
 
     # Reset the HER API connection with current settings

data/lib/fub_client/configuration.rb

@@ -3,11 +3,11 @@ module FubClient
     attr_accessor :api_key, :subdomain, :gist_url, :encryption_key, :cookie
 
     def initialize
-      @api_key = ENV['FUB_API_KEY']
-      @subdomain = ENV['FUB_SUBDOMAIN']
-      @gist_url = ENV['FUB_GIST_URL']
-      @encryption_key = ENV['FUB_ENCRYPTION_KEY']
-      @cookie = ENV['FUB_COOKIE']
+      @api_key = ENV['FUB_API_KEY'] if ENV['FUB_API_KEY']
+      @subdomain = ENV['FUB_SUBDOMAIN'] if ENV['FUB_SUBDOMAIN']
+      @gist_url = ENV['FUB_GIST_URL'] if ENV['FUB_GIST_URL']
+      @encryption_key = ENV['FUB_ENCRYPTION_KEY'] if ENV['FUB_ENCRYPTION_KEY']
+      @cookie = ENV['FUB_COOKIE'] if ENV['FUB_COOKIE']
     end
 
     def valid?
@@ -46,9 +46,17 @@ module FubClient
 
   def self.configure
     yield(configuration) if block_given?
+    # Reset the client's Her API to pick up new configuration
+    if defined?(FubClient::Client) && FubClient::Client.instance
+      FubClient::Client.instance.reset_her_api
+    end
   end
 
   def self.reset_configuration!
     @configuration = Configuration.new
+    # Also reset the client's Her API if it exists
+    if defined?(FubClient::Client) && FubClient::Client.instance
+      FubClient::Client.instance.reset_her_api
+    end
   end
 end

data/lib/fub_client/cookie_client.rb

@@ -6,9 +6,10 @@ module FubClient
     def initialize(subdomain: nil, gist_url: nil, encryption_key: nil, cookie: nil)
       config = FubClient.configuration
 
-      @subdomain = subdomain || config.subdomain
-      @gist_url = gist_url || config.gist_url
-      @encryption_key = encryption_key || config.encryption_key
+      @subdomain = subdomain || config.subdomain || ENV['FUB_SUBDOMAIN']
+      @gist_url = gist_url || config.gist_url || ENV['FUB_GIST_URL']
+      @encryption_key = encryption_key || config.encryption_key || ENV['FUB_ENCRYPTION_KEY']
+      cookie ||= config.cookie || ENV['FUB_COOKIE']
 
       raise ArgumentError, 'Subdomain is required for cookie authentication' unless @subdomain
 
@@ -26,7 +27,7 @@ module FubClient
 
     def cookies=(value)
       @cookies = value
-      client.cookies = value if @cookies
+      # Don't modify the global client anymore
     end
 
     def client
@@ -34,13 +35,33 @@ module FubClient
     end
 
     def configure_client
-      client.subdomain = @subdomain
-      client.cookies = @cookies
-      client.reset_her_api
+      # Don't modify the global client - create our own Her API instance
+      @her_api = create_cookie_her_api
     end
 
     def reset_her_api
-      client.reset_her_api
+      @her_api = create_cookie_her_api
+    end
+
+    def her_api
+      @her_api ||= create_cookie_her_api
+    end
+
+    private
+
+    def create_cookie_her_api
+      api_uri = URI::HTTPS.build(host: "#{@subdomain}.followupboss.com", path: "/api/#{FubClient::Client::API_VERSION}")
+      
+      her_api = Her::API.new
+      her_api.setup url: api_uri.to_s do |c|
+        # Use cookie authentication middleware with our cookies
+        c.use FubClient::Middleware::CookieAuthentication, cookies: @cookies
+        c.request :url_encoded
+        c.use FubClient::Middleware::Parser
+        c.adapter :net_http
+      end
+      
+      her_api
     end
 
     def fetch_cookie_from_gist

data/lib/fub_client/middleware/cookie_authentication.rb

@@ -1,9 +1,23 @@
 module FubClient
   module Middleware
     class CookieAuthentication < Faraday::Middleware
+      def initialize(app, cookies: nil)
+        super(app)
+        @cookies = cookies
+      end
+      
       def call(env)
-        # Get the cookies from the client
-        cookies = FubClient::Client.instance.cookies
+        # Get the cookies from the parameter, client, or Her API instance
+        cookies = @cookies || FubClient::Client.instance.cookies
+        
+        # If still no cookies, try to get from the Her API instance
+        if (!cookies || cookies.empty?) && env[:request] && env[:request].respond_to?(:connection)
+          connection = env[:request].connection
+          if connection.respond_to?(:instance_variable_get)
+            api_cookies = connection.instance_variable_get(:@cookies)
+            cookies = api_cookies if api_cookies && !api_cookies.empty?
+          end
+        end
 
         if cookies && !cookies.empty?
           # CRITICAL: Must set a request header to enable cookie-based auth

data/lib/fub_client/shared_inbox.rb

@@ -103,45 +103,18 @@ module FubClient
     root_element :shared_inbox
     include_root_in_json true
 
-    def self.all_inboxes
-      puts 'Calling SharedInbox.all_inboxes using direct cookie authentication' if ENV['DEBUG']
+    def self.all_inboxes(cookie_client: nil)
+      puts 'Calling SharedInbox.all_inboxes using cookie authentication' if ENV['DEBUG']
 
-      client = FubClient::Client.instance
-      cookies = client.cookies
-      subdomain = client.subdomain
+      client = resolve_cookie_client(cookie_client)
+      return [] unless client
 
-      if !cookies || cookies.empty?
-        puts 'Error: No cookies available for authentication' if ENV['DEBUG']
-        return []
-      end
+      conn = create_faraday_connection_from_client(client)
+      return [] unless conn
 
-      if !subdomain || subdomain.empty?
-        puts 'Error: No subdomain set for authentication' if ENV['DEBUG']
-        return []
-      end
-
-      conn = Faraday.new(url: "https://#{subdomain}.followupboss.com") do |f|
-        f.headers['Cookie'] = cookies
-        f.headers['Accept'] = 'application/json, text/javascript, */*; q=0.01'
-        f.headers['Accept-Language'] = 'en-US,en;q=0.9'
-        f.headers['X-Requested-With'] = 'XMLHttpRequest'
-        f.headers['X-System'] = 'fub-spa'
-        f.headers['User-Agent'] =
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36'
-        f.adapter :net_http
-      end
-
-      response = conn.get('/api/v1/sharedInboxes?showAllBypass=true&limit=20&offset=0')
+      response = conn.get('/api/v1/sharedInboxes?showAllBypass=true&limit=200&offset=0')
 
       if ENV['DEBUG']
-        puts 'Request headers:'
-        conn.headers.each do |k, v|
-          if k.downcase == 'cookie' && v.length > 50
-            puts "  #{k}: #{v[0..50]}..."
-          else
-            puts "  #{k}: #{v}"
-          end
-        end
         puts "Response status: #{response.status}"
         puts "Response body: #{response.body[0..100]}..." if response.body && response.body.length > 100
       end
@@ -149,7 +122,7 @@ module FubClient
       if response.status == 200
         data = JSON.parse(response.body, symbolize_names: true)
         inboxes = data[:sharedInboxes] || []
-        puts "Found #{inboxes.count} shared inboxes via direct request" if ENV['DEBUG']
+        puts "Found #{inboxes.count} shared inboxes via cookie client" if ENV['DEBUG']
         inboxes
       else
         puts "Error: HTTP #{response.status} - #{response.body}" if ENV['DEBUG']
@@ -161,33 +134,14 @@ module FubClient
       []
     end
 
-    def self.get_inbox(id)
-      puts "Calling SharedInbox.get_inbox(#{id}) using direct cookie authentication" if ENV['DEBUG']
+    def self.get_inbox(id, cookie_client: nil)
+      puts "Calling SharedInbox.get_inbox(#{id}) using cookie authentication" if ENV['DEBUG']
 
-      client = FubClient::Client.instance
-      cookies = client.cookies
-      subdomain = client.subdomain
+      client = resolve_cookie_client(cookie_client)
+      return nil unless client
 
-      if !cookies || cookies.empty?
-        puts 'Error: No cookies available for authentication' if ENV['DEBUG']
-        return nil
-      end
-
-      if !subdomain || subdomain.empty?
-        puts 'Error: No subdomain set for authentication' if ENV['DEBUG']
-        return nil
-      end
-
-      conn = Faraday.new(url: "https://#{subdomain}.followupboss.com") do |f|
-        f.headers['Cookie'] = cookies
-        f.headers['Accept'] = 'application/json, text/javascript, */*; q=0.01'
-        f.headers['Accept-Language'] = 'en-US,en;q=0.9'
-        f.headers['X-Requested-With'] = 'XMLHttpRequest'
-        f.headers['X-System'] = 'fub-spa'
-        f.headers['User-Agent'] =
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36'
-        f.adapter :net_http
-      end
+      conn = create_faraday_connection_from_client(client)
+      return nil unless conn
 
       response = conn.get("/api/v1/sharedInboxes/#{id}")
 
@@ -212,7 +166,7 @@ module FubClient
         end
 
         if data.is_a?(Hash) && !data.empty?
-          puts "Found inbox with ID #{id} via direct request" if ENV['DEBUG']
+          puts "Found inbox with ID #{id} via cookie client" if ENV['DEBUG']
           data.extend(SharedInboxMethods)
           data
         else
@@ -229,6 +183,170 @@ module FubClient
       nil
     end
 
+    def self.update_inbox(id, attributes, cookie_client: nil, merge_with_existing: true)
+      puts "Calling SharedInbox.update_inbox(#{id}) using cookie authentication" if ENV['DEBUG']
+
+      client = resolve_cookie_client(cookie_client)
+      return nil unless client
+
+      # If merge_with_existing is true, get current inbox data and merge
+      if merge_with_existing
+        current_inbox = get_inbox(id, cookie_client: client)
+        unless current_inbox
+          puts 'Error: Could not retrieve current inbox data for merging' if ENV['DEBUG']
+          return nil
+        end
+
+        # Create full payload by merging existing data with new attributes
+        full_payload = {
+          name: current_inbox[:name],
+          phones: current_inbox[:phones] || [],
+          users: current_inbox[:users] || [],
+          replyFrom: current_inbox[:replyFrom] || "",
+          replyFromPersonalized: current_inbox[:replyFromPersonalized] || false,
+          officeHoursBehaviorType: current_inbox[:officeHoursBehaviorType] || "Voicemail",
+          officeHoursForwardNumber: current_inbox[:officeHoursForwardNumber] || [],
+          incomingForwardTeam: current_inbox[:incomingForwardTeam] || [],
+          agentViewAll: current_inbox[:agentViewAll] || 0,
+          incomingForwardNumber: current_inbox[:incomingForwardNumber] || [],
+          incomingBehaviorType: current_inbox[:incomingBehaviorType] || "Voicemail",
+          unansweredForwardNumber: current_inbox[:unansweredForwardNumber] || []
+        }.merge(attributes)
+        
+        puts "Merged payload with existing data" if ENV['DEBUG']
+      else
+        full_payload = attributes
+        puts "Using provided attributes without merging" if ENV['DEBUG']
+      end
+
+      conn = create_faraday_connection_from_client(client)
+      return nil unless conn
+
+      response = conn.put do |req|
+        req.url "/api/v1/sharedInboxes/#{id}"
+        req.headers['Content-Type'] = 'application/json; charset=UTF-8'
+        req.headers['X-FUB-JS-Version'] = '198593'
+        req.body = JSON.generate(full_payload)
+      end
+
+      if ENV['DEBUG']
+        puts "Update response status: #{response.status}"
+        puts "Update response body: #{response.body[0..200]}..." if response.body && response.body.length > 200
+      end
+
+      if [200, 204].include?(response.status)
+        if response.status == 200 && !response.body.empty?
+          data = JSON.parse(response.body, symbolize_names: true)
+          puts "Updated inbox with ID #{id} via cookie client" if ENV['DEBUG']
+          data.extend(SharedInboxMethods) if data.is_a?(Hash)
+          data
+        else
+          puts "Updated inbox with ID #{id} (no response body)" if ENV['DEBUG']
+          true
+        end
+      else
+        puts "Error updating inbox: HTTP #{response.status} - #{response.body}" if ENV['DEBUG']
+        nil
+      end
+    rescue StandardError => e
+      puts "Error in update_inbox: #{e.message}" if ENV['DEBUG']
+      puts e.backtrace.join("\n") if ENV['DEBUG']
+      nil
+    end
+
+    def self.find_by_phone(phone_number, cookie_client: nil)
+      puts "Calling SharedInbox.find_by_phone(#{phone_number}) using cookie authentication" if ENV['DEBUG']
+
+      client = resolve_cookie_client(cookie_client)
+      return nil unless client
+
+      # Get all inboxes (now with limit=200, should cover all 142 inboxes)
+      inboxes = all_inboxes(cookie_client: client)
+      return nil if inboxes.empty?
+
+      # Normalize the phone number for comparison (remove formatting)
+      normalized_search = normalize_phone(phone_number)
+      
+      puts "Searching #{inboxes.length} inboxes for phone: #{phone_number} (normalized: #{normalized_search})" if ENV['DEBUG']
+
+      # Search through all inboxes for matching phone number
+      matching_inbox = inboxes.find do |inbox|
+        phones = inbox[:phones] || []
+        phones.any? do |phone_obj|
+          phone = phone_obj[:phone] || phone_obj['phone']
+          next false unless phone
+          
+          normalized_inbox_phone = normalize_phone(phone)
+          match = normalized_inbox_phone == normalized_search
+          
+          if ENV['DEBUG']
+            puts "  Checking inbox '#{inbox[:name]}' phone '#{phone}' (normalized: #{normalized_inbox_phone}) - Match: #{match}"
+          end
+          
+          match
+        end
+      end
+
+      if matching_inbox
+        puts "Found matching inbox: '#{matching_inbox[:name]}' (ID: #{matching_inbox[:id]})" if ENV['DEBUG']
+        matching_inbox.extend(SharedInboxMethods)
+        matching_inbox
+      else
+        puts "No inbox found with phone number: #{phone_number}" if ENV['DEBUG']
+        nil
+      end
+    rescue StandardError => e
+      puts "Error in find_by_phone: #{e.message}" if ENV['DEBUG']
+      puts e.backtrace.join("\n") if ENV['DEBUG']
+      nil
+    end
+
+
+    private_class_method def self.resolve_cookie_client(cookie_client)
+      # Use provided cookie_client or try to create one from configuration
+      client = cookie_client || create_cookie_client
+      
+      unless client
+        puts 'Error: No cookie client available for authentication' if ENV['DEBUG']
+        return nil
+      end
+      
+      client
+    end
+
+    private_class_method def self.normalize_phone(phone_number)
+      # Remove all non-digit characters for comparison
+      return '' unless phone_number
+      phone_number.to_s.gsub(/\D/, '')
+    end
+
+    def self.create_cookie_client
+      config = FubClient.configuration
+      return nil unless config.has_cookie_auth?
+      
+      begin
+        FubClient::CookieClient.new
+      rescue => e
+        puts "Error creating cookie client: #{e.message}" if ENV['DEBUG']
+        nil
+      end
+    end
+
+    def self.create_faraday_connection_from_client(cookie_client)
+      return nil unless cookie_client && cookie_client.cookies && cookie_client.subdomain
+
+      Faraday.new(url: "https://#{cookie_client.subdomain}.followupboss.com") do |f|
+        f.headers['Cookie'] = cookie_client.cookies
+        f.headers['Accept'] = 'application/json, text/javascript, */*; q=0.01'
+        f.headers['Accept-Language'] = 'en-US,en;q=0.9'
+        f.headers['X-Requested-With'] = 'XMLHttpRequest'
+        f.headers['X-System'] = 'fub-spa'
+        f.headers['User-Agent'] =
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36'
+        f.adapter :net_http
+      end
+    end
+
     def self.create_faraday_connection
       client = FubClient::Client.instance
       cookies = client.cookies

data/lib/fub_client/user.rb

@@ -1,4 +1,25 @@
 module FubClient
   class User < Resource
+    # Add a method to get the relation if needed
+    def self.relation
+      Her::Model::Relation.new(self)
+    end
+
+    # Add convenience methods
+    def self.active
+      where(status: 'Active').to_a
+    end
+
+    def self.agents
+      where(role: 'Agent').to_a
+    end
+
+    def self.by_email(email)
+      where(email: email).first
+    end
+
+    def self.by_name(name)
+      where(name: name).first
+    end
   end
 end

data/lib/fub_client/version.rb

@@ -1,3 +1,3 @@
 module FubClient
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: followupboss_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Connor Gallopo
 - Kyoto Kopz
 bindir: exe
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel