ory-oathkeeper-client 0.0.0.alpha62 → 0.35.0.alpha1

data/lib/ory-oathkeeper-client/api_client.rb

@@ -3,10 +3,10 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
@@ -14,10 +14,9 @@ require 'date'
 require 'json'
 require 'logger'
 require 'tempfile'
-require 'time'
 require 'typhoeus'
 
-module OryOathkeeperClient
+module OryHydraClient
   class ApiClient
     # The Configuration object holding settings to be used in the API client.
     attr_accessor :config
@@ -87,7 +86,7 @@ module OryOathkeeperClient
     # @option opts [Object] :body HTTP body (JSON/XML)
     # @return [Typhoeus::Request] A Typhoeus Request
     def build_request(http_method, path, opts = {})
-      url = build_request_url(path, opts)
+      url = build_request_url(path)
       http_method = http_method.to_sym.downcase
 
       header_params = @default_headers.merge(opts[:header_params] || {})
@@ -155,44 +154,6 @@ module OryOathkeeperClient
       data
     end
 
-    # Save response body into a file in (the defined) temporary folder, using the filename
-    # from the "Content-Disposition" header if provided, otherwise a random filename.
-    # The response body is written to the file in chunks in order to handle files which
-    # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
-    # process can use.
-    #
-    # @see Configuration#temp_folder_path
-    def download_file(request)
-      tempfile = nil
-      encoding = nil
-      request.on_headers do |response|
-        content_disposition = response.headers['Content-Disposition']
-        if content_disposition && content_disposition =~ /filename=/i
-          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-          prefix = sanitize_filename(filename)
-        else
-          prefix = 'download-'
-        end
-        prefix = prefix + '-' unless prefix.end_with?('-')
-        encoding = response.body.encoding
-        tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-        @tempfile = tempfile
-      end
-      request.on_body do |chunk|
-        chunk.force_encoding(encoding)
-        tempfile.write(chunk)
-      end
-      request.on_complete do |response|
-        if tempfile
-          tempfile.close
-          @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                              "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                              "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                              "explicitly with `tempfile.delete`"
-        end
-      end
-    end
-
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -229,7 +190,7 @@ module OryOathkeeperClient
       begin
         data = JSON.parse("[#{body}]", :symbolize_names => true)[0]
       rescue JSON::ParserError => e
-        if %w(String Date Time).include?(return_type)
+        if %w(String Date DateTime).include?(return_type)
           data = body
         else
           raise e
@@ -254,9 +215,9 @@ module OryOathkeeperClient
         data.to_f
       when 'Boolean'
         data == true
-      when 'Time'
+      when 'DateTime'
         # parse date time (expecting ISO 8601 format)
-        Time.parse data
+        DateTime.parse data
       when 'Date'
         # parse date time (expecting ISO 8601 format)
         Date.parse data
