fastlane 2.157.0 → 2.158.0

data/precheck/lib/precheck/runner.rb

@@ -19,9 +19,10 @@ module Precheck
                                              title: "Summary for precheck #{Fastlane::VERSION}")
 
       unless Spaceship::Tunes.client
+        # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+        # Prompts select team if multiple teams and none specified
         UI.message("Starting login with user '#{Precheck.config[:username]}'")
-        Spaceship::Tunes.login(Precheck.config[:username])
-        Spaceship::Tunes.select_team
+        Spaceship::ConnectAPI.login(Precheck.config[:username], use_portal: false, use_tunes: true)
 
         UI.message("Successfully logged in")
       end
@@ -160,11 +161,12 @@ module Precheck
     end
 
     def app
-      Spaceship::Tunes::Application.find(Precheck.config[:app_identifier])
+      Spaceship::ConnectAPI::App.find(Precheck.config[:app_identifier])
     end
 
     def latest_app_version
-      @latest_version ||= app.latest_version
+      platform = Spaceship::ConnectAPI::Platform.map(Precheck.config[:platform])
+      @latest_version ||= app.get_edit_app_store_version(platform: platform)
     end
 
     # Makes sure the current App ID exists. If not, it will show an appropriate error message

data/produce/lib/produce/itunes_connect.rb

@@ -9,8 +9,9 @@ module Produce
       @full_bundle_identifier = app_identifier
       @full_bundle_identifier.gsub!('*', Produce.config[:bundle_identifier_suffix].to_s) if wildcard_bundle?
 
-      Spaceship::ConnectAPI.login(Produce.config[:username], nil)
-      Spaceship::ConnectAPI.client.select_team
+      # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+      # Prompts select team if multiple teams and none specified
+      Spaceship::ConnectAPI.login(Produce.config[:username], nil, use_portal: false, use_tunes: true)
 
       create_new_app
     end

data/screengrab/lib/screengrab/runner.rb

@@ -82,7 +82,7 @@ module Screengrab
     end
 
     def select_device
-      adb = Fastlane::Helper::AdbHelper.new(adb_host: @config[:adb_host])
+      adb = Fastlane::Helper::AdbHelper.new(adb_path: @android_env.adb_path, adb_host: @config[:adb_host])
       devices = adb.load_all_devices
 
       UI.user_error!('There are no connected and authorized devices or emulators') if devices.empty?
@@ -299,9 +299,17 @@ module Screengrab
         device_screenshots_paths.each do |device_path|
           if_device_path_exists(@config[:app_package_name], device_serial, device_path) do |path|
             next unless path.include?(locale)
-            run_adb_command("-s #{device_serial} pull #{path} #{tempdir}",
-                            print_all: false,
-                            print_command: true)
+            out = run_adb_command("-s #{device_serial} pull #{path} #{tempdir}",
+                                  print_all: false,
+                                  print_command: true,
+                                  raise_errors: false)
+            if out =~ /Permission denied/
+              dir = File.dirname(path)
+              base = File.basename(path)
+              run_adb_command("-s #{device_serial} shell run-as #{@config[:app_package_name]} 'tar -cC #{dir} #{base}' | tar -xvC #{tempdir}",
+                              print_all: false,
+                              print_command: true)
+            end
           end
         end
 
@@ -381,16 +389,26 @@ module Screengrab
       packages.split("\n").map { |package| package.gsub("package:", "") }
     end
 
-    def run_adb_command(command, print_all: false, print_command: false)
+    def run_adb_command(command, print_all: false, print_command: false, raise_errors: true)
       adb_path = @android_env.adb_path.chomp("adb")
       adb_host = @config[:adb_host]
       host = adb_host.nil? ? '' : "-H #{adb_host} "
-      output = @executor.execute(command: adb_path + "adb " + host + command,
-                                 print_all: print_all,
-                                 print_command: print_command) || ''
+      output = ''
+      begin
+        errout = nil
+        cmdout = @executor.execute(command: adb_path + "adb " + host + command,
+                                  print_all: print_all,
+                                  print_command: print_command,
+                                  error: raise_errors ? nil : proc { |out, status| errout = out }) || ''
+        output = errout || cmdout
+      rescue => ex
+        if raise_errors
+          raise ex
+        end
+      end
       output.lines.reject do |line|
-        # Debug/Warning output from ADB}
-        line.start_with?('adb: ')
+        # Debug/Warning output from ADB
+        line.start_with?('adb: ') && !line.start_with?('adb: error: ')
       end.join('') # Lines retain their newline chars
     end
 

