zitadel-client 1.4.0 → 1.4.1

data/lib/zitadel-client/models/user_service_and_query.rb

@@ -13,7 +13,7 @@ Generator version: 7.12.0
 require 'date'
 require 'time'
 
-module ZitadelClient
+module ZitadelClient::Models
   # Connect multiple sub-condition with and AND operator.
   class UserServiceAndQuery
     # the sub queries to 'AND'
@@ -50,17 +50,19 @@ module ZitadelClient
     end
 
     # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
+    # @param [Hash] attributes Models 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 `ZitadelClient::UserServiceAndQuery` initialize method"
+        # MODIFIED: Updated class name in error message
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ZitadelClient::Models::UserServiceAndQuery` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ZitadelClient::UserServiceAndQuery`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          # MODIFIED: Updated class name in error message
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ZitadelClient::Models::UserServiceAndQuery`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -107,118 +109,126 @@ module ZitadelClient
       [queries].hash
     end
 
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      attributes = attributes.transform_keys(&:to_sym)
-      transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = nil
-        elsif 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[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
-          end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
-        end
-      end
-      new(transformed_hash)
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def self._deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = ZitadelClient.const_get(type)
-        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+# Builds the object from hash
+# @param [Hash] attributes Models attributes in the form of hash
+# @return [Object] Returns the model itself
+def self.build_from_hash(attributes)
+  return nil unless attributes.is_a?(Hash)
+  attributes = attributes.transform_keys(&:to_sym)
+  transformed_hash = {}
+  openapi_types.each_pair do |key, type|
+    if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      transformed_hash["#{key}"] = nil
+    elsif 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[attribute_map[key]].is_a?(Array)
+        transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
       end
+    elsif !attributes[attribute_map[key]].nil?
+      transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
     end
+  end
+  new(transformed_hash) # `new` will call the initialize method of the specific model class.
+end
 
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
+# Deserializes the data based on type
+# @param string type Data type
+# @param string value Value to be deserialized
+# @return [Object] Deserialized data
+def self._deserialize(type, value)
+  case type.to_sym
+  when :Time
+    Time.parse(value)
+  when :Date
+    Date.parse(value)
+  when :String
+    value.to_s
+  when :Integer
+    value.to_i
+  when :Float
+    value.to_f
+  when :Boolean
+    if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+      true
+    else
+      false
+    end
+  when :Object
+    # generic object (usually a Hash), return directly
+    value
+  when /\AArray<(?<inner_type>.+)>\z/
+    inner_type = Regexp.last_match[:inner_type]
+    value.map { |v| _deserialize(inner_type, v) }
+  when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+    k_type = Regexp.last_match[:k_type]
+    v_type = Regexp.last_match[:v_type]
+    {}.tap do |hash|
+      value.each do |k, v|
+        hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+      end
     end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
+  else # model
+    # models (e.g. Pet) or oneOf/anyOf constructs that resolve to a model name
+    # MODIFIED: Ensure model is looked up in the Models namespace
+    # 'type' here is expected to be the simple class name (e.g., "User", "OrderDetails")
+    klass = ZitadelClient::Models.const_get(type)
+    # The `klass.build` method is for oneOf/anyOf types (defined in partial_oneof_module.mustache / partial_anyof_module.mustache)
+    # The `klass.build_from_hash` is for regular model types (defined in this base_object.mustache itself)
+    if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_allOf)
+      klass.build(value) # For oneOf/anyOf/allOf, delegate to their specific build method
+    else
+      klass.build_from_hash(value) # For regular models
     end
+  end
+end
 
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
+# Returns the string representation of the object
+# @return [String] String presentation of the object
+def to_s
+  to_hash.to_s
+end
 
-        hash[param] = _to_hash(value)
-      end
-      hash
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
+# to_body is an alias to to_hash (backward compatibility)
+# @return [Hash] Returns the object in the form of hash
+def to_body
+  to_hash
+end
+
+# Returns the object in the form of hash
+# @return [Hash] Returns the object in the form of hash
+def to_hash
+  hash = {} # Calls super.to_hash if parent exists
+  self.class.attribute_map.each_pair do |attr, param|
+    value = self.send(attr)
+    if value.nil?
+      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
+end
+
+# Outputs non-array value in the form of hash
+# For object, use to_hash. Otherwise, just return the value
+# @param [Object] value Any valid value
+# @return [Hash] Returns the value in the form of hash
+def _to_hash(value)
+  if value.is_a?(Array)
+    value.compact.map { |v| _to_hash(v) }
+  elsif value.is_a?(Hash)
+    {}.tap do |hash|
+      value.each { |k, v| hash[k] = _to_hash(v) }
+    end
+  elsif value.respond_to? :to_hash
+    value.to_hash
+  else
+    value
+  end
+end
+
   end
 
 end

data/lib/zitadel-client/models/user_service_auth_factor.rb

@@ -13,7 +13,7 @@ Generator version: 7.12.0
 require 'date'
 require 'time'
 
-module ZitadelClient
+module ZitadelClient::Models
   class UserServiceAuthFactor
     attr_accessor :state
 
@@ -64,17 +64,19 @@ module ZitadelClient
     end
 
     # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
+    # @param [Hash] attributes Models 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 `ZitadelClient::UserServiceAuthFactor` initialize method"
+        # MODIFIED: Updated class name in error message
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ZitadelClient::Models::UserServiceAuthFactor` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ZitadelClient::UserServiceAuthFactor`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          # MODIFIED: Updated class name in error message
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ZitadelClient::Models::UserServiceAuthFactor`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -141,117 +143,125 @@ module ZitadelClient
       [state, otp, u2f, otp_sms, otp_email].hash
     end
 
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      return nil unless attributes.is_a?(Hash)
-      attributes = attributes.transform_keys(&:to_sym)
-      transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = nil
-        elsif 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[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
-          end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
-        end
+# Builds the object from hash
+# @param [Hash] attributes Models attributes in the form of hash
+# @return [Object] Returns the model itself
+def self.build_from_hash(attributes)
+  return nil unless attributes.is_a?(Hash)
+  attributes = attributes.transform_keys(&:to_sym)
+  transformed_hash = {}
+  openapi_types.each_pair do |key, type|
+    if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      transformed_hash["#{key}"] = nil
+    elsif 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[attribute_map[key]].is_a?(Array)
+        transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
       end
-      new(transformed_hash)
+    elsif !attributes[attribute_map[key]].nil?
+      transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
     end
+  end
+  new(transformed_hash) # `new` will call the initialize method of the specific model class.
+end
 
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def self._deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
-          end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = ZitadelClient.const_get(type)
-        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+# Deserializes the data based on type
+# @param string type Data type
+# @param string value Value to be deserialized
+# @return [Object] Deserialized data
+def self._deserialize(type, value)
+  case type.to_sym
+  when :Time
+    Time.parse(value)
+  when :Date
+    Date.parse(value)
+  when :String
+    value.to_s
+  when :Integer
+    value.to_i
+  when :Float
+    value.to_f
+  when :Boolean
+    if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+      true
+    else
+      false
+    end
+  when :Object
+    # generic object (usually a Hash), return directly
+    value
+  when /\AArray<(?<inner_type>.+)>\z/
+    inner_type = Regexp.last_match[:inner_type]
+    value.map { |v| _deserialize(inner_type, v) }
+  when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+    k_type = Regexp.last_match[:k_type]
+    v_type = Regexp.last_match[:v_type]
+    {}.tap do |hash|
+      value.each do |k, v|
+        hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
       end
     end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
+  else # model
+    # models (e.g. Pet) or oneOf/anyOf constructs that resolve to a model name
+    # MODIFIED: Ensure model is looked up in the Models namespace
+    # 'type' here is expected to be the simple class name (e.g., "User", "OrderDetails")
+    klass = ZitadelClient::Models.const_get(type)
+    # The `klass.build` method is for oneOf/anyOf types (defined in partial_oneof_module.mustache / partial_anyof_module.mustache)
+    # The `klass.build_from_hash` is for regular model types (defined in this base_object.mustache itself)
+    if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_allOf)
+      klass.build(value) # For oneOf/anyOf/allOf, delegate to their specific build method
+    else
+      klass.build_from_hash(value) # For regular models
     end