@@ -274,9 +235,44 @@ module OryOathkeeperClient
           data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(return_type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
+        # models, e.g. Pet
+        OryHydraClient.const_get(return_type).build_from_hash(data)
+      end
+    end
+
+    # Save response body into a file in (the defined) temporary folder, using the filename
+    # from the "Content-Disposition" header if provided, otherwise a random filename.
+    # The response body is written to the file in chunks in order to handle files which
+    # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
+    # process can use.
+    #
+    # @see Configuration#temp_folder_path
+    def download_file(request)
+      tempfile = nil
+      encoding = nil
+      request.on_headers do |response|
+        content_disposition = response.headers['Content-Disposition']
+        if content_disposition && content_disposition =~ /filename=/i
+          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+          prefix = sanitize_filename(filename)
+        else
+          prefix = 'download-'
+        end
+        prefix = prefix + '-' unless prefix.end_with?('-')
+        encoding = response.body.encoding
+        tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
+        @tempfile = tempfile
+      end
+      request.on_body do |chunk|
+        chunk.force_encoding(encoding)
+        tempfile.write(chunk)
+      end
+      request.on_complete do |response|
+        tempfile.close if tempfile
+        @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                            "explicitly with `tempfile.delete`"
       end
     end
 
@@ -289,10 +285,10 @@ module OryOathkeeperClient
       filename.gsub(/.*[\/\\]/, '')
     end
 
-    def build_request_url(path, opts = {})
+    def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      @config.base_url(opts[:operation]) + path
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.
@@ -307,7 +303,7 @@ module OryOathkeeperClient
         case auth_setting[:in]
         when 'header' then header_params[auth_setting[:key]] = auth_setting[:value]
         when 'query'  then query_params[auth_setting[:key]] = auth_setting[:value]
-        else fail ArgumentError, 'Authentication token must be in `query` or `header`'
+        else fail ArgumentError, 'Authentication token must be in `query` of `header`'
         end
       end
     end

data/lib/ory-oathkeeper-client/api_error.rb

@@ -3,14 +3,14 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
-module OryOathkeeperClient
+module OryHydraClient
   class ApiError < StandardError
     attr_reader :code, :response_headers, :response_body
 

data/lib/ory-oathkeeper-client/configuration.rb

@@ -3,14 +3,14 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
-module OryOathkeeperClient
+module OryHydraClient
   class Configuration
     # Defines url scheme
     attr_accessor :scheme
@@ -21,18 +21,6 @@ module OryOathkeeperClient
     # Defines url base path
     attr_accessor :base_path
 
-    # Define server configuration index
-    attr_accessor :server_index
-
-    # Define server operation configuration index
-    attr_accessor :server_operation_index
-
-    # Default server variables
-    attr_accessor :server_variables
-
-    # Default server operation variables
-    attr_accessor :server_operation_variables
-
     # Defines API keys used with API Key authentications.
     #
     # @return [Hash] key: parameter name, value: parameter value (API key)
@@ -141,10 +129,6 @@ module OryOathkeeperClient
       @scheme = 'http'
       @host = 'localhost'
       @base_path = ''
-      @server_index = 0
-      @server_operation_index = {}
-      @server_variables = {}
-      @server_operation_variables = {}
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0
@@ -187,23 +171,17 @@ module OryOathkeeperClient
       @base_path = '' if @base_path == '/'
     end
 
-    # Returns base URL for specified operation based on server settings
-    def base_url(operation = nil)
-      index = server_operation_index.fetch(operation, server_index)
-      return "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') if index == nil
-
-      server_url(index, server_operation_variables.fetch(operation, server_variables), operation_server_settings[operation])
+    def base_url
+      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
     end
 
     # Gets API key (with prefix if set).
     # @param [String] param_name the parameter name of API key auth
-    def api_key_with_prefix(param_name, param_alias = nil)
-      key = @api_key[param_name]
-      key = @api_key.fetch(param_alias, key) unless param_alias.nil?
+    def api_key_with_prefix(param_name)
       if @api_key_prefix[param_name]
-        "#{@api_key_prefix[param_name]} #{key}"
+        "#{@api_key_prefix[param_name]} #{@api_key[param_name]}"
       else
-        key
+        @api_key[param_name]
       end
     end
 
@@ -222,23 +200,18 @@ module OryOathkeeperClient
     def server_settings
       [
         {
-          url: "",
+          url: "/",
           description: "No description provided",
         }
       ]
     end
 
-    def operation_server_settings
-      {
-      }
-    end
-
     # Returns URL based on server settings
     #
     # @param index array index of the server settings
     # @param variables hash of variable and the corresponding value
-    def server_url(index, variables = {}, servers = nil)
-      servers = server_settings if servers == nil
+    def server_url(index, variables = {})
+      servers = server_settings
 
       # check array index out of bound
       if (index < 0 || index >= servers.size)
@@ -248,12 +221,10 @@ module OryOathkeeperClient
       server = servers[index]
       url = server[:url]
 
-      return url unless server.key? :variables
-
       # go through variable and assign a value
       server[:variables].each do |name, variable|
         if variables.key?(name)
-          if (!server[:variables][name].key?(:enum_values) || server[:variables][name][:enum_values].include?(variables[name]))
+          if (server[:variables][name][:enum_values].include? variables[name])
             url.gsub! "{" + name.to_s + "}", variables[name]
           else
             fail ArgumentError, "The variable `#{name}` in the server URL has invalid value #{variables[name]}. Must be #{server[:variables][name][:enum_values]}."

data/lib/ory-oathkeeper-client/models/create_rule_created.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # A rule
   class CreateRuleCreated
     attr_accessor :payload
@@ -25,11 +24,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -47,13 +41,13 @@ module OryOathkeeperClient
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `OryOathkeeperClient::CreateRuleCreated` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::CreateRuleCreated` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `OryOathkeeperClient::CreateRuleCreated`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `OryHydraClient::CreateRuleCreated`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -109,9 +103,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -119,7 +111,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -131,8 +123,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -162,9 +154,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -190,7 +180,7 @@ module OryOathkeeperClient
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -213,7 +203,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/create_rule_forbidden.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # The standard error format
   class CreateRuleForbidden
     attr_accessor :payload
@@ -25,11 +24,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -47,13 +41,13 @@ module OryOathkeeperClient
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `OryOathkeeperClient::CreateRuleForbidden` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::CreateRuleForbidden` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `OryOathkeeperClient::CreateRuleForbidden`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `OryHydraClient::CreateRuleForbidden`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -109,9 +103,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -119,7 +111,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -131,8 +123,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -162,9 +154,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -190,7 +180,7 @@ module OryOathkeeperClient
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -213,7 +203,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/create_rule_forbidden_body.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # CreateRuleForbiddenBody CreateRuleForbiddenBody CreateRuleForbiddenBody CreateRuleForbiddenBody CreateRuleForbiddenBody CreateRuleForbiddenBody CreateRuleForbiddenBody create rule forbidden body
   class CreateRuleForbiddenBody
     # code
@@ -46,16 +45,11 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
         :'code' => :'Integer',
-        :'details' => :'Array<Object>',
+        :'details' => :'Array<Hash<String, Object>>',
         :'message' => :'String',
         :'reason' => :'String',
         :'request' => :'String',
@@ -73,13 +67,13 @@ module OryOathkeeperClient
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `OryOathkeeperClient::CreateRuleForbiddenBody` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::CreateRuleForbiddenBody` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `OryOathkeeperClient::CreateRuleForbiddenBody`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `OryHydraClient::CreateRuleForbiddenBody`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -162,9 +156,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -172,7 +164,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -184,8 +176,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -215,9 +207,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -243,7 +233,7 @@ module OryOathkeeperClient
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -266,7 +256,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end