data/sigh/lib/assets/resign.sh

@@ -72,6 +72,9 @@
 # new features June 2020
 # 1. enable (re)signing of OnDemandResources when ipa has been built for the appstore
 #
+# new features August 2020
+# 1. fixes usage for users with GNU-sed in their $PATH
+#
 
 # Logging functions
 
@@ -762,7 +765,7 @@ function resign {
 
             # Get the entry from app's entitlements
             # Read it with PlistBuddy as XML, then strip the header and <plist></plist> part
-            ENTITLEMENTS_VALUE="$(PlistBuddy -x -c "Print $KEY" "$APP_ENTITLEMENTS" 2>/dev/null | sed -e 's,.*<plist[^>]*>\(.*\)</plist>,\1,g')"
+            ENTITLEMENTS_VALUE="$(PlistBuddy -x -c "Print $KEY" "$APP_ENTITLEMENTS" 2>/dev/null | /usr/bin/sed -e 's,.*<plist[^>]*>\(.*\)</plist>,\1,g')"
             if [[ -z "$ENTITLEMENTS_VALUE" ]]; then
                 log "No value for '$KEY'"
                 continue
@@ -780,7 +783,7 @@ function resign {
                     log "Certificate $CERTIFICATE matches a SHA1 pattern"
                     local certificate_matches="$( security find-identity -v -p codesigning | grep -m 1 "$CERTIFICATE" )"
                     if [ -n "$certificate_matches" ]; then
-                        certificate_name="$( sed -E s/[^\"]+\"\([^\"]+\)\".*/\\1/ <<< $certificate_matches )"
+                        certificate_name="$(/usr/bin/sed -E s/[^\"]+\"\([^\"]+\)\".*/\\1/ <<< $certificate_matches )"
                         log "Certificate name: $certificate_name"
                     fi
                 fi
@@ -807,18 +810,18 @@ function resign {
             # otherwise it interprets they key path as nested keys
             # TODO: Should be able to replace with echo ${KEY//\./\\\\.} and remove shellcheck disable directive
             # shellcheck disable=SC2001
-            PLUTIL_KEY=$(echo "$KEY" | sed 's/\./\\\./g')
+            PLUTIL_KEY=$(echo "$KEY" | /usr/bin/sed 's/\./\\\./g')
             plutil -insert "$PLUTIL_KEY" -xml "$ENTITLEMENTS_VALUE" "$PATCHED_ENTITLEMENTS"
 
             # Patch the ID value if specified
             if [[ "$ID_TYPE" == "APP_ID" ]]; then
                 # Replace old value with new value in patched entitlements
                 log "Replacing old app identifier prefix '$OLD_APP_ID' with new value '$NEW_APP_ID'"
-                sed -i .bak "s/$OLD_APP_ID/$NEW_APP_ID/g" "$PATCHED_ENTITLEMENTS"
+                /usr/bin/sed -i .bak "s/$OLD_APP_ID/$NEW_APP_ID/g" "$PATCHED_ENTITLEMENTS"
             elif [[ "$ID_TYPE" == "TEAM_ID" ]]; then
                 # Replace old team identifier with new value
                 log "Replacing old team ID '$OLD_TEAM_ID' with new team ID: '$NEW_TEAM_ID'"
-                sed -i .bak "s/$OLD_TEAM_ID/$NEW_TEAM_ID/g" "$PATCHED_ENTITLEMENTS"
+                /usr/bin/sed -i .bak "s/$OLD_TEAM_ID/$NEW_TEAM_ID/g" "$PATCHED_ENTITLEMENTS"
             else
                 continue
             fi
@@ -835,7 +838,7 @@ function resign {
         # e.g. <string>AB1GP98Q19.com.example.foo</string>
         #         vs
         #      com.example.foo
-        sed -i .bak "s!${OLD_BUNDLE_ID}</string>!${NEW_BUNDLE_ID}</string>!g" "$PATCHED_ENTITLEMENTS"
+        /usr/bin/sed -i .bak "s!${OLD_BUNDLE_ID}</string>!${NEW_BUNDLE_ID}</string>!g" "$PATCHED_ENTITLEMENTS"
 
         log "Resigning application using certificate: '$CERTIFICATE'"
         log "and patched entitlements:"

data/sigh/lib/sigh/runner.rb

@@ -17,9 +17,10 @@ module Sigh
                                          hide_keys: [:output_path],
                                              title: "Summary for sigh #{Fastlane::VERSION}")
 
+      # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+      # Prompts select team if multiple teams and none specified
       UI.message("Starting login with user '#{Sigh.config[:username]}'")
-      Spaceship::ConnectAPI.login(Sigh.config[:username], nil)
-      Spaceship::ConnectAPI.select_team
+      Spaceship::ConnectAPI.login(Sigh.config[:username], nil, use_portal: true, use_tunes: false)
       UI.message("Successfully logged in")
 
       profiles = [] if Sigh.config[:skip_fetch_profiles]

data/spaceship/lib/spaceship/client.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'tmpdir'
 require 'cgi'
 require 'tempfile'
+require 'openssl'
 
 require 'fastlane/version'
 require_relative 'helper/net_http_generic_request'

data/spaceship/lib/spaceship/connect_api.rb

@@ -39,6 +39,7 @@ require 'spaceship/connect_api/models/app_info_localization'
 require 'spaceship/connect_api/models/app_preview_set'
 require 'spaceship/connect_api/models/app_preview'
 require 'spaceship/connect_api/models/app_price'
+require 'spaceship/connect_api/models/app_price_point'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'

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

@@ -38,21 +38,30 @@ module Spaceship
       #
       # @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 use_portal (Boolean) (optional): Whether to log in to Spaceship::Portal or not
+      # @param use_tunes (Boolean) (optional): Whether to log in to Spaceship::Tunes or not
+      # @param portal_team_id (String) (optional): The Spaceship::Portal team id
+      # @param tunes_team_id (String) (optional): The Spaceship::Tunes 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 self.login(user = nil, password = nil, team_id: nil, team_name: nil)
-        tunes_client = TunesClient.login(user, password)
-        portal_client = PortalClient.login(user, password)
-
-        # The clients will automatically select the first team if none is given
-        if !team_id.nil? || !team_name.nil?
-          tunes_client.select_team(team_id: team_id, team_name: team_name)
-          portal_client.select_team(team_id: team_id, team_name: team_name)
-        end
+      def self.login(user = nil, password = nil, use_portal: true, use_tunes: true, portal_team_id: nil, tunes_team_id: nil, team_name: nil)
+        portal_client = Spaceship::Portal.login(user, password) if use_portal
+        tunes_client = Spaceship::Tunes.login(user, password) if use_tunes
+
+        # Check if environment variables are set for Spaceship::Portal or Spaceship::Tunes to select team
+        portal_team_id ||= ENV['FASTLANE_TEAM_ID']
+        portal_team_name = team_name || ENV['FASTLANE_TEAM_NAME']
+        tunes_team_id ||= ENV['FASTLANE_ITC_TEAM_ID']
+        tunes_team_name = team_name || ENV['FASTLANE_ITC_TEAM_NAME']
+
+        # The clients will prompt for a team selection if:
+        # 1. client exists
+        # 2. team_id and team_name are nil and user belongs to multiple teams
+        portal_client.select_team(team_id: portal_team_id, team_name: portal_team_name) if portal_client
+        tunes_client.select_team(team_id: tunes_team_id, team_name: tunes_team_name) if tunes_client
 
         return ConnectAPI::Client.new(tunes_client: tunes_client, portal_client: portal_client)
       end
@@ -84,6 +93,16 @@ module Spaceship
         )
       end
 
+      def portal_team_id
+        return nil if @portal_client.nil?
+        return @portal_client.team_id
+      end
+
+      def tunes_team_id
+        return nil if @tunes_client.nil?
+        return @tunes_client.team_id
+      end
+
       def in_house?
         if token
           if token.in_house.nil?
@@ -104,9 +123,9 @@ module Spaceship
         end
       end
 
-      def select_team(team_id: nil, team_name: nil)
-        @tunes_client.select_team(team_id: team_id, team_name: team_name)
-        @portal_client.select_team(team_id: team_id, team_name: team_name)
+      def select_team(portal_team_id: nil, tunes_team_id: nil, team_name: nil)
+        @portal_client.select_team(team_id: portal_team_id, team_name: team_name) unless @portal_client.nil?
+        @tunes_client.select_team(team_id: tunes_team_id, team_name: team_name) unless @tunes_client.nil?
 
         # Updating the tunes and portal clients requires resetting
         # of the clients in the API modules

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

@@ -4,6 +4,8 @@ require 'faraday_middleware'
 
 require 'spaceship/globals'
 
+require 'openssl'
+
 module Spaceship
   class ConnectAPI
     module FileUploader

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -192,7 +192,7 @@ module Spaceship
                .last
       end
 
-      def get_live_app_store_version(platform: nil, includes: nil)
+      def get_live_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
@@ -201,7 +201,7 @@ module Spaceship
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_edit_app_store_version(platform: nil, includes: nil)
+      def get_edit_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: [
@@ -221,7 +221,7 @@ module Spaceship
                .last
       end
 
-      def get_in_review_app_store_version(platform: nil, includes: nil)
+      def get_in_review_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
@@ -230,7 +230,7 @@ module Spaceship
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_pending_release_app_store_version(platform: nil, includes: nil)
+      def get_pending_release_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
@@ -239,7 +239,7 @@ module Spaceship
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_app_store_versions(filter: {}, includes: nil, limit: nil, sort: nil)
+      def get_app_store_versions(filter: {}, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end

data/spaceship/lib/spaceship/connect_api/models/app_price_point.rb

@@ -0,0 +1,26 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppPricePoint
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :customer_price
+
+      attr_accessor :proceeds
+
+      attr_accessor :price_tier
+      attr_accessor :territory
+
+      attr_mapping({
+        "customerPrice" => "customer_price",
+        "proceeds" => "proceeds",
+        "priceTier" => "price_tier",
+        "territory" => "territory"
+      })
+
+      def self.type
+        return "appPricePoints"
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb

@@ -55,9 +55,15 @@ module Spaceship
         "downloadable" =>  "downloadable",
         "createdDate" =>  "created_date",
 
-        "appStoreVersionSubmission" => "app_store_version_submission"
+        "appStoreVersionSubmission" => "app_store_version_submission",
+        "build" => "build"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "appStoreVersionSubmission",
+        "build"
+      ].join(",")
+
       def self.type
         return "appStoreVersions"
       end

data/spaceship/lib/spaceship/connect_api/models/app_store_version_phased_release.rb

@@ -11,6 +11,9 @@ module Spaceship
 
       module PhasedReleaseState
         INACTIVE = "INACTIVE"
+        ACTIVE = "ACTIVE"
+        PAUSED = "PAUSED"
+        COMPLETE = "COMPLETE"
       end
 
       attr_mapping({
@@ -28,9 +31,27 @@ module Spaceship
       # API
       #
 
+      def pause
+        update(PhasedReleaseState::PAUSED)
+      end
+
+      def resume
+        update(PhasedReleaseState::ACTIVE)
+      end
+
+      def complete
+        update(PhasedReleaseState::COMPLETE)
+      end
+
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)
         Spaceship::ConnectAPI.delete_app_store_version_phased_release(app_store_version_phased_release_id: id)
       end
+
+      private def update(state)
+        Spaceship::ConnectAPI.patch_app_store_version_phased_release(app_store_version_phased_release_id: id, attributes: {
+          phasedReleaseState: state
+        }).to_models.first
+      end
     end
   end
 end

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

@@ -68,14 +68,17 @@ module Spaceship
       #
       # @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 use_portal (Boolean) (optional): Whether to log in to Spaceship::Portal or not
+      # @param use_tunes (Boolean) (optional): Whether to log in to Spaceship::Tunes or not
+      # @param portal_team_id (String) (optional): The Spaceship::Portal team id
+      # @param tunes_team_id (String) (optional): The Spaceship::Tunes 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)
+      def login(user = nil, password = nil, use_portal: true, use_tunes: true, portal_team_id: nil, tunes_team_id: nil, team_name: nil)
+        @client = ConnectAPI::Client.login(user, password, use_portal: use_portal, use_tunes: use_tunes, portal_team_id: portal_team_id, tunes_team_id: tunes_team_id, team_name: team_name)
       end
 
       # Open up the team selection for the user (if necessary).
@@ -83,11 +86,12 @@ module Spaceship
       # 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 portal_team_id (String) (optional): The Spaceship::Portal team id
+      # @param tunes_team_id (String) (optional): The Spaceship::Tunes team id
       # @param team_name (String) (optional): The name of an App Store Connect team
-      def select_team(team_id: nil, team_name: nil)
+      def select_team(portal_team_id: nil, tunes_team_id: nil, team_name: nil)
         return if client.nil?
-        client.select_team(team_id: team_id, team_name: team_name)
+        client.select_team(portal_team_id: portal_team_id, tunes_team_id: tunes_team_id, team_name: team_name)
       end
     end
   end

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

@@ -18,13 +18,13 @@ module Spaceship
         #
 
         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)
+          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_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)
+          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
 
         #
@@ -32,8 +32,8 @@ module Spaceship
         #
 
         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)
+          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: {})
@@ -52,7 +52,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.post("betaAppLocalizations", body)
+          test_flight_request_client.post("betaAppLocalizations", body)
         end
 
         def patch_beta_app_localizations(localization_id: nil, attributes: {})
