clerk-sdk-ruby 5.1.1 → 5.1.3

data/lib/clerk/utils/request_bodies.rb

@@ -26,8 +26,6 @@ module Clerk
 
       return serialize_content_type(SERIALIZATION_METHOD_TO_CONTENT_TYPE[serialization_method], request) if !request.respond_to?(:fields) || !request.respond_to?(request_field_name)
 
-      request_val = request.send(request_field_name)
-
       request_metadata = nil
       request.fields.each do |f|
         if f.name == request_field_name
@@ -35,7 +33,14 @@ module Clerk
           break
         end
       end
-      raise StandardError, 'invalid request type' if request_metadata.nil?
+      if request_metadata.nil?
+        # Field name collision: model has a field matching request_field_name but without :request metadata.
+        # Serialize the entire object as the request body.
+        return serialize_content_type(SERIALIZATION_METHOD_TO_CONTENT_TYPE[serialization_method], request)
+      end
+
+      request_val = request.send(request_field_name)
+      return ['', nil, nil] if request_val.nil?
 
       serialize_content_type(
         request_metadata.fetch(:media_type, 'application/octet-stream'), request_val

data/lib/clerk/utils/security.rb

@@ -37,6 +37,16 @@ module Clerk
 
     
     def self._parse_security_option(req, option)
+      # Check if this option uses basic auth (needs the whole object, not individual fields)
+      first_field = option.fields.first
+      if first_field
+        first_meta = first_field.metadata[:security]
+        if first_meta && first_meta[:type] == 'http' && first_meta[:sub_type] == 'basic'
+          _parse_security_scheme(req, first_meta, option)
+          return
+        end
+      end
+
       option.fields.each do |opt_field|
         metadata = opt_field.metadata[:security]
         next if metadata.nil? || !metadata.include?(:scheme)

data/lib/clerk/utils/url.rb

@@ -24,7 +24,7 @@ module Clerk
         if serialization != ''
           serialized_params = _get_serialized_params(param_metadata, f_name, param)
           serialized_params.each do |k, v|
-            path = path.sub("{#{k}}", v.join(', '))
+            path = path.gsub("{#{k}}", v.join(', '))
           end
         else
           if param.is_a? Array
@@ -32,7 +32,7 @@ module Clerk
             param.each do |pp_val|
               pp_vals.append(pp_val.to_s)
             end
-            path = path.sub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
+            path = path.gsub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
           elsif param.is_a? Hash
             pp_vals = []
             param.each do |pp_key, pp_val|
@@ -44,7 +44,7 @@ module Clerk
                 pp_vals.append("#{pp_key},#{value}")
               end
             end
-            path = path.sub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
+            path = path.gsub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
           elsif param.class.include?(::Crystalline::MetadataFields)
             pp_vals = []
             attrs = param.fields.filter { |field| field.name && param.respond_to?(field.name.to_sym) }.map(&:name)
@@ -72,9 +72,9 @@ module Clerk
                 pp_vals.append("#{parm_name},#{param_field_val}")
               end
             end
-            path = path.sub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
+            path = path.gsub("{#{param_metadata.fetch(:field_name, f.name)}}", pp_vals.join(','))
           else
-            path = path.sub("{#{param_metadata.fetch(:field_name, f.name)}}", val_to_string(param))
+            path = path.gsub("{#{param_metadata.fetch(:field_name, f.name)}}", _encode_path_param(val_to_string(param)))
           end
         end
       end
@@ -82,6 +82,12 @@ module Clerk
       server_url.delete_suffix('/') + path
     end
 
+    # Percent-encode characters that are invalid in URI path segments
+    
+    def self._encode_path_param(value)
+      value.gsub(/[<>{}\[\]|\\^`\s?#%]/) { |c| format('%%%02X', c.ord) }
+    end
+
     
     def self.template_url(url_with_params, params)
       params.each do |key, value|

data/lib/clerk/utils/utils.rb

@@ -19,13 +19,43 @@ module Clerk
       if val.class.respond_to?(:enums)
         val.serialize.to_s
       elsif val.is_a? DateTime
-        val.strftime('%Y-%m-%dT%H:%M:%S.%NZ')
+        val.strftime('%Y-%m-%dT%H:%M:%S.%NZ').sub(/(\.\d*[1-9])0+Z\z/, '\1Z').sub(/\.0+Z\z/, 'Z')
       else
         val.to_s
 
       end
     end
 
+    MIME_TYPES = {
+      '.json' => 'application/json',
+      '.xml' => 'application/xml',
+      '.pdf' => 'application/pdf',
+      '.zip' => 'application/zip',
+      '.gz' => 'application/gzip',
+      '.csv' => 'text/csv',
+      '.txt' => 'text/plain',
+      '.html' => 'text/html',
+      '.htm' => 'text/html',
+      '.css' => 'text/css',
+      '.js' => 'application/javascript',
+      '.png' => 'image/png',
+      '.jpg' => 'image/jpeg',
+      '.jpeg' => 'image/jpeg',
+      '.gif' => 'image/gif',
+      '.svg' => 'image/svg+xml',
+      '.webp' => 'image/webp',
+      '.mp3' => 'audio/mpeg',
+      '.mp4' => 'video/mp4',
+      '.yaml' => 'application/yaml',
+      '.yml' => 'application/yaml',
+    }.freeze
+
+    
+    def self.mime_type_for_filename(filename)
+      ext = File.extname(filename).downcase
+      MIME_TYPES.fetch(ext, 'application/octet-stream')
+    end
+
     
     def self._get_serialized_params(metadata, field_name, obj)
       params = {}
@@ -143,7 +173,7 @@ module Clerk
             # Handle file uploads
             file_part = Faraday::Multipart::FilePart.new(
               StringIO.new(field[1]),
-              'application/octet-stream',
+              mime_type_for_filename(field[0]),
               field[0]
             )
             
@@ -158,7 +188,7 @@ module Clerk
             end
           end
         elsif field.length == 3
-          param_part = Faraday::Multipart::ParamPart.new(field[1].to_json, field[2])
+          param_part = Faraday::Multipart::ParamPart.new(field[1], field[2])
           
           # Handle multiple values for the same field name (arrays)
           if payload.key?(field_name)

data/lib/clerk/waitlistentries.rb

@@ -38,8 +38,10 @@ module Clerk
     end
 
 
+
+
     
-    def list(request:, retries: nil, timeout_ms: nil)
+    def list(request:, retries: nil, timeout_ms: nil, http_headers: nil)
       # list - List all waitlist entries
       # Retrieve a list of waitlist entries for the instance.
       # Entries are ordered by creation date in descending order by default.
@@ -93,6 +95,9 @@ module Clerk
           req.options.timeout = timeout unless timeout.nil?
           req.params = query_params
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -161,7 +166,7 @@ module Clerk
 
 
     
-    def create(request: nil, retries: nil, timeout_ms: nil)
+    def create(request: nil, retries: nil, timeout_ms: nil, http_headers: nil)
       # create - Create a waitlist entry
       # Creates a new waitlist entry for the given email address.
       # If the email address is already on the waitlist, no new entry will be created and the existing waitlist entry will be returned.
@@ -173,7 +178,7 @@ module Clerk
       req_content_type, data, form = Utils.serialize_request_body(request, false, true, :request, :json)
       headers['content-type'] = req_content_type
 
-      if form
+      if form && !form.empty?
         body = Utils.encode_form(form)
       elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
         body = URI.encode_www_form(data)
@@ -223,6 +228,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -306,15 +314,15 @@ module Clerk
 
 
     
-    def bulk_create(request: nil, retries: nil, timeout_ms: nil)
+    def bulk_create(request: nil, retries: nil, timeout_ms: nil, http_headers: nil)
       # bulk_create - Create multiple waitlist entries
       # Creates multiple waitlist entries for the provided email addresses.
       # You can choose whether to send confirmation emails by setting the `notify` parameter to `true` or `false` for each entry.
       # If the `notify` parameter is omitted, it defaults to `true`.
-      # 
+      #
       # If an email address is already on the waitlist, no new entry will be created and the existing waitlist entry will be returned.
       # Duplicate email addresses within the same request are not allowed.
-      # 
+      #
       # This endpoint is limited to a maximum of 50 entries per API call. If you need to add more entries, please make multiple requests.
       url, params = @sdk_configuration.get_server_details
       base_url = Utils.template_url(url, params)
@@ -324,7 +332,7 @@ module Clerk
       req_content_type, data, form = Utils.serialize_request_body(request, false, true, :request, :json)
       headers['content-type'] = req_content_type
 
-      if form
+      if form && !form.empty?
         body = Utils.encode_form(form)
       elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
         body = URI.encode_www_form(data)
@@ -374,6 +382,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -457,7 +468,7 @@ module Clerk
 
 
     
-    def delete(waitlist_entry_id:, retries: nil, timeout_ms: nil)
+    def delete(waitlist_entry_id:, retries: nil, timeout_ms: nil, http_headers: nil)
       # delete - Delete a pending waitlist entry
       # Delete a pending waitlist entry.
       request = Models::Operations::DeleteWaitlistEntryRequest.new(
@@ -515,6 +526,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -598,7 +612,7 @@ module Clerk
 
 
     
-    def invite(waitlist_entry_id:, body: nil, retries: nil, timeout_ms: nil)
+    def invite(waitlist_entry_id:, body: nil, retries: nil, timeout_ms: nil, http_headers: nil)
       # invite - Invite a waitlist entry
       # Send an invite to the email address in a waitlist entry.
       request = Models::Operations::InviteWaitlistEntryRequest.new(
@@ -618,7 +632,7 @@ module Clerk
       req_content_type, data, form = Utils.serialize_request_body(request, false, false, :body, :json)
       headers['content-type'] = req_content_type
 
-      if form
+      if form && !form.empty?
         body = Utils.encode_form(form)
       elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
         body = URI.encode_www_form(data)
@@ -668,6 +682,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -751,7 +768,7 @@ module Clerk
 
 
     
-    def reject(waitlist_entry_id:, retries: nil, timeout_ms: nil)
+    def reject(waitlist_entry_id:, retries: nil, timeout_ms: nil, http_headers: nil)
       # reject - Reject a waitlist entry
       # Reject a waitlist entry.
       request = Models::Operations::RejectWaitlistEntryRequest.new(
@@ -809,6 +826,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -889,5 +909,5 @@ module Clerk
 
       end
     end
-  end
+end
 end

data/lib/clerk/webhooks.rb

@@ -38,8 +38,10 @@ module Clerk
     end
 
 
+
+
     
-    def create_svix_app(retries: nil, timeout_ms: nil)
+    def create_svix_app(retries: nil, timeout_ms: nil, http_headers: nil)
       # create_svix_app - Create a Svix app
       # Create a Svix app and associate it with the current instance
       url, params = @sdk_configuration.get_server_details
@@ -89,6 +91,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -172,7 +177,7 @@ module Clerk
 
 
     
-    def delete_svix_app(retries: nil, timeout_ms: nil)
+    def delete_svix_app(retries: nil, timeout_ms: nil, http_headers: nil)
       # delete_svix_app - Delete a Svix app
       # Delete a Svix app and disassociate it from the current instance
       url, params = @sdk_configuration.get_server_details
@@ -222,6 +227,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -296,7 +304,7 @@ module Clerk
 
 
     
-    def generate_svix_auth_url(retries: nil, timeout_ms: nil)
+    def generate_svix_auth_url(retries: nil, timeout_ms: nil, http_headers: nil)
       # generate_svix_auth_url - Create a Svix Dashboard URL
       # Generate a new URL for accessing the Svix's management dashboard for that particular instance
       url, params = @sdk_configuration.get_server_details
@@ -346,6 +354,9 @@ module Clerk
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -426,5 +437,5 @@ module Clerk
 
       end
     end
-  end
+end
 end

data/lib/clerk_sdk_ruby.rb

@@ -37,6 +37,7 @@ module Clerk
   autoload :OauthApplications, 'clerk/oauthapplications'
   autoload :SamlConnections, 'clerk/samlconnections'
   autoload :TestingTokens, 'clerk/testingtokens'
+  autoload :AgentTasks, 'clerk/agenttasks'
   autoload :WaitlistEntries, 'clerk/waitlistentries'
   autoload :Billing, 'clerk/billing'
   autoload :OrganizationPermissions, 'clerk/organizationpermissions'

data/lib/crystalline/metadata_fields.rb

@@ -37,19 +37,30 @@ module Crystalline
       def unmarshal_single(field_type, value, format_metadata = nil)
         decoder = format_metadata.fetch(:decoder, nil)
 
-        if field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
+        # Delegate complex Crystalline types to unmarshal_json
+        if field_type.is_a?(Crystalline::DiscriminatedUnion) ||
+           Crystalline::Utils.arr?(field_type) ||
+           Crystalline::Utils.hash?(field_type) ||
+           Crystalline::Utils.union?(field_type)
+          return Crystalline.unmarshal_json(value, field_type)
+        elsif field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
           return field_type.from_dict(value)
         elsif field_type.to_s == 'Date'
           return Date.parse(value)
         elsif field_type.to_s == 'DateTime'
           return DateTime.parse(value)
         elsif field_type.to_s == 'Object'
-          # rubocop:disable Lint/SuppressedException
-          begin
-            value = JSON.parse(value)
-          rescue TypeError, JSON::ParserError
+          if value.is_a?(::String)
+            trimmed = value.lstrip
+            if trimmed.start_with?('{') || trimmed.start_with?('[')
+              # rubocop:disable Lint/SuppressedException
+              begin
+                value = JSON.parse(value)
+              rescue TypeError, JSON::ParserError
+              end
+              # rubocop:enable Lint/SuppressedException
+            end
           end
-          # rubocop:enable Lint/SuppressedException
           return value
         elsif field_type.to_s == 'Float'
           return value.to_f
@@ -65,12 +76,27 @@ module Crystalline
       def from_dict(d)
         to_build = {}
 
+        # Collect lookup keys for regular fields so we can identify additional properties later
+        known_keys = {}
+        additional_props_fields = []
         fields.each do |field|
+          format_metadata = field.metadata.fetch(:format_json, {})
+          if format_metadata.fetch(:additional_properties, false)
+            additional_props_fields << field
+          else
+            lookup = format_metadata.fetch(:letter_case, nil).call
+            known_keys[lookup] = true
+          end
+        end
+
+        # Process regular fields
+        (fields - additional_props_fields).each do |field|
           key = field.name
           format_metadata = field.metadata.fetch(:format_json, {})
+          field_type = field.type
+
           lookup = format_metadata.fetch(:letter_case, nil).call
           value = d[lookup]
-          field_type = field.type
           if ::Crystalline::Utils.nilable? field_type
             if value == 'null'
               to_build[key] = nil
@@ -78,7 +104,7 @@ module Crystalline
             end
             field_type = ::Crystalline::Utils.nilable_of(field_type)
           end
-          
+
           # If field is not nilable, and the value is not in the dict, raise a KeyError
           raise KeyError, "key #{lookup} not found in hash" if value.nil? && !::Crystalline::Utils.nilable?(field.type)
           # If field is nilable, and the value is not in the dict, just move to the next field
@@ -137,6 +163,32 @@ module Crystalline
             to_build[key] = unmarshal_single(field_type, value, format_metadata)
           end
         end
+
+        # Process additional properties fields: collect remaining keys from the dict
+        additional_props_fields.each do |field|
+          key = field.name
+          format_metadata = field.metadata.fetch(:format_json, {})
+          field_type = field.type
+
+          remaining = d.reject { |k, _| known_keys.key?(k) }
+          if remaining.empty?
+            next if ::Crystalline::Utils.nilable?(field.type)
+
+            raise KeyError, 'no additional properties found in hash'
+          end
+
+          inner_field_type = field_type
+          inner_field_type = ::Crystalline::Utils.nilable_of(inner_field_type) if ::Crystalline::Utils.nilable?(inner_field_type)
+          if Crystalline::Utils.hash?(inner_field_type)
+            val_type = Crystalline::Utils.hash_of(inner_field_type)
+            # rubocop:disable Style/HashTransformValues
+            to_build[key] = remaining.map { |k, v| [k, unmarshal_single(val_type, v, format_metadata)] }.to_h
+            # rubocop:enable Style/HashTransformValues
+          else
+            to_build[key] = remaining
+          end
+        end
+
         new(**to_build)
       end
     end
@@ -178,6 +230,8 @@ module Crystalline
       fields.sort_by(&:name).each do |field|
         format_json_meta = field.metadata[:format_json]
         required = !format_json_meta.nil? && format_json_meta.include?(:required)
+        is_additional_props = !format_json_meta.nil? && format_json_meta.fetch(:additional_properties, false)
+
         if !format_json_meta.nil? && format_json_meta.include?(:letter_case)
           key = format_json_meta[:letter_case].call(field.name)
         else
@@ -188,7 +242,10 @@ module Crystalline
         next if f.nil? && !required
         result[key] = nil if f.nil? && required
 
-        if f.is_a? ::Array
+        # Flatten additional properties into the parent object
+        if is_additional_props && f.is_a?(::Hash)
+          f.each { |k, v| result[k] = marshal_single(v) }
+        elsif f.is_a? ::Array
           result[key] = f.map { |o| marshal_single(o) }
         elsif f.is_a? ::Hash
           result[key] = f.transform_values { |v| marshal_single(v) }

data/lib/crystalline/module.rb

@@ -11,9 +11,9 @@ module Crystalline
   end
 
   def self.to_dict(complex)
-    if complex.is_a? Array
+    if complex.is_a? ::Array
       complex.map { |v| Crystalline.to_dict(v) }
-    elsif complex.is_a? Hash
+    elsif complex.is_a? ::Hash
       complex.transform_values { |v| Crystalline.to_dict(v) }
     elsif complex.respond_to?(:class) && complex.class.include?(::Crystalline::MetadataFields)
       complex.to_dict
@@ -66,7 +66,7 @@ module Crystalline
     if val.class.respond_to? :enums
       val.serialize
     elsif val.is_a? DateTime
-      val.strftime('%Y-%m-%dT%H:%M:%S.%NZ')
+      val.strftime('%Y-%m-%dT%H:%M:%S.%NZ').sub(/(\.\d*[1-9])0+Z\z/, '\1Z').sub(/\.0+Z\z/, 'Z')
     elsif val.nil?
       nil
     elsif primitives

data/lib/crystalline/types.rb

@@ -14,7 +14,7 @@ module Crystalline
 
   class Hash
     attr_accessor :key_type, :value_type
-    
+
     def initialize(key_type, value_type)
       @key_type = key_type
       @value_type = value_type
@@ -23,7 +23,7 @@ module Crystalline
 
   class Union
     attr_accessor :types
-    
+
     def initialize(*types)
       @types = types
     end
@@ -31,7 +31,7 @@ module Crystalline
 
   class Nilable
     attr_accessor :inner_type
-    
+
     def initialize(inner_type)
       @inner_type = inner_type
     end
@@ -142,6 +142,14 @@ module Crystalline
       @val
     end
 
+    def to_s
+      serialize.to_s
+    end
+
+    def inspect
+      "#<#{self.class} #{serialize.inspect}>"
+    end
+
     def known?
       self.class.instance_variable_get(:@mapping)&.value?(self) || false
     end