fastlane 2.155.1 → 2.157.0

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

@@ -0,0 +1,94 @@
+require_relative './client'
+
+require_relative './testflight/testflight'
+
+module Spaceship
+  class ConnectAPI
+    class << self
+      # This client stores the global client when using the lazy syntax
+      attr_accessor :client
+
+      # Forward class calls to the global client
+      # This is implemented for backwards compatibility
+      extend(Forwardable)
+      def_delegators(:client, *Spaceship::ConnectAPI::Provisioning::API.instance_methods(false))
+      def_delegators(:client, *Spaceship::ConnectAPI::TestFlight::API.instance_methods(false))
+      def_delegators(:client, *Spaceship::ConnectAPI::Tunes::API.instance_methods(false))
+      def_delegators(:client, *Spaceship::ConnectAPI::Users::API.instance_methods(false))
+
+      def client
+        # Always look for a client set explicitly by the client first
+        return @client if @client
+
+        # A client may not always be explicitly set (specially when running tools like match, sigh, pilot, etc)
+        # In that case, create a new client based on existing sessions
+        # Note: This does not perform logins on the user. It is only reusing the cookies and selected teams
+        return nil if Spaceship::Tunes.client.nil? && Spaceship::Portal.client.nil?
+
+        implicit_client = ConnectAPI::Client.new(tunes_client: Spaceship::Tunes.client, portal_client: Spaceship::Portal.client)
+        return implicit_client
+      end
+
+      def token=(token)
+        @client = ConnectAPI::Client.new(token: token)
+      end
+
+      def token
+        return nil if @client.nil?
+        return @client.token
+      end
+
+      def token?
+        (@client && @client.token)
+      end
+
+      # Initializes client with Apple's App Store Connect JWT auth key.
+      #
+      # This method will automatically use the key id, issuer id, and filepath from environment
+      # variables if not given.
+      #
+      # All three parameters are needed to authenticate.
+      #
+      # @param key_id (String) (optional): The key id
+      # @param issuer_id (String) (optional): The issuer id
+      # @param filepath (String) (optional): The filepath
+      #
+      # @raise InvalidUserCredentialsError: raised if authentication failed
+      #
+      # @return (Spaceship::ConnectAPI::Client) The client the login method was called for
+      def auth(key_id: nil, issuer_id: nil, filepath: nil)
+        @client = ConnectAPI::Client.auth(key_id: key_id, issuer_id: issuer_id, filepath: filepath)
+      end
+
+      # Authenticates with Apple's web services. This method has to be called once
+      # to generate a valid session.
+      #
+      # This method will automatically use the username from the Appfile (if available)
+      # and fetch the password from the Keychain (if available)
+      #
+      # @param user (String) (optional): The username (usually the email address)
+      # @param password (String) (optional): The password
+      # @param team_id (String) (optional): The team id
+      # @param team_name (String) (optional): The team name
+      #
+      # @raise InvalidUserCredentialsError: raised if authentication failed
+      #
+      # @return (Spaceship::ConnectAPI::Client) The client the login method was called for
+      def login(user = nil, password = nil, team_id: nil, team_name: nil)
+        @client = ConnectAPI::Client.login(user, password, team_id: team_id, team_name: team_name)
+      end
+
+      # Open up the team selection for the user (if necessary).
+      #
+      # If the user is in multiple teams, a team selection is shown.
+      # The user can then select a team by entering the number
+      #
+      # @param team_id (String) (optional): The ID of an App Store Connect team
+      # @param team_name (String) (optional): The name of an App Store Connect team
+      def select_team(team_id: nil, team_name: nil)
+        return if client.nil?
+        client.select_team(team_id: team_id, team_name: team_name)
+      end
+    end
+  end
+end

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

@@ -1,27 +1,18 @@
-require_relative '../client'
+require_relative '../api_client'
+require_relative './testflight'
 require_relative '../../tunes/tunes_client'
 
 module Spaceship
   class ConnectAPI
     module TestFlight
-      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::TestFlight::API)
+          self.test_flight_request_client = self
         end
 
         def self.hostname

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -3,364 +3,375 @@ require 'spaceship/connect_api/testflight/client'
 module Spaceship
   class ConnectAPI
     module TestFlight
-      #
-      # apps
-      #
+      module API
+        def test_flight_request_client=(test_flight_request_client)
+          @test_flight_request_client = test_flight_request_client
+        end
 
