onesignal 1.0.0.beta1 → 2.2.0

data/lib/onesignal/api_client.rb

@@ -3,10 +3,10 @@
 
 #A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
 
-The version of the OpenAPI document: 1.0.0
+The version of the OpenAPI document: 1.4.0
 Contact: devrel@onesignal.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
@@ -90,10 +90,11 @@ module OneSignal
       url = build_request_url(path, opts)
       http_method = http_method.to_sym.downcase
 
+      opts[:header_params]['OS-Usage-Data'] = 'kind=sdk, sdk-name=onesignal-ruby, version=2.2.0'
       header_params = @default_headers.merge(opts[:header_params] || {})
-      header_params['OS-Usage-Data'] = 'kind=sdk, name=onesignal-ruby, version=1.0.0'
       query_params = opts[:query_params] || {}
       form_params = opts[:form_params] || {}
+      follow_location = opts[:follow_location] || true
 
       update_params_for_auth! header_params, query_params, opts[:auth_names]
 
@@ -110,7 +111,8 @@ module OneSignal
         :ssl_verifyhost => _verify_ssl_host,
         :sslcert => @config.cert_file,
         :sslkey => @config.key_file,
-        :verbose => @config.debugging
+        :verbose => @config.debugging,
+        :followlocation => follow_location
       }
 
       # set custom cert, if provided
@@ -297,7 +299,7 @@ module OneSignal
       @config.base_url(opts[:operation]) + path
     end
 
-    # Update hearder and query params based on authentication settings.
+    # Update header and query params based on authentication settings.
     #
     # @param [Hash] header_params Header parameters
     # @param [Hash] query_params Query parameters
@@ -336,8 +338,8 @@ module OneSignal
     # @param [Array] content_types array for Content-Type
     # @return [String] the Content-Type header  (e.g. application/json)
     def select_header_content_type(content_types)
-      # use application/json by default
-      return 'application/json' if content_types.nil? || content_types.empty?
+      # return nil by default
+      return if content_types.nil? || content_types.empty?
       # use JSON when present, otherwise use the first one
       json_content_type = content_types.find { |s| json_mime?(s) }
       json_content_type || content_types.first

data/lib/onesignal/api_error.rb

@@ -3,10 +3,10 @@
 
 #A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
 
-The version of the OpenAPI document: 1.0.0
+The version of the OpenAPI document: 1.4.0
 Contact: devrel@onesignal.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 

data/lib/onesignal/configuration.rb

@@ -3,10 +3,10 @@
 
 #A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
 
-The version of the OpenAPI document: 1.0.0
+The version of the OpenAPI document: 1.4.0
 Contact: devrel@onesignal.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
@@ -110,14 +110,15 @@ module OneSignal
     # https://github.com/typhoeus/ethon/blob/master/lib/ethon/easy/queryable.rb#L96
     attr_accessor :params_encoding
 
+
     attr_accessor :inject_format
 
     attr_accessor :force_ending_format
 
     def initialize
       @scheme = 'https'
-      @host = 'onesignal.com'
-      @base_path = '/api/v1'
+      @host = 'api.onesignal.com'
+      @base_path = ''
       @server_index = 0
       @server_operation_index = {}
       @server_variables = {}
@@ -126,9 +127,10 @@ module OneSignal
       @client_side_validation = true
       @verify_ssl = true
       @verify_ssl_host = true
-      @params_encoding = nil
       @cert_file = nil
       @key_file = nil
+      @timeout = 0
+      @params_encoding = nil
       @debugging = false
       @inject_format = false
       @force_ending_format = false
@@ -178,14 +180,14 @@ module OneSignal
             type: 'bearer',
             in: 'header',
             key: 'Authorization',
-            value: "Bearer token=\"#{ app_key }\""
+            value: "Key token=\"#{ app_key }\""
           },
         'user_key' =>
           {
             type: 'bearer',
             in: 'header',
             key: 'Authorization',
-            value: "Bearer token=\"#{ user_key }\""
+            value: "Key token=\"#{ user_key }\""
           },
       }
     end
@@ -194,7 +196,7 @@ module OneSignal
     def server_settings
       [
         {
-          url: "https://onesignal.com/api/v1",
+          url: "https://api.onesignal.com",
           description: "No description provided",
         }
       ]
@@ -238,5 +240,6 @@ module OneSignal
 
       url
     end
+
   end
 end

data/lib/onesignal/models/app.rb

@@ -3,10 +3,10 @@
 
 #A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
 
-The version of the OpenAPI document: 1.0.0
+The version of the OpenAPI document: 1.4.0
 Contact: devrel@onesignal.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
@@ -65,6 +65,18 @@ module OneSignal
     # Safari: Password for safari_apns_p12 file
     attr_accessor :safari_apns_p12_password
 
+    # iOS: Required if using p8. Unique identifier for the p8 authentication key.
+    attr_accessor :apns_key_id
+
+    # iOS: Required if using p8. Team ID generated by Apple for your developer account.
+    attr_accessor :apns_team_id
+
+    # iOS: Required if using p8. Bundle ID for your app in the Apple ecosystem.
+    attr_accessor :apns_bundle_id
+
+    # iOS: Required if using p8. Base64 encoded p8 key
+    attr_accessor :apns_p8
+
     # Safari (Recommended): The hostname to your website including http(s)://
     attr_accessor :safari_site_origin
 
