fastlane 2.155.2 → 2.157.1

data/spaceship/lib/spaceship/connect_api/token.rb

@@ -16,24 +16,65 @@ module Spaceship
       attr_reader :key_id
       attr_reader :issuer_id
       attr_reader :text
+      attr_reader :duration
+      attr_reader :expiration
 
-      def self.create(key_id: nil, issuer_id: nil, filepath: nil)
+      # Temporary attribute not needed to create the JWT text
+      # There is no way to determine if the team associated with this
+      # key is for App Store or Enterprise so this is the temporary workaround
+      attr_accessor :in_house
+
+      def self.from_json_file(filepath)
+        json = JSON.parse(File.read(filepath), { symbolize_names: true })
+
+        missing_keys = []
+        missing_keys << 'key_id' unless json.key?(:key_id)
+        missing_keys << 'issuer_id' unless json.key?(:issuer_id)
+        missing_keys << 'key' unless json.key?(:key)
+
+        unless missing_keys.empty?
+          raise "App Store Connect API key JSON is missing field(s): #{missing_keys.join(', ')}"
+        end
+
+        self.create(json)
+      end
+
+      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, duration: nil, in_house: nil)
         key_id ||= ENV['SPACESHIP_CONNECT_API_KEY_ID']
         issuer_id ||= ENV['SPACESHIP_CONNECT_API_ISSUER_ID']
         filepath ||= ENV['SPACESHIP_CONNECT_API_KEY_FILEPATH']
+        duration ||= ENV['SPACESHIP_CONNECT_API_TOKEN_DURATION']
+
+        in_house_env = ENV['SPACESHIP_CONNECT_API_IN_HOUSE']
+        in_house ||= !["", "no", "false", "off", "0"].include?(in_house_env) if in_house_env
+
+        key ||= ENV['SPACESHIP_CONNECT_API_KEY']
+        key ||= File.binread(filepath)
 
         self.new(
           key_id: key_id,
           issuer_id: issuer_id,
-          key: OpenSSL::PKey::EC.new(File.read(filepath))
+          key: OpenSSL::PKey::EC.new(key),
+          duration: duration,
+          in_house: in_house
         )
       end
 
-      def initialize(key_id: nil, issuer_id: nil, key: nil)
-        @expiration = Time.now + MAX_TOKEN_DURATION
+      def initialize(key_id: nil, issuer_id: nil, key: nil, duration: nil, in_house: nil)
         @key_id = key_id
         @key = key
         @issuer_id = issuer_id
+        @duration = duration
+        @in_house = in_house
+
+        @duration ||= MAX_TOKEN_DURATION
+        @duration = @duration.to_i if @duration
+
+        refresh!
+      end
+
+      def refresh!
+        @expiration = Time.now + @duration
 
         header = {
           kid: key_id
@@ -45,7 +86,7 @@ module Spaceship
           aud: 'appstoreconnect-v1'
         }
 
-        @text = JWT.encode(payload, key, 'ES256', header)
+        @text = JWT.encode(payload, @key, 'ES256', header)
       end
 
       def expired?

data/spaceship/lib/spaceship/connect_api/token_refresh_middleware.rb

@@ -0,0 +1,24 @@
+require 'faraday'
+
+require_relative 'token'
+require_relative '../globals'
+
+module Spaceship
+  class TokenRefreshMiddleware < Faraday::Middleware
+    def initialize(app, token)
+      @token = token
+      super(app)
+    end
+
+    def call(env)
+      if @token.expired?
+        puts("App Store Connect API token expired at #{@token.expiration}... refreshing") if Spaceship::Globals.verbose?
+        @token.refresh!
+      end
+
+      env.request_headers["Authorization"] = "Bearer #{@token.text}"
+
+      @app.call(env)
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/tunes/client.rb

@@ -1,27 +1,18 @@
-require_relative '../client'
+require_relative '../api_client'
+require_relative './tunes'
 require_relative '../../tunes/tunes_client'
 
 module Spaceship
   class ConnectAPI
     module Tunes
-      class Client < Spaceship::ConnectAPI::Client
-        def self.instance
-          # Verify there is a token or a client that can be used
-          if Spaceship::ConnectAPI.token
-            if @client.nil? || @client.token != Spaceship::ConnectAPI.token
-              @client = Client.new(token: Spaceship::ConnectAPI.token)
-            end
-          elsif Spaceship::Tunes.client
-            # Initialize new client if new or if team changed
-            if @client.nil? || @client.team_id != Spaceship::Tunes.client.team_id
-              @client = Client.client_with_authorization_from(Spaceship::Tunes.client)
-            end
-          end
+      class Client < Spaceship::ConnectAPI::APIClient
+        def initialize(cookie: nil, current_team_id: nil, token: nil, another_client: nil)
+          another_client ||= Spaceship::Tunes.client if cookie.nil? && token.nil?
 
-          # Need to handle not having a client but this shouldn't ever happen
-          raise "Please login using `Spaceship::Tunes.login('user', 'password')`" unless @client
+          super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
-          @client
+          self.extend(Spaceship::ConnectAPI::Tunes::API)
+          self.tunes_request_client = self
         end
 
         def self.hostname

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -3,932 +3,943 @@ require 'spaceship/connect_api/tunes/client'
 module Spaceship
   class ConnectAPI
     module Tunes