-      def get_apps(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps", params)
-      end
+        def test_flight_request_client
+          return @test_flight_request_client if @test_flight_request_client
+          raise TypeError, "You need to instantiate this module with test_flight_request_client"
+        end
 
-      def get_app(app_id: nil, includes: nil)
-        params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
-        Client.instance.get("apps/#{app_id}", params)
-      end
+        #
+        # apps
+        #
 
-      #
-      # betaAppLocalizations
-      #
+        def get_apps(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("apps", params)
+        end
 
-      def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaAppLocalizations", params)
-      end
+        def get_app(app_id: nil, includes: nil)
+          params = @test_flight_request_client.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
+          @test_flight_request_client.get("apps/#{app_id}", params)
+        end
+
+        #
+        # betaAppLocalizations
+        #
 
-      def post_beta_app_localizations(app_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            type: "betaAppLocalizations",
-            relationships: {
-              app: {
-                data: {
-                  type: "apps",
-                  id: app_id
+        def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaAppLocalizations", params)
+        end
+
+        def post_beta_app_localizations(app_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              type: "betaAppLocalizations",
+              relationships: {
+                app: {
+                  data: {
+                    type: "apps",
+                    id: app_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("betaAppLocalizations", body)
-      end
+          @test_flight_request_client.post("betaAppLocalizations", body)
+        end
 
-      def patch_beta_app_localizations(localization_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            id: localization_id,
-            type: "betaAppLocalizations"
+        def patch_beta_app_localizations(localization_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: localization_id,
+              type: "betaAppLocalizations"
+            }
           }
-        }
 
-        Client.instance.patch("betaAppLocalizations/#{localization_id}", body)
-      end
+          @test_flight_request_client.patch("betaAppLocalizations/#{localization_id}", body)
+        end
 
-      #
-      # betaAppReviewDetails
-      #
+        #
+        # betaAppReviewDetails
+        #
 
-      def get_beta_app_review_detail(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaAppReviewDetails", params)
-      end
+        def get_beta_app_review_detail(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaAppReviewDetails", params)
+        end
 
-      def patch_beta_app_review_detail(app_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            id: app_id,
-            type: "betaAppReviewDetails"
+        def patch_beta_app_review_detail(app_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: app_id,
+              type: "betaAppReviewDetails"
+            }
           }
-        }
 
-        Client.instance.patch("betaAppReviewDetails/#{app_id}", body)
-      end
+          @test_flight_request_client.patch("betaAppReviewDetails/#{app_id}", body)
+        end
 
-      #
-      # betaAppReviewSubmissions
-      #
+        #
+        # betaAppReviewSubmissions
+        #
 
-      def get_beta_app_review_submissions(filter: {}, includes: nil, limit: nil, sort: nil, cursor: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
-        Client.instance.get("betaAppReviewSubmissions", params)
-      end
+        def get_beta_app_review_submissions(filter: {}, includes: nil, limit: nil, sort: nil, cursor: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+          @test_flight_request_client.get("betaAppReviewSubmissions", params)
+        end
 
-      def post_beta_app_review_submissions(build_id: nil)
-        body = {
-          data: {
-            type: "betaAppReviewSubmissions",
-            relationships: {
-              build: {
-                data: {
-                  type: "builds",
-                  id: build_id
+        def post_beta_app_review_submissions(build_id: nil)
+          body = {
+            data: {
+              type: "betaAppReviewSubmissions",
+              relationships: {
+                build: {
+                  data: {
+                    type: "builds",
+                    id: build_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("betaAppReviewSubmissions", body)
-      end
+          @test_flight_request_client.post("betaAppReviewSubmissions", body)
+        end
 
-      def delete_beta_app_review_submission(beta_app_review_submission_id: nil)
-        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
-        Client.instance.delete("betaAppReviewSubmissions/#{beta_app_review_submission_id}", params)
-      end
+        def delete_beta_app_review_submission(beta_app_review_submission_id: nil)
+          params = @test_flight_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
+          @test_flight_request_client.delete("betaAppReviewSubmissions/#{beta_app_review_submission_id}", params)
+        end
 
-      #
-      # betaBuildLocalizations
-      #
+        #
+        # betaBuildLocalizations
+        #
 
-      def get_beta_build_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaBuildLocalizations", params)
-      end
+        def get_beta_build_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaBuildLocalizations", params)
+        end
 
-      def post_beta_build_localizations(build_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            type: "betaBuildLocalizations",
-            relationships: {
-              build: {
-                data: {
-                  type: "builds",
-                  id: build_id
+        def post_beta_build_localizations(build_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              type: "betaBuildLocalizations",
+              relationships: {
+                build: {
+                  data: {
+                    type: "builds",
+                    id: build_id
+                  }
                 }
               }
             }
           }
-        }
 
-        Client.instance.post("betaBuildLocalizations", body)
-      end
+          @test_flight_request_client.post("betaBuildLocalizations", body)
+        end
 
-      def patch_beta_build_localizations(localization_id: nil, feedbackEmail: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            id: localization_id,
-            type: "betaBuildLocalizations"
+        def patch_beta_build_localizations(localization_id: nil, feedbackEmail: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: localization_id,
+              type: "betaBuildLocalizations"
+            }
           }
-        }
 
-        Client.instance.patch("betaBuildLocalizations/#{localization_id}", body)
-      end
+          @test_flight_request_client.patch("betaBuildLocalizations/#{localization_id}", body)
+        end
 
-      #
-      # betaBuildMetrics
-      #
+        #
+        # betaBuildMetrics
+        #
 
-      def get_beta_build_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaBuildMetrics", params)
-      end
+        def get_beta_build_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaBuildMetrics", params)
+        end
 
-      #
-      # betaGroups
-      #
+        #
+        # betaGroups
+        #
 
-      def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaGroups", params)
-      end
+        def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaGroups", params)
+        end
 
-      def add_beta_groups_to_build(build_id: nil, beta_group_ids: [])
-        body = {
-          data: beta_group_ids.map do |id|
-            {
-              type: "betaGroups",
-              id: id
-            }
-          end
-        }
+        def add_beta_groups_to_build(build_id: nil, beta_group_ids: [])
+          body = {
+            data: beta_group_ids.map do |id|
+              {
+                type: "betaGroups",
+                id: id
+              }
+            end
+          }
 
-        Client.instance.post("builds/#{build_id}/relationships/betaGroups", body)
-      end
+          @test_flight_request_client.post("builds/#{build_id}/relationships/betaGroups", body)
+        end
 
-      def create_beta_group(app_id: nil, group_name: nil, public_link_enabled: false, public_link_limit: 10_000, public_link_limit_enabled: false)
-        body = {
-          data: {
-            attributes: {
-              name: group_name,
-              publicLinkEnabled: public_link_enabled,
-              publicLinkLimit: public_link_limit,
-              publicLinkLimitEnabled: public_link_limit_enabled
-            },
-            relationships: {
-              app: {
-                data: {
-                  id: app_id,
-                  type: "apps"
+        def create_beta_group(app_id: nil, group_name: nil, public_link_enabled: false, public_link_limit: 10_000, public_link_limit_enabled: false)
+          body = {
+            data: {
+              attributes: {
+                name: group_name,
+                publicLinkEnabled: public_link_enabled,
+                publicLinkLimit: public_link_limit,
+                publicLinkLimitEnabled: public_link_limit_enabled
+              },
+              relationships: {
+                app: {
+                  data: {
+                    id: app_id,
+                    type: "apps"
+                  }
                 }
-              }
-            },
-            type: "betaGroups"
+              },
+              type: "betaGroups"
+            }
           }
-        }
-        Client.instance.post("betaGroups", body)
-      end
+          @test_flight_request_client.post("betaGroups", body)
+        end
 
-      #
-      # betaTesters
-      #
+        #
+        # betaTesters
+        #
 
-      def get_beta_testers(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaTesters", params)
-      end
+        def get_beta_testers(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaTesters", params)
+        end
 
-      # beta_testers - [{email: "", firstName: "", lastName: ""}]
-      def post_bulk_beta_tester_assignments(beta_group_id: nil, beta_testers: nil)
-        beta_testers || []
+        # beta_testers - [{email: "", firstName: "", lastName: ""}]
+        def post_bulk_beta_tester_assignments(beta_group_id: nil, beta_testers: nil)
+          beta_testers || []
 
-        beta_testers.map do |tester|
-          tester[:errors] = []
-        end
+          beta_testers.map do |tester|
+            tester[:errors] = []
+          end
 
-        body = {
-          data: {
-            attributes: {
-              betaTesters: beta_testers
-            },
-            relationships: {
-              betaGroup: {
-                data: {
-                  type: "betaGroups",
-                  id: beta_group_id
+          body = {
+            data: {
+              attributes: {
+                betaTesters: beta_testers
+              },
+              relationships: {
+                betaGroup: {
+                  data: {
+                    type: "betaGroups",
+                    id: beta_group_id
+                  }
                 }
-              }
-            },
-            type: "bulkBetaTesterAssignments"
+              },
+              type: "bulkBetaTesterAssignments"
+            }
           }
-        }
 
-        Client.instance.post("bulkBetaTesterAssignments", body)
-      end
+          @test_flight_request_client.post("bulkBetaTesterAssignments", body)
+        end
 
-      def delete_beta_tester_from_apps(beta_tester_id: nil, app_ids: [])
-        body = {
-          data: app_ids.map do |id|
-            {
-              type: "apps",
-              id: id
-            }
-          end
-        }
+        def delete_beta_tester_from_apps(beta_tester_id: nil, app_ids: [])
+          body = {
+            data: app_ids.map do |id|
+              {
+                type: "apps",
+                id: id
+              }
+            end
+          }
 
-        Client.instance.delete("betaTesters/#{beta_tester_id}/relationships/apps", nil, body)
-      end
+          @test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/apps", nil, body)
+        end
 
-      def delete_beta_tester_from_beta_groups(beta_tester_id: nil, beta_group_ids: [])
-        body = {
-          data: beta_group_ids.map do |id|
-            {
-              type: "betaGroups",
-              id: id
-            }
-          end
-        }
+        def delete_beta_tester_from_beta_groups(beta_tester_id: nil, beta_group_ids: [])
+          body = {
+            data: beta_group_ids.map do |id|
+              {
+                type: "betaGroups",
+                id: id
+              }
+            end
+          }
 
-        Client.instance.delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
-      end
+          @test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
+        end
 
-      #
-      # betaTesterMetrics
-      #
+        #
+        # betaTesterMetrics
+        #
 
-      def get_beta_tester_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaTesterMetrics", params)
-      end
+        def get_beta_tester_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaTesterMetrics", params)
+        end
 
-      #
-      # builds
-      #
+        #
+        # builds
+        #
 
-      def get_builds(filter: {}, includes: "buildBetaDetail,betaBuildMetrics", limit: 10, sort: "uploadedDate", cursor: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
-        Client.instance.get("builds", params)
-      end
+        def get_builds(filter: {}, includes: "buildBetaDetail,betaBuildMetrics", limit: 10, sort: "uploadedDate", cursor: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+          @test_flight_request_client.get("builds", params)
+        end
 
-      def get_build(build_id: nil, app_store_version_id: nil, includes: nil)
-        if build_id
-          params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
-          return Client.instance.get("builds/#{build_id}", params)
-        elsif app_store_version_id
-          params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
-          return Client.instance.get("appStoreVersions/#{app_store_version_id}/build", params)
-        else
-          return nil
+        def get_build(build_id: nil, app_store_version_id: nil, includes: nil)
+          if build_id
+            params = @test_flight_request_client.build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
+            return @test_flight_request_client.get("builds/#{build_id}", params)
+          elsif app_store_version_id
+            params = @test_flight_request_client.build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
+            return @test_flight_request_client.get("appStoreVersions/#{app_store_version_id}/build", params)
+          else
+            return nil
+          end
         end
-      end
 
-      def patch_builds(build_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            id: build_id,
-            type: "builds"
+        def patch_builds(build_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: build_id,
+              type: "builds"
+            }
           }
-        }
 
-        Client.instance.patch("builds/#{build_id}", body)
-      end
+          @test_flight_request_client.patch("builds/#{build_id}", body)
+        end
 
-      #
-      # buildBetaDetails
-      #
+        #
+        # buildBetaDetails
+        #
 
-      def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("buildBetaDetails", params)
-      end
+        def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("buildBetaDetails", params)
+        end
 
-      def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
-        body = {
-          data: {
-            attributes: attributes,
-            id: build_beta_details_id,
-            type: "buildBetaDetails"
+        def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: build_beta_details_id,
+              type: "buildBetaDetails"
+            }
           }
-        }
 
-        Client.instance.patch("buildBetaDetails/#{build_beta_details_id}", body)
-      end
+          @test_flight_request_client.patch("buildBetaDetails/#{build_beta_details_id}", body)
+        end
 
-      #
-      # buildDeliveries
-      #
+        #
+        # buildDeliveries
+        #
 
-      def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("buildDeliveries", params)
-      end
+        def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("buildDeliveries", params)
+        end
 
-      #
-      # preReleaseVersions
-      #
+        #
+        # preReleaseVersions
+        #
 
-      def get_pre_release_versions(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("preReleaseVersions", params)
-      end
+        def get_pre_release_versions(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("preReleaseVersions", params)
+        end
 
-      #
-      # betaFeedbacks (private API as of end 2019)
-      #
+        #
+        # betaFeedbacks (private API as of end 2019)
+        #
 
-      def get_beta_feedback(filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("betaFeedbacks", params)
-      end
+        def get_beta_feedback(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = @test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          @test_flight_request_client.get("betaFeedbacks", params)
+        end
 
-      def delete_beta_feedback(feedback_id: nil)
-        raise "Feedback id is nil" if feedback_id.nil?
+        def delete_beta_feedback(feedback_id: nil)
+          raise "Feedback id is nil" if feedback_id.nil?
 
-        Client.instance.delete("betaFeedbacks/#{feedback_id}")
+          @test_flight_request_client.delete("betaFeedbacks/#{feedback_id}")
+        end
       end
     end
   end