+  end
+end
 
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
+# Returns the string representation of the object
+# @return [String] String presentation of the object
+def to_s
+  to_hash.to_s
+end
 
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
-        end
+# to_body is an alias to to_hash (backward compatibility)
+# @return [Hash] Returns the object in the form of hash
+def to_body
+  to_hash
+end
 
-        hash[param] = _to_hash(value)
-      end
-      hash
+# Returns the object in the form of hash
+# @return [Hash] Returns the object in the form of hash
+def to_hash
+  hash = {} # Calls super.to_hash if parent exists
+  self.class.attribute_map.each_pair do |attr, param|
+    value = self.send(attr)
+    if value.nil?
+      is_nullable = self.class.openapi_nullable.include?(attr)
+      next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
     end
 
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
-      end
+    hash[param] = _to_hash(value)
+  end
+  hash
+end
+
+# Outputs non-array value in the form of hash
+# For object, use to_hash. Otherwise, just return the value
+# @param [Object] value Any valid value
+# @return [Hash] Returns the value in the form of hash
+def _to_hash(value)
+  if value.is_a?(Array)
+    value.compact.map { |v| _to_hash(v) }
+  elsif value.is_a?(Hash)
+    {}.tap do |hash|
+      value.each { |k, v| hash[k] = _to_hash(v) }
     end
+  elsif value.respond_to? :to_hash
+    value.to_hash
+  else
+    value
+  end
+end
 
   end
 

data/lib/zitadel-client/models/user_service_auth_factor_state.rb

@@ -13,7 +13,7 @@ Generator version: 7.12.0
 require 'date'
 require 'time'
 
-module ZitadelClient
+module ZitadelClient::Models
   class UserServiceAuthFactorState
     AUTH_FACTOR_STATE_UNSPECIFIED = "AUTH_FACTOR_STATE_UNSPECIFIED".freeze
     AUTH_FACTOR_STATE_NOT_READY = "AUTH_FACTOR_STATE_NOT_READY".freeze
@@ -36,7 +36,8 @@ module ZitadelClient
     # @return [String] The enum value
     def build_from_hash(value)
       return value if UserServiceAuthFactorState.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #UserServiceAuthFactorState"
+      raise "Invalid ENUM value #{value} for class #ZitadelClient::Models::UserServiceAuthFactorState"
     end
   end
+
 end