@@ -64,7 +64,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.patch("betaAppLocalizations/#{localization_id}", body)
+          test_flight_request_client.patch("betaAppLocalizations/#{localization_id}", body)
         end
 
         #
@@ -72,8 +72,8 @@ module Spaceship
         #
 
         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)
+          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: {})
@@ -85,7 +85,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.patch("betaAppReviewDetails/#{app_id}", body)
+          test_flight_request_client.patch("betaAppReviewDetails/#{app_id}", body)
         end
 
         #
@@ -93,8 +93,8 @@ module Spaceship
         #
 
         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)
+          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)
@@ -112,12 +112,12 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.post("betaAppReviewSubmissions", body)
+          test_flight_request_client.post("betaAppReviewSubmissions", body)
         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)
+          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
 
         #
@@ -125,8 +125,8 @@ module Spaceship
         #
 
         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)
+          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: {})
@@ -145,7 +145,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.post("betaBuildLocalizations", body)
+          test_flight_request_client.post("betaBuildLocalizations", body)
         end
 
         def patch_beta_build_localizations(localization_id: nil, feedbackEmail: nil, attributes: {})
@@ -157,7 +157,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.patch("betaBuildLocalizations/#{localization_id}", body)
+          test_flight_request_client.patch("betaBuildLocalizations/#{localization_id}", body)
         end
 
         #