-      #
-      # ageRatingDeclarations
-      #
+      module API
+        def tunes_request_client=(tunes_request_client)
+          @tunes_request_client = tunes_request_client
+        end
 
-      def get_age_rating_declaration(app_store_version_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/ageRatingDeclaration", params)
-      end
+        def tunes_request_client
+          return @tunes_request_client if @tunes_request_client
+          raise TypeError, "You need to instantiate this module with tunes_request_client"
+        end
 
-      def patch_age_rating_declaration(age_rating_declaration_id: nil, attributes: nil)
-        body = {
-          data: {
-            type: "ageRatingDeclarations",
-            id: age_rating_declaration_id,
-            attributes: attributes
-          }
-        }
+        #
+        # ageRatingDeclarations
+        #
 
-        Client.instance.patch("ageRatingDeclarations/#{age_rating_declaration_id}", body)
-      end
+        def get_age_rating_declaration(app_store_version_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/ageRatingDeclaration", params)
+        end
 
-      #
-      # app
-      #
-
-      def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil, company_name: nil)
-        included = []
-        included << {
-          type: "appInfos",
-          id: "${new-appInfo-id}",
-          relationships: {
-            appInfoLocalizations: {
-              data: [
-                {
-                  type: "appInfoLocalizations",
-                  id: "${new-appInfoLocalization-id}"
-                }
-              ]
+        def patch_age_rating_declaration(age_rating_declaration_id: nil, attributes: nil)
+          body = {
+            data: {
+              type: "ageRatingDeclarations",
+              id: age_rating_declaration_id,
+              attributes: attributes
             }
           }
-        }
-        included << {
-          type: "appInfoLocalizations",
-          id: "${new-appInfoLocalization-id}",
-          attributes: {
-            locale: primary_locale,
-            name: name
-          }
-        }
 
-        platforms.each do |platform|
+          tunes_request_client.patch("ageRatingDeclarations/#{age_rating_declaration_id}", body)
+        end
+
+        #
+        # app
+        #
+
+        def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil, company_name: nil)
+          included = []
           included << {
-            type: "appStoreVersions",
-            id: "${store-version-#{platform}}",
-            attributes: {
-              platform: platform,
-              versionString: version_string
-            },
+            type: "appInfos",
+            id: "${new-appInfo-id}",
             relationships: {
-              appStoreVersionLocalizations: {
+              appInfoLocalizations: {
                 data: [
                   {
-                    type: "appStoreVersionLocalizations",
-                    id: "${new-#{platform}VersionLocalization-id}"
+                    type: "appInfoLocalizations",
+                    id: "${new-appInfoLocalization-id}"
                   }
                 ]
               }
             }
           }
-
           included << {
-            type: "appStoreVersionLocalizations",
-            id: "${new-#{platform}VersionLocalization-id}",
+            type: "appInfoLocalizations",
+            id: "${new-appInfoLocalization-id}",
             attributes: {
-              locale: primary_locale
+              locale: primary_locale,
+              name: name
             }
           }
-        end
 
-        app_store_verions_data = platforms.map do |platform|
-          {
-            type: "appStoreVersions",
-            id: "${store-version-#{platform}}"
-          }
-        end
-
-        relationships = {
-          appStoreVersions: {
-            data: app_store_verions_data
-          },
-          appInfos: {
-            data: [
-              {
-                type: "appInfos",
-                id: "${new-appInfo-id}"
+          platforms.each do |platform|
+            included << {
+              type: "appStoreVersions",
+              id: "${store-version-#{platform}}",
+              attributes: {
+                platform: platform,
+                versionString: version_string
+              },
+              relationships: {
+                appStoreVersionLocalizations: {
+                  data: [
+                    {
+                      type: "appStoreVersionLocalizations",
+                      id: "${new-#{platform}VersionLocalization-id}"
+                    }
+                  ]
+                }
               }
-            ]
-          }
-        }
-
-        app_attributes = {
-          sku: sku,
-          primaryLocale: primary_locale,
-          bundleId: bundle_id
-        }
-        app_attributes[:companyName] = company_name if company_name
+            }
 
-        body = {
-          data: {
-            type: "apps",
-            attributes: app_attributes,
-            relationships: relationships
-          },
-          included: included
-        }
+            included << {
+              type: "appStoreVersionLocalizations",
+              id: "${new-#{platform}VersionLocalization-id}",
+              attributes: {
+                locale: primary_locale
+              }
+            }
+          end
 
-        Client.instance.post("apps", body)
-      end
+          app_store_verions_data = platforms.map do |platform|
+            {
+              type: "appStoreVersions",
+              id: "${store-version-#{platform}}"
+            }
+          end
 
-      def patch_app(app_id: nil, attributes: {}, app_price_tier_id: nil, territory_ids: nil)
-        relationships = {}
-        included = []
+          relationships = {
+            appStoreVersions: {
+              data: app_store_verions_data
+            },
+            appInfos: {
+              data: [
+                {
+                  type: "appInfos",
+                  id: "${new-appInfo-id}"
+                }
+              ]
+            }
+          }
 
-        # Price tier
-        unless app_price_tier_id.nil?
-          relationships[:prices] = {
-            data: [
-              {
-                type: "appPrices",
-                id: "${price1}"
-              }
-            ]
+          app_attributes = {
+            sku: sku,
+            primaryLocale: primary_locale,
+            bundleId: bundle_id
           }
+          app_attributes[:companyName] = company_name if company_name
 
-          included << {
-            type: "appPrices",
-            id: "${price1}",
-            attributes: {
-              startDate: nil
+          body = {
+            data: {
+              type: "apps",
+              attributes: app_attributes,
+              relationships: relationships
             },
-            relationships: {
-              app: {
-                data: {
-                  type: "apps",
-                  id: app_id
+            included: included
+          }
+
+          tunes_request_client.post("apps", body)
+        end
+
+        def patch_app(app_id: nil, attributes: {}, app_price_tier_id: nil, territory_ids: nil)
+          relationships = {}
+          included = []
+
+          # Price tier
+          unless app_price_tier_id.nil?
+            relationships[:prices] = {
+              data: [
+                {
+                  type: "appPrices",
+                  id: "${price1}"
                 }
+              ]
+            }
+
+            included << {
+              type: "appPrices",
+              id: "${price1}",
+              attributes: {
+                startDate: nil
               },
-              priceTier: {
-                data: {
-                  type: "appPriceTiers",
-                  id: app_price_tier_id.to_s
+              relationships: {
+                app: {
+                  data: {
+                    type: "apps",
+                    id: app_id
+                  }
+                },
+                priceTier: {
+                  data: {
+                    type: "appPriceTiers",
+                    id: app_price_tier_id.to_s
+                  }
                 }
               }
             }
-          }
-        end
+          end
 
-        # Territories
-        territories_data = (territory_ids || []).map do |id|
-          { type: "territories", id: id }
-        end
-        unless territories_data.empty?
-          relationships[:availableTerritories] = {
-            data: territories_data
-          }
-        end
+          # Territories
+          territories_data = (territory_ids || []).map do |id|
+            { type: "territories", id: id }
+          end
+          unless territories_data.empty?
+            relationships[:availableTerritories] = {
+              data: territories_data
+            }
+          end
 
-        # Data
-        data = {
-          type: "apps",
-          id: app_id
-        }
-        data[:attributes] = attributes unless attributes.empty?
-        data[:relationships] = relationships unless relationships.empty?
+          # Data
+          data = {
+            type: "apps",
+            id: app_id
+          }
+          data[:attributes] = attributes unless attributes.empty?
+          data[:relationships] = relationships unless relationships.empty?
 
-        # Body
-        body = {
-          data: data
-        }
-        body[:included] = included unless included.empty?
+          # Body
+          body = {
+            data: data
+          }
+          body[:included] = included unless included.empty?
 
-        Client.instance.patch("apps/#{app_id}", body)
-      end
+          tunes_request_client.patch("apps/#{app_id}", body)
+        end
 
-      #
-      # appPreview
-      #
+        #
+        # appPreview
+        #
 
-      def get_app_preview(app_preview_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appPreviews/#{app_preview_id}", params)
-      end
+        def get_app_preview(app_preview_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appPreviews/#{app_preview_id}", params)
+        end
 
-      def post_app_preview(app_preview_set_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appPreviews",
-            attributes: attributes,
-            relationships: {
-              appPreviewSet: {
-                data: {
-                  type: "appPreviewSets",
-                  id: app_preview_set_id
+        def post_app_preview(app_preview_set_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appPreviews",
+              attributes: attributes,
+              relationships: {
+                appPreviewSet: {
+                  data: {
+                    type: "appPreviewSets",
+                    id: app_preview_set_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appPreviews", body)
-      end
+          tunes_request_client.post("appPreviews", body)
+        end
 
-      def patch_app_preview(app_preview_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appPreviews",
-            id: app_preview_id,
-            attributes: attributes
+        def patch_app_preview(app_preview_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appPreviews",
+              id: app_preview_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appPreviews/#{app_preview_id}", body)
-      end
+          tunes_request_client.patch("appPreviews/#{app_preview_id}", body)
+        end
 
-      def delete_app_preview(app_preview_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appPreviews/#{app_preview_id}", params)
-      end
+        def delete_app_preview(app_preview_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appPreviews/#{app_preview_id}", params)
+        end
 
-      #
-      # appPreviewSets
-      #
+        #
+        # appPreviewSets
+        #
 
-      def get_app_preview_sets(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appPreviewSets", params)
-      end
+        def get_app_preview_sets(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appPreviewSets", params)
+        end
 
-      def get_app_preview_set(app_preview_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appPreviewSets/#{app_preview_set_id}", params)
-      end
+        def get_app_preview_set(app_preview_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appPreviewSets/#{app_preview_set_id}", params)
+        end
 
-      def post_app_preview_set(app_store_version_localization_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appPreviewSets",
-            attributes: attributes,
-            relationships: {
-              appStoreVersionLocalization: {
-                data: {
-                  type: "appStoreVersionLocalizations",
-                  id: app_store_version_localization_id
+        def post_app_preview_set(app_store_version_localization_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appPreviewSets",
+              attributes: attributes,
+              relationships: {
+                appStoreVersionLocalization: {
+                  data: {
+                    type: "appStoreVersionLocalizations",
+                    id: app_store_version_localization_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appPreviewSets", body)
-      end
+          tunes_request_client.post("appPreviewSets", body)
+        end
 
-      def patch_app_preview_set_previews(app_preview_set_id: nil, app_preview_ids: nil)
-        app_preview_ids ||= []
+        def patch_app_preview_set_previews(app_preview_set_id: nil, app_preview_ids: nil)
+          app_preview_ids ||= []
 
-        body = {
-          data: app_preview_ids.map do |app_preview_id|
-            {
-              type: "appPreviews",
-              id: app_preview_id
-            }
-          end
-        }
+          body = {
+            data: app_preview_ids.map do |app_preview_id|
+              {
+                type: "appPreviews",
+                id: app_preview_id
+              }
+            end
+          }
 
-        Client.instance.patch("appPreviewSets/#{app_preview_set_id}/relationships/appPreviews", body)
-      end
+          tunes_request_client.patch("appPreviewSets/#{app_preview_set_id}/relationships/appPreviews", body)
+        end
 
-      #
-      # availableTerritories
-      #
+        #
+        # availableTerritories
+        #
 
-      def get_available_territories(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps/#{app_id}/availableTerritories", params)
-      end
+        def get_available_territories(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("apps/#{app_id}/availableTerritories", params)
+        end
 
-      #
-      # appPrices
-      #
+        #
+        # appPrices
+        #
 
-      def get_app_prices(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appPrices", params)
-      end
+        def get_app_prices(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appPrices", params)
+        end
 
-      #
-      # appReviewAttachments
-      #
+        #
+        # appReviewAttachments
+        #
 
-      def post_app_store_review_attachment(app_store_review_detail_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreReviewAttachments",
-            attributes: attributes,
-            relationships: {
-              appStoreReviewDetail: {
-                data: {
-                  type: "appStoreReviewDetails",
-                  id: app_store_review_detail_id
+        def post_app_store_review_attachment(app_store_review_detail_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreReviewAttachments",
+              attributes: attributes,
+              relationships: {
+                appStoreReviewDetail: {
+                  data: {
+                    type: "appStoreReviewDetails",
+                    id: app_store_review_detail_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appStoreReviewAttachments", body)
-      end
+          tunes_request_client.post("appStoreReviewAttachments", body)
+        end
 
-      def patch_app_store_review_attachment(app_store_review_attachment_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreReviewAttachments",
-            id: app_store_review_attachment_id,
-            attributes: attributes
+        def patch_app_store_review_attachment(app_store_review_attachment_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreReviewAttachments",
+              id: app_store_review_attachment_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appStoreReviewAttachments/#{app_store_review_attachment_id}", body)
-      end
+          tunes_request_client.patch("appStoreReviewAttachments/#{app_store_review_attachment_id}", body)
+        end
 
-      def delete_app_store_review_attachment(app_store_review_attachment_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appStoreReviewAttachments/#{app_store_review_attachment_id}", params)
-      end
+        def delete_app_store_review_attachment(app_store_review_attachment_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appStoreReviewAttachments/#{app_store_review_attachment_id}", params)
+        end
 
-      #
-      # appScreenshotSets
-      #
+        #
+        # appScreenshotSets
+        #
 
-      def get_app_screenshot_sets(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appScreenshotSets", params)
-      end
+        def get_app_screenshot_sets(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appScreenshotSets", params)
+        end
 
-      def get_app_screenshot_set(app_screenshot_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appScreenshotSets/#{app_screenshot_set_id}", params)
-      end
+        def get_app_screenshot_set(app_screenshot_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appScreenshotSets/#{app_screenshot_set_id}", params)
+        end
 
-      def post_app_screenshot_set(app_store_version_localization_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appScreenshotSets",
-            attributes: attributes,
-            relationships: {
-              appStoreVersionLocalization: {
-                data: {
-                  type: "appStoreVersionLocalizations",
-                  id: app_store_version_localization_id
+        def post_app_screenshot_set(app_store_version_localization_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appScreenshotSets",
+              attributes: attributes,
+              relationships: {
+                appStoreVersionLocalization: {
+                  data: {
+                    type: "appStoreVersionLocalizations",
+                    id: app_store_version_localization_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appScreenshotSets", body)
-      end
+          tunes_request_client.post("appScreenshotSets", body)
+        end
 
-      def patch_app_screenshot_set_screenshots(app_screenshot_set_id: nil, app_screenshot_ids: nil)
-        app_screenshot_ids ||= []
+        def patch_app_screenshot_set_screenshots(app_screenshot_set_id: nil, app_screenshot_ids: nil)
+          app_screenshot_ids ||= []
 
-        body = {
-          data: app_screenshot_ids.map do |app_screenshot_id|
-            {
-              type: "appScreenshots",
-              id: app_screenshot_id
-            }
-          end
-        }
+          body = {
+            data: app_screenshot_ids.map do |app_screenshot_id|
+              {
+                type: "appScreenshots",
+                id: app_screenshot_id
+              }
+            end
+          }
 
-        Client.instance.patch("appScreenshotSets/#{app_screenshot_set_id}/relationships/appScreenshots", body)
-      end
+          tunes_request_client.patch("appScreenshotSets/#{app_screenshot_set_id}/relationships/appScreenshots", body)
+        end
 
-      #
-      # appScreenshots
-      #
+        #
+        # appScreenshots
+        #
 
-      def get_app_screenshot(app_screenshot_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appScreenshots/#{app_screenshot_id}", params)
-      end
+        def get_app_screenshot(app_screenshot_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appScreenshots/#{app_screenshot_id}", params)
+        end
 
-      def post_app_screenshot(app_screenshot_set_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appScreenshots",
-            attributes: attributes,
-            relationships: {
-              appScreenshotSet: {
-                data: {
-                  type: "appScreenshotSets",
-                  id: app_screenshot_set_id
+        def post_app_screenshot(app_screenshot_set_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appScreenshots",
+              attributes: attributes,
+              relationships: {
+                appScreenshotSet: {
+                  data: {
+                    type: "appScreenshotSets",
+                    id: app_screenshot_set_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appScreenshots", body, tries: 1)
-      end
+          tunes_request_client.post("appScreenshots", body, tries: 1)
+        end
 
-      def patch_app_screenshot(app_screenshot_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appScreenshots",
-            id: app_screenshot_id,
-            attributes: attributes
+        def patch_app_screenshot(app_screenshot_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appScreenshots",
+              id: app_screenshot_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appScreenshots/#{app_screenshot_id}", body)
-      end
+          tunes_request_client.patch("appScreenshots/#{app_screenshot_id}", body)
+        end
 
-      def delete_app_screenshot(app_screenshot_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appScreenshots/#{app_screenshot_id}", params)
-      end
+        def delete_app_screenshot(app_screenshot_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appScreenshots/#{app_screenshot_id}", params)
+        end
 
-      #
-      # appInfos
-      #
+        #
+        # appInfos
+        #
 
-      def get_app_infos(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appInfos", params)
-      end
+        def get_app_infos(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appInfos", params)
+        end
 
-      def patch_app_info(app_info_id: nil, attributes: {})
-        attributes ||= {}
+        def patch_app_info(app_info_id: nil, attributes: {})
+          attributes ||= {}
 
-        data = {
-          type: "appInfos",
-          id: app_info_id
-        }
-        data[:attributes] = attributes unless attributes.empty?
+          data = {
+            type: "appInfos",
+            id: app_info_id
+          }
+          data[:attributes] = attributes unless attributes.empty?
 
-        body = {
-          data: data
-        }
+          body = {
+            data: data
+          }
 
-        Client.instance.patch("appInfos/#{app_info_id}", body)
-      end
+          tunes_request_client.patch("appInfos/#{app_info_id}", body)
+        end
 
-      #
-      # Adding the key will create/update (if value) or delete if nil
-      # Not including a key will leave as is
-      # category_id_map: {
-      #   primary_category_id: "GAMES",
-      #   primary_subcategory_one_id: "PUZZLE",
-      #   primary_subcategory_two_id: "STRATEGY",
-      #   secondary_category_id: nil,
-      #   secondary_subcategory_one_id: nil,
-      #   secondary_subcategory_two_id: nil
-      # }
-      #
-      def patch_app_info_categories(app_info_id: nil, category_id_map: nil)
-        category_id_map ||= {}
-        primary_category_id = category_id_map[:primary_category_id]
-        primary_subcategory_one_id = category_id_map[:primary_subcategory_one_id]
-        primary_subcategory_two_id = category_id_map[:primary_subcategory_two_id]
-        secondary_category_id = category_id_map[:secondary_category_id]
-        secondary_subcategory_one_id = category_id_map[:secondary_subcategory_one_id]
-        secondary_subcategory_two_id = category_id_map[:secondary_subcategory_two_id]
+        #
+        # Adding the key will create/update (if value) or delete if nil
+        # Not including a key will leave as is
+        # category_id_map: {
+        #   primary_category_id: "GAMES",
+        #   primary_subcategory_one_id: "PUZZLE",
+        #   primary_subcategory_two_id: "STRATEGY",
+        #   secondary_category_id: nil,
+        #   secondary_subcategory_one_id: nil,
+        #   secondary_subcategory_two_id: nil
+        # }
+        #
+        def patch_app_info_categories(app_info_id: nil, category_id_map: nil)
+          category_id_map ||= {}
+          primary_category_id = category_id_map[:primary_category_id]
+          primary_subcategory_one_id = category_id_map[:primary_subcategory_one_id]
+          primary_subcategory_two_id = category_id_map[:primary_subcategory_two_id]
+          secondary_category_id = category_id_map[:secondary_category_id]
+          secondary_subcategory_one_id = category_id_map[:secondary_subcategory_one_id]
+          secondary_subcategory_two_id = category_id_map[:secondary_subcategory_two_id]
+
+          relationships = {}
+
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:primary_category_id)
+            relationships[:primaryCategory] = {
+              data: primary_category_id ? { type: "appCategories", id: primary_category_id } : nil
+            }
+          end
 
-        relationships = {}
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:primary_subcategory_one_id)
+            relationships[:primarySubcategoryOne] = {
+              data: primary_subcategory_one_id ? { type: "appCategories", id: primary_subcategory_one_id } : nil
+            }
+          end
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:primary_category_id)
-          relationships[:primaryCategory] = {
-            data: primary_category_id ? { type: "appCategories", id: primary_category_id } : nil
-          }
-        end
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:primary_subcategory_two_id)
+            relationships[:primarySubcategoryTwo] = {
+              data: primary_subcategory_two_id ? { type: "appCategories", id: primary_subcategory_two_id } : nil
+            }
+          end
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:primary_subcategory_one_id)
-          relationships[:primarySubcategoryOne] = {
-            data: primary_subcategory_one_id ? { type: "appCategories", id: primary_subcategory_one_id } : nil
-          }
-        end
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:secondary_category_id)
+            relationships[:secondaryCategory] = {
+              data: secondary_category_id ? { type: "appCategories", id: secondary_category_id } : nil
+            }
+          end
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:primary_subcategory_two_id)
-          relationships[:primarySubcategoryTwo] = {
-            data: primary_subcategory_two_id ? { type: "appCategories", id: primary_subcategory_two_id } : nil
-          }
-        end
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:secondary_subcategory_one_id)
+            relationships[:secondarySubcategoryOne] = {
+              data: secondary_subcategory_one_id ? { type: "appCategories", id: secondary_subcategory_one_id } : nil
+            }
+          end
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:secondary_category_id)
-          relationships[:secondaryCategory] = {
-            data: secondary_category_id ? { type: "appCategories", id: secondary_category_id } : nil
-          }
-        end
+          # Only update if key is included (otherwise category will be removed)
+          if category_id_map.include?(:secondary_subcategory_two_id)
+            relationships[:secondarySubcategoryTwo] = {
+              data: secondary_subcategory_two_id ? { type: "appCategories", id: secondary_subcategory_two_id } : nil
+            }
+          end
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:secondary_subcategory_one_id)
-          relationships[:secondarySubcategoryOne] = {
-            data: secondary_subcategory_one_id ? { type: "appCategories", id: secondary_subcategory_one_id } : nil
+          data = {
+            type: "appInfos",
+            id: app_info_id
           }
-        end
+          data[:relationships] = relationships unless relationships.empty?
 
-        # Only update if key is included (otherwise category will be removed)
-        if category_id_map.include?(:secondary_subcategory_two_id)
-          relationships[:secondarySubcategoryTwo] = {
-            data: secondary_subcategory_two_id ? { type: "appCategories", id: secondary_subcategory_two_id } : nil
+          body = {
+            data: data
           }
-        end
-
-        data = {
-          type: "appInfos",
-          id: app_info_id
-        }
-        data[:relationships] = relationships unless relationships.empty?
-
-        body = {
-          data: data
-        }
 
-        Client.instance.patch("appInfos/#{app_info_id}", body)
-      end
+          tunes_request_client.patch("appInfos/#{app_info_id}", body)
+        end
 
-      def delete_app_info(app_info_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appInfos/#{app_info_id}", params)
-      end
+        def delete_app_info(app_info_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appInfos/#{app_info_id}", params)
+        end
 
-      #
-      # appInfoLocalizations
-      #
+        #
+        # appInfoLocalizations
+        #
 
-      def get_app_info_localizations(app_info_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appInfos/#{app_info_id}/appInfoLocalizations", params)
-      end
+        def get_app_info_localizations(app_info_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appInfos/#{app_info_id}/appInfoLocalizations", params)
+        end
 
-      def post_app_info_localization(app_info_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appInfoLocalizations",
-            attributes: attributes,
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_info_id
+        def post_app_info_localization(app_info_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appInfoLocalizations",
+              attributes: attributes,
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_info_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appInfoLocalizations", body)
-      end
+          tunes_request_client.post("appInfoLocalizations", body)
+        end
 
-      def patch_app_info_localization(app_info_localization_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appInfoLocalizations",
-            id: app_info_localization_id,
-            attributes: attributes
+        def patch_app_info_localization(app_info_localization_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appInfoLocalizations",
+              id: app_info_localization_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appInfoLocalizations/#{app_info_localization_id}", body)
-      end
+          tunes_request_client.patch("appInfoLocalizations/#{app_info_localization_id}", body)
+        end
 
-      #
-      # appStoreReviewDetails
-      #
+        #
+        # appStoreReviewDetails
+        #
 
-      def get_app_store_review_detail(app_store_version_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/appStoreReviewDetail", params)
-      end
+        def get_app_store_review_detail(app_store_version_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/appStoreReviewDetail", params)
+        end
 
-      def post_app_store_review_detail(app_store_version_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreReviewDetails",
-            attributes: attributes,
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_app_store_review_detail(app_store_version_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreReviewDetails",
+              attributes: attributes,
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appStoreReviewDetails", body)
-      end
+          tunes_request_client.post("appStoreReviewDetails", body)
+        end
 
-      def patch_app_store_review_detail(app_store_review_detail_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreReviewDetails",
-            id: app_store_review_detail_id,
-            attributes: attributes
+        def patch_app_store_review_detail(app_store_review_detail_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreReviewDetails",
+              id: app_store_review_detail_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appStoreReviewDetails/#{app_store_review_detail_id}", body)
-      end
+          tunes_request_client.patch("appStoreReviewDetails/#{app_store_review_detail_id}", body)
+        end
 
-      #
-      # appStoreVersionLocalizations
-      #
+        #
+        # appStoreVersionLocalizations
+        #
 
-      def get_app_store_version_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appStoreVersionLocalizations", params)
-      end
+        def get_app_store_version_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appStoreVersionLocalizations", params)
+        end
 
-      def post_app_store_version_localization(app_store_version_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreVersionLocalizations",
-            attributes: attributes,
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_app_store_version_localization(app_store_version_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreVersionLocalizations",
+              attributes: attributes,
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appStoreVersionLocalizations", body)
-      end
+          tunes_request_client.post("appStoreVersionLocalizations", body)
+        end
 
-      def patch_app_store_version_localization(app_store_version_localization_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreVersionLocalizations",
-            id: app_store_version_localization_id,
-            attributes: attributes
+        def patch_app_store_version_localization(app_store_version_localization_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreVersionLocalizations",
+              id: app_store_version_localization_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appStoreVersionLocalizations/#{app_store_version_localization_id}", body)
-      end
+          tunes_request_client.patch("appStoreVersionLocalizations/#{app_store_version_localization_id}", body)
+        end
 
-      def delete_app_store_version_localization(app_store_version_localization_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appStoreVersionLocalizations/#{app_store_version_localization_id}", params)
-      end
+        def delete_app_store_version_localization(app_store_version_localization_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appStoreVersionLocalizations/#{app_store_version_localization_id}", params)
+        end
 
-      #
-      # appStoreVersionPhasedReleases
-      #
+        #
+        # appStoreVersionPhasedReleases
+        #
 
-      def get_app_store_version_phased_release(app_store_version_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/appStoreVersionPhasedRelease", params)
-      end
+        def get_app_store_version_phased_release(app_store_version_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/appStoreVersionPhasedRelease", params)
+        end
 
-      def post_app_store_version_phased_release(app_store_version_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreVersionPhasedReleases",
-            attributes: attributes,
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_app_store_version_phased_release(app_store_version_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreVersionPhasedReleases",
+              attributes: attributes,
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appStoreVersionPhasedReleases", body)
-      end
+          tunes_request_client.post("appStoreVersionPhasedReleases", body)
+        end
 
-      def delete_app_store_version_phased_release(app_store_version_phased_release_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appStoreVersionPhasedReleases/#{app_store_version_phased_release_id}", params)
-      end
+        def delete_app_store_version_phased_release(app_store_version_phased_release_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appStoreVersionPhasedReleases/#{app_store_version_phased_release_id}", params)
+        end
 
-      #
-      # appStoreVersions
-      #
+        #
+        # appStoreVersions
+        #
 
-      def get_app_store_versions(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps/#{app_id}/appStoreVersions", params)
-      end
+        def get_app_store_versions(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("apps/#{app_id}/appStoreVersions", params)
+        end
 
-      def get_app_store_version(app_store_version_id: nil, includes: nil)
-        params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}", params)
-      end
+        def get_app_store_version(app_store_version_id: nil, includes: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}", params)
+        end
 
-      def post_app_store_version(app_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreVersions",
-            attributes: attributes,
-            relationships: {
-              app: {
-                data: {
-                  type: "apps",
-                  id: app_id
+        def post_app_store_version(app_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreVersions",
+              attributes: attributes,
+              relationships: {
+                app: {
+                  data: {
+                    type: "apps",
+                    id: app_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("appStoreVersions", body)
-      end
+          tunes_request_client.post("appStoreVersions", body)
+        end
 
-      def patch_app_store_version(app_store_version_id: nil, attributes: {})
-        body = {
-          data: {
-            type: "appStoreVersions",
-            id: app_store_version_id,
-            attributes: attributes
+        def patch_app_store_version(app_store_version_id: nil, attributes: {})
+          body = {
+            data: {
+              type: "appStoreVersions",
+              id: app_store_version_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("appStoreVersions/#{app_store_version_id}", body)
-      end
-
-      def patch_app_store_version_with_build(app_store_version_id: nil, build_id: nil)
-        data = nil
-        if build_id
-          data = {
-            type: "builds",
-            id: build_id
-          }
+          tunes_request_client.patch("appStoreVersions/#{app_store_version_id}", body)
         end
 
-        body = {
-          data: {
-            type: "appStoreVersions",
-            id: app_store_version_id,
-            relationships: {
-              build: {
-                data: data
+        def patch_app_store_version_with_build(app_store_version_id: nil, build_id: nil)
+          data = nil
+          if build_id
+            data = {
+              type: "builds",
+              id: build_id
+            }
+          end
+
+          body = {
+            data: {
+              type: "appStoreVersions",
+              id: app_store_version_id,
+              relationships: {
+                build: {
+                  data: data
+                }
               }
             }
           }
-        }
 
-        Client.instance.patch("appStoreVersions/#{app_store_version_id}", body)
-      end
+          tunes_request_client.patch("appStoreVersions/#{app_store_version_id}", body)
+        end
 
-      #
-      # appStoreVersionPhasedReleases
-      #
+        #
+        # appStoreVersionPhasedReleases
+        #
 
-      def get_reset_ratings_request(app_store_version_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/resetRatingsRequest", params)
-      end
+        def get_reset_ratings_request(app_store_version_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/resetRatingsRequest", params)
+        end
 
-      def post_reset_ratings_request(app_store_version_id: nil)
-        body = {
-          data: {
-            type: "resetRatingsRequests",
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_reset_ratings_request(app_store_version_id: nil)
+          body = {
+            data: {
+              type: "resetRatingsRequests",
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("resetRatingsRequests", body)
-      end
+          tunes_request_client.post("resetRatingsRequests", body)
+        end
 
-      def delete_reset_ratings_request(reset_ratings_request_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("resetRatingsRequests/#{reset_ratings_request_id}", params)
-      end
+        def delete_reset_ratings_request(reset_ratings_request_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("resetRatingsRequests/#{reset_ratings_request_id}", params)
+        end
 
-      #
-      # appStoreVersionSubmissions
-      #
+        #
+        # appStoreVersionSubmissions
+        #
 
-      def get_app_store_version_submission(app_store_version_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/appStoreVersionSubmission", params)
-      end
+        def get_app_store_version_submission(app_store_version_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/appStoreVersionSubmission", params)
+        end
 
-      def post_app_store_version_submission(app_store_version_id: nil)
-        body = {
-          data: {
-            type: "appStoreVersionSubmissions",
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_app_store_version_submission(app_store_version_id: nil)
+          body = {
+            data: {
+              type: "appStoreVersionSubmissions",
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
-
-        Client.instance.post("appStoreVersionSubmissions", body)
-      end
 
-      def delete_app_store_version_submission(app_store_version_submission_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appStoreVersionSubmissions/#{app_store_version_submission_id}", params)
-      end
+          tunes_request_client.post("appStoreVersionSubmissions", body)
+        end
 
-      #
-      # appStoreVersionReleaseRequests
-      #
+        def delete_app_store_version_submission(app_store_version_submission_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appStoreVersionSubmissions/#{app_store_version_submission_id}", params)
+        end
 
-      def post_app_store_version_release_request(app_store_version_id: nil)
-        body = {
-            data: {
-                type: "appStoreVersionReleaseRequests",
-                relationships: {
-                    appStoreVersion: {
-                        data: {
-                            type: "appStoreVersions",
-                            id: app_store_version_id
-                        }
-                    }
-                }
-            }
-        }
+        #
+        # appStoreVersionReleaseRequests
+        #
+
+        def post_app_store_version_release_request(app_store_version_id: nil)
+          body = {
+              data: {
+                  type: "appStoreVersionReleaseRequests",
+                  relationships: {
+                      appStoreVersion: {
+                          data: {
+                              type: "appStoreVersions",
+                              id: app_store_version_id
+                          }
+                      }
+                  }
+              }
+          }
 
-        Client.instance.post("appStoreVersionReleaseRequests", body)
-      end
+          tunes_request_client.post("appStoreVersionReleaseRequests", body)
+        end
 
-      #
-      # idfaDeclarations
-      #
+        #
+        # idfaDeclarations
+        #
 
-      def get_idfa_declaration(app_store_version_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("appStoreVersions/#{app_store_version_id}/idfaDeclaration", params)
-      end
+        def get_idfa_declaration(app_store_version_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/idfaDeclaration", params)
+        end
 
-      def post_idfa_declaration(app_store_version_id: nil, attributes: nil)
-        body = {
-          data: {
-            type: "idfaDeclarations",
-            attributes: attributes,
-            relationships: {
-              appStoreVersion: {
-                data: {
-                  type: "appStoreVersions",
-                  id: app_store_version_id
+        def post_idfa_declaration(app_store_version_id: nil, attributes: nil)
+          body = {
+            data: {
+              type: "idfaDeclarations",
+              attributes: attributes,
+              relationships: {
+                appStoreVersion: {
+                  data: {
+                    type: "appStoreVersions",
+                    id: app_store_version_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("idfaDeclarations", body)
-      end
+          tunes_request_client.post("idfaDeclarations", body)
+        end
 
-      def patch_idfa_declaration(idfa_declaration_id: nil, attributes: nil)
-        body = {
-          data: {
-            type: "idfaDeclarations",
-            id: idfa_declaration_id,
-            attributes: attributes
+        def patch_idfa_declaration(idfa_declaration_id: nil, attributes: nil)
+          body = {
+            data: {
+              type: "idfaDeclarations",
+              id: idfa_declaration_id,
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.patch("idfaDeclarations/#{idfa_declaration_id}", body)
-      end
+          tunes_request_client.patch("idfaDeclarations/#{idfa_declaration_id}", body)
+        end
 
-      def delete_idfa_declaration(idfa_declaration_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("idfaDeclarations/#{idfa_declaration_id}", params)
-      end
+        def delete_idfa_declaration(idfa_declaration_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("idfaDeclarations/#{idfa_declaration_id}", params)
+        end
 
-      #
-      # sandboxTesters
-      #
+        #
+        # sandboxTesters
+        #
 
-      def get_sandbox_testers(filter: nil, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("sandboxTesters", params)
-      end
+        def get_sandbox_testers(filter: nil, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("sandboxTesters", params)
+        end
 
-      def post_sandbox_tester(attributes: {})
-        body = {
-          data: {
-            type: "sandboxTesters",
-            attributes: attributes
+        def post_sandbox_tester(attributes: {})
+          body = {
+            data: {
+              type: "sandboxTesters",
+              attributes: attributes
+            }
           }
-        }
 
-        Client.instance.post("sandboxTesters", body)
-      end
+          tunes_request_client.post("sandboxTesters", body)
+        end
 
-      def delete_sandbox_tester(sandbox_tester_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("sandboxTesters/#{sandbox_tester_id}", params)
-      end
+        def delete_sandbox_tester(sandbox_tester_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("sandboxTesters/#{sandbox_tester_id}", params)
+        end
 
-      #
-      # territories
-      #
+        #
+        # territories
+        #
 
-      def get_territories(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.get("territories", params)
+        def get_territories(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("territories", params)
+        end
       end
     end
   end