@@ -136,6 +148,10 @@ module OneSignal
         :'safari_apns_certificates' => :'safari_apns_certificates',
         :'safari_apns_p12' => :'safari_apns_p12',
         :'safari_apns_p12_password' => :'safari_apns_p12_password',
+        :'apns_key_id' => :'apns_key_id',
+        :'apns_team_id' => :'apns_team_id',
+        :'apns_bundle_id' => :'apns_bundle_id',
+        :'apns_p8' => :'apns_p8',
         :'safari_site_origin' => :'safari_site_origin',
         :'safari_push_id' => :'safari_push_id',
         :'safari_icon_16_16' => :'safari_icon_16_16',
@@ -177,6 +193,10 @@ module OneSignal
         :'safari_apns_certificates' => :'String',
         :'safari_apns_p12' => :'String',
         :'safari_apns_p12_password' => :'String',
+        :'apns_key_id' => :'String',
+        :'apns_team_id' => :'String',
+        :'apns_bundle_id' => :'String',
+        :'apns_p8' => :'String',
         :'safari_site_origin' => :'String',
         :'safari_push_id' => :'String',
         :'safari_icon_16_16' => :'String',
@@ -194,6 +214,21 @@ module OneSignal
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'gcm_key',
+        :'chrome_web_origin',
+        :'chrome_key',
+        :'chrome_web_default_notification_icon',
+        :'chrome_web_sub_domain',
+        :'apns_env',
+        :'apns_certificates',
+        :'apns_key_id',
+        :'apns_team_id',
+        :'apns_bundle_id',
+        :'apns_p8',
+        :'safari_site_origin',
+        :'safari_push_id',
+        :'site_name',
+        :'basic_auth_key',
       ])
     end
 
@@ -288,6 +323,22 @@ module OneSignal
         self.safari_apns_p12_password = attributes[:'safari_apns_p12_password']
       end
 
+      if attributes.key?(:'apns_key_id')
+        self.apns_key_id = attributes[:'apns_key_id']
+      end
+
+      if attributes.key?(:'apns_team_id')
+        self.apns_team_id = attributes[:'apns_team_id']
+      end
+
+      if attributes.key?(:'apns_bundle_id')
+        self.apns_bundle_id = attributes[:'apns_bundle_id']
+      end
+
+      if attributes.key?(:'apns_p8')
+        self.apns_p8 = attributes[:'apns_p8']
+      end
+
       if attributes.key?(:'safari_site_origin')
         self.safari_site_origin = attributes[:'safari_site_origin']
       end
@@ -337,17 +388,12 @@ module OneSignal
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @id.nil?
-        invalid_properties.push('invalid value for "id", id cannot be nil.')
-      end
-
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @id.nil?
       apns_env_validator = EnumAttributeValidator.new('String', ["sandbox", "production"])
       return false unless apns_env_validator.valid?(@apns_env)
       true
@@ -387,6 +433,10 @@ module OneSignal
           safari_apns_certificates == o.safari_apns_certificates &&
           safari_apns_p12 == o.safari_apns_p12 &&
           safari_apns_p12_password == o.safari_apns_p12_password &&
+          apns_key_id == o.apns_key_id &&
+          apns_team_id == o.apns_team_id &&
+          apns_bundle_id == o.apns_bundle_id &&
+          apns_p8 == o.apns_p8 &&
           safari_site_origin == o.safari_site_origin &&
           safari_push_id == o.safari_push_id &&
           safari_icon_16_16 == o.safari_icon_16_16 &&
@@ -409,7 +459,7 @@ module OneSignal
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, name, players, messageable_players, updated_at, created_at, android_gcm_sender_id, gcm_key, chrome_web_origin, chrome_key, chrome_web_default_notification_icon, chrome_web_sub_domain, apns_env, apns_p12, apns_p12_password, apns_certificates, safari_apns_certificates, safari_apns_p12, safari_apns_p12_password, safari_site_origin, safari_push_id, safari_icon_16_16, safari_icon_32_32, safari_icon_64_64, safari_icon_128_128, safari_icon_256_256, site_name, basic_auth_key, organization_id, additional_data_is_root_payload].hash
+      [id, name, players, messageable_players, updated_at, created_at, android_gcm_sender_id, gcm_key, chrome_web_origin, chrome_key, chrome_web_default_notification_icon, chrome_web_sub_domain, apns_env, apns_p12, apns_p12_password, apns_certificates, safari_apns_certificates, safari_apns_p12, safari_apns_p12_password, apns_key_id, apns_team_id, apns_bundle_id, apns_p8, safari_site_origin, safari_push_id, safari_icon_16_16, safari_icon_32_32, safari_icon_64_64, safari_icon_128_128, safari_icon_256_256, site_name, basic_auth_key, organization_id, additional_data_is_root_payload].hash
     end
 
     # Builds the object from hash
@@ -424,6 +474,7 @@ module OneSignal
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       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)