@@ -165,8 +165,8 @@ module Spaceship
         #
 
         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)
+          params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          test_flight_request_client.get("betaBuildMetrics", params)
         end
 
         #
@@ -174,8 +174,8 @@ module Spaceship
         #
 
         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)
+          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: [])
@@ -188,7 +188,7 @@ module Spaceship
             end
           }
 
-          @test_flight_request_client.post("builds/#{build_id}/relationships/betaGroups", body)
+          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)
@@ -211,7 +211,7 @@ module Spaceship
               type: "betaGroups"
             }
           }
-          @test_flight_request_client.post("betaGroups", body)
+          test_flight_request_client.post("betaGroups", body)
         end
 
         #
@@ -219,8 +219,8 @@ module Spaceship
         #
 
         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)
+          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: ""}]
@@ -248,7 +248,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.post("bulkBetaTesterAssignments", body)
+          test_flight_request_client.post("bulkBetaTesterAssignments", body)
         end
 
         def delete_beta_tester_from_apps(beta_tester_id: nil, app_ids: [])
@@ -261,7 +261,7 @@ module Spaceship
             end
           }
 
-          @test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/apps", nil, body)
+          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: [])
@@ -274,7 +274,7 @@ module Spaceship
             end
           }
 
-          @test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
+          test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
         end
 
         #
@@ -282,8 +282,8 @@ module Spaceship
         #
 
         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)
+          params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          test_flight_request_client.get("betaTesterMetrics", params)
         end
 
         #
@@ -291,17 +291,17 @@ module Spaceship
         #
 
         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)
+          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 = @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)
+            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)
+            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
@@ -316,7 +316,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.patch("builds/#{build_id}", body)
+          test_flight_request_client.patch("builds/#{build_id}", body)
         end
 
         #
@@ -324,8 +324,8 @@ module Spaceship
         #
 
         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)
+          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: {})
@@ -337,7 +337,7 @@ module Spaceship
             }
           }
 
-          @test_flight_request_client.patch("buildBetaDetails/#{build_beta_details_id}", body)
+          test_flight_request_client.patch("buildBetaDetails/#{build_beta_details_id}", body)
         end
 
         #
@@ -345,8 +345,8 @@ module Spaceship
         #
 
         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)
+          params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          test_flight_request_client.get("buildDeliveries", params)
         end
 
         #
@@ -354,8 +354,8 @@ module Spaceship
         #
 
         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)
+          params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          test_flight_request_client.get("preReleaseVersions", params)
         end
 
         #
@@ -363,14 +363,14 @@ module Spaceship
         #
 
         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)
+          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?
 
-          @test_flight_request_client.delete("betaFeedbacks/#{feedback_id}")
+          test_flight_request_client.delete("betaFeedbacks/#{feedback_id}")
         end
       end
     end