fastlane 2.125.0.beta.20190531200016 → 2.125.0

data/pilot/lib/pilot/manager.rb

@@ -27,9 +27,9 @@ module Pilot
 
     # The app object we're currently using
     def app
-      @apple_id ||= fetch_apple_id
+      @app_id ||= fetch_app_id
 
-      @app ||= Spaceship::Tunes::Application.find(@apple_id)
+      @app ||= Spaceship::ConnectAPI::App.get(app_id: @app_id)
       unless @app
         UI.user_error!("Could not find app with #{(config[:apple_id] || config[:app_identifier])}")
       end
@@ -42,20 +42,20 @@ module Pilot
     # Config Related
     ################
 
-    def fetch_apple_id
-      @apple_id ||= config[:apple_id]
-      return @apple_id if @apple_id
+    def fetch_app_id
+      @app_id ||= config[:apple_id]
+      return @app_id if @app_id
       config[:app_identifier] = fetch_app_identifier
 
       if config[:app_identifier]
-        @app ||= Spaceship::Tunes::Application.find(config[:app_identifier])
+        @app ||= Spaceship::ConnectAPI::App.find(config[:app_identifier])
         UI.user_error!("Couldn't find app '#{config[:app_identifier]}' on the account of '#{config[:username]}' on App Store Connect") unless @app
-        apple_id ||= @app.apple_id
+        @app_id ||= @app.id
       end
 
-      apple_id ||= UI.input("Could not automatically find the app ID, please enter it here (e.g. 956814360): ")
+      @app_id ||= UI.input("Could not automatically find the app ID, please enter it here (e.g. 956814360): ")
 
-      return apple_id
+      return @app_id
     end
 
     def fetch_app_identifier

data/pilot/lib/pilot/tester_exporter.rb

@@ -1,5 +1,4 @@
 require 'spaceship/tunes/application'
-require 'spaceship/test_flight/tester'
 require_relative 'tester_util'
 require_relative 'module'
 require_relative 'manager'
@@ -12,13 +11,11 @@ module Pilot
       start(options)
       require 'csv'
 
-      app_filter = (config[:apple_id] || config[:app_identifier])
-      if app_filter
-        app = Spaceship::Tunes::Application.find(app_filter)
-
-        testers = Spaceship::TestFlight::Tester.all(app_id: app.apple_id)
+      app = find_app(apple_id: options[:apple_id], app_identifier: options[:app_identifier])
+      if app
+        testers = app.get_beta_testers(includes: "apps,betaTesterMetrics,betaGroups")
       else
-        testers = Spaceship::TestFlight::Tester.all
+        testers = Spaceship::ConnectAPI::BetaTester.all(includes: "apps,betaTesterMetrics,betaGroups")
       end
 
       file = config[:testers_file_path]
@@ -27,10 +24,13 @@ module Pilot
         csv << ['First', 'Last', 'Email', 'Groups', 'Installed Version', 'Install Date']
 
         testers.each do |tester|
-          group_names = tester.groups.join(";") || ""
-          latest_install_info = tester.latest_install_info
-          install_version = latest_install_info["latestInstalledShortVersion"] || ""
-          pretty_date = tester.pretty_install_date || ""
+          group_names = tester.beta_groups.map(&:name).join(";") || ""
+
+          metric = (tester.beta_tester_metrics || []).first
+          if metric.installed?
+            install_version = "#{metric.installed_cf_bundle_short_version_string} (#{metric.installed_cf_bundle_version})"
+            pretty_date = metric.installed_cf_bundle_version
+          end
 
           csv << [tester.first_name, tester.last_name, tester.email, group_names, install_version, pretty_date]
         end
@@ -38,5 +38,21 @@ module Pilot
         UI.success("Successfully exported CSV to #{file}")
       end
     end
+
+    def find_app(apple_id: nil, app_identifier: nil)
+      if app_identifier
+        app = Spaceship::ConnectAPI::App.find(app_identifier)
+        UI.user_error!("Could not find an app by #{app_identifier}") unless app
+        return app
+      end
+
+      if apple_id
+        app = Spaceship::ConnectAPI::App.get(app_id: apple_id)
+        UI.user_error!("Could not find an app by #{apple_id}") unless app
+        return app
+      end
+
+      UI.user_error!("You must include an `app_identifier` to `list_testers`")
+    end
   end
 end

data/pilot/lib/pilot/tester_manager.rb

@@ -7,35 +7,30 @@ module Pilot
   class TesterManager < Manager
     def add_tester(options)
       start(options)
-      app = find_app(app_filter: config[:apple_id] || config[:app_identifier])
+      app = find_app(apple_id: config[:apple_id], app_identifier: config[:app_identifier])
       UI.user_error!("You must provide either a Apple ID for the app (with the `:apple_id` option) or app identifier (with the `:app_identifier` option)") unless app
 
       groups_param = config[:groups]
       UI.user_error!("You must provide 1 or more groups (with the `:groups` option)") unless groups_param
 
-      tester = find_app_tester(email: config[:email], app: app)
-      tester ||= create_tester(
-        email: config[:email],
-        first_name: config[:first_name],
-        last_name: config[:last_name],
-        app: app
-      )
-      begin
-        # Groups are now required
-        groups = Spaceship::TestFlight::Group.add_tester_to_groups!(tester: tester, app: app, groups: config[:groups])
-        group_names = groups.map(&:name).join(", ")
-        UI.success("Successfully added tester to group(s): #{group_names} in app: #{app.name}")
-      rescue => ex
-        UI.error("Could not add #{tester.email} to app: #{app.name}")
-        raise ex
+      app.get_beta_groups.select do |group|
+        next unless groups_param.include?(group.name)
+        user = {
+          email: config[:email],
+          firstName: config[:first_name],
+          lastName: config[:last_name]
+        }
+        group.post_bulk_beta_tester_assignments(beta_testers: [user])
       end
+
+      group_names = groups_param.join(';')
+      UI.success("Successfully added tester #{config[:email]} to app #{app.name} in group(s) #{group_names}")
     end
 
     def find_tester(options)
       start(options)
 
-      app_filter = (config[:apple_id] || config[:app_identifier])
-      app = find_app(app_filter: app_filter)
+      app = find_app(apple_id: config[:apple_id], app_identifier: config[:app_identifier])
 
       tester = find_app_tester(email: config[:email], app: app)
       UI.user_error!("Tester #{config[:email]} not found") unless tester
@@ -47,35 +42,24 @@ module Pilot
     def remove_tester(options)
       start(options)
 
-      app_filter = (config[:apple_id] || config[:app_identifier])
-      app = find_app(app_filter: app_filter)
+      app = find_app(apple_id: config[:apple_id], app_identifier: config[:app_identifier])
 
       tester = find_app_tester(email: config[:email], app: app)
       UI.user_error!("Tester #{config[:email]} not found") unless tester
 
-      unless app
-        tester.delete!
-        UI.success("Successfully removed tester #{tester.email} from Users and Roles")
-        return
-      end
-
       begin
         # If no groups are passed to options, remove the tester from the app-level,
         # otherwise remove the tester from the groups specified.
         if config[:groups].nil?
-          test_flight_testers = Spaceship::TestFlight::Tester.search(app_id: app.apple_id, text: tester.email, is_email_exact_match: true)
-
-          if test_flight_testers.length > 1
-            UI.user_error!("Could not remove #{tester.email} from app: #{app.name}, reason: too many matches: #{test_flight_testers}")
-          elsif test_flight_testers.length == 0
-            UI.user_error!("Could not remove #{tester.email} from app: #{app.name}, reason: unable to find tester on app")
-          end
-          test_flight_tester = test_flight_testers.first
-          test_flight_tester.remove_from_app!(app_id: app.apple_id)
-          UI.success("Successfully removed tester, #{test_flight_tester.email}, from app: #{app.name}")
+          tester.delete_from_apps(apps: [app])
+          UI.success("Successfully removed tester #{tester.email} from app: #{app.name}")
         else
-          groups = Spaceship::TestFlight::Group.remove_tester_from_groups!(tester: tester, app: app, groups: config[:groups])
-          group_names = groups.map(&:name).join(", ")
+          groups = tester.beta_groups.select do |group|
+            config[:groups].include?(group.name)
+          end
+          tester.delete_from_beta_groups(beta_groups: groups)
+
+          group_names = groups.map(&:name)
           UI.success("Successfully removed tester #{tester.email} from app #{app.name} in group(s) #{group_names}")
         end
       rescue => ex
@@ -87,9 +71,9 @@ module Pilot
     def list_testers(options)
       start(options)
 
-      app_filter = (config[:apple_id] || config[:app_identifier])
-      if app_filter
-        list_testers_by_app(app_filter)
+      app = find_app(apple_id: config[:apple_id], app_identifier: config[:app_identifier])
+      if app
+        list_testers_by_app(app)
       else
         UI.user_error!("You must include an `app_identifier` to `list_testers`")
       end
@@ -97,30 +81,24 @@ module Pilot
 
     private
 
-    def find_app(app_filter: nil)
-      if app_filter
-        app = Spaceship::Tunes::Application.find(app_filter)
-        UI.user_error!("Could not find an app by #{app_filter}") unless app
+    def find_app(apple_id: nil, app_identifier: nil)
+      if app_identifier
+        app = Spaceship::ConnectAPI::App.find(app_identifier)
+        UI.user_error!("Could not find an app by #{app_identifier}") unless app
+        return app
+      end
+
+      if apple_id
+        app = Spaceship::ConnectAPI::App.get(app_id: apple_id)
+        UI.user_error!("Could not find an app by #{apple_id}") unless app
         return app
       end
-      nil
+
+      UI.user_error!("You must include an `app_identifier` to `list_testers`")
     end
 
     def find_app_tester(email: nil, app: nil)
-      current_user = find_current_user
-      app_apple_id = app.nil? ? nil : app.apple_id
-
-      if current_user.admin?
-        tester = Spaceship::TestFlight::Tester.find(app_id: app_apple_id, email: email)
-      elsif current_user.app_manager?
-        unless app_apple_id
-          UI.user_error!("Account #{current_user.email_address} is only an 'App Manager' and therefore you must also define what app this tester (#{email}) should be added to")
-        end
-        tester = Spaceship::TestFlight::Tester.find(app_id: app_apple_id, email: email)
-      else
-        UI.user_error!("Account #{current_user.email_address} doesn't have a role that is allowed to administer app testers, current roles: #{current_user.roles}")
-        tester = nil
-      end
+      tester = app.get_beta_testers(filter: { email: email }, includes: "apps,betaTesterMetrics,betaGroups").first
 
       if tester
         UI.success("Found existing tester #{email}")
@@ -129,46 +107,16 @@ module Pilot
       return tester
     end
 
-    def find_current_user
-      current_user_email = Spaceship::Tunes.client.user_email
-      current_user_apple_id = Spaceship::Tunes.client.user
-
-      current_user = Spaceship::Tunes::Members.find(current_user_email)
-      unless current_user
-        UI.user_error!("Unable to find a member for AppleID: #{current_user_apple_id}, email: #{current_user_email}")
-      end
-      return current_user
-    end
-
-    def create_tester(email: nil, first_name: nil, last_name: nil, app: nil)
-      current_user = find_current_user
-      if current_user.admin? || current_user.app_manager?
-        Spaceship::TestFlight::Tester.create_app_level_tester(app_id: app.apple_id,
-                                                          first_name: first_name || '',
-                                                           last_name: last_name || '',
-                                                               email: email)
-
-        UI.success("Successfully added tester: #{email} to app: #{app.name}")
-        return Spaceship::TestFlight::Tester.find(app_id: app.apple_id, email: email)
-      else
-        UI.user_error!("Current account doesn't have permission to create a tester")
-      end
-    rescue => ex
-      UI.error("Could not create tester #{email}")
-      raise ex
-    end
+    def list_testers_by_app(app)
+      testers = app.get_beta_testers(includes: "apps,betaTesterMetrics,betaGroups")
 
-    def list_testers_by_app(app_filter)
-      app = Spaceship::Tunes::Application.find(app_filter)
-      UI.user_error!("Couldn't find app with '#{app_filter}'") unless app
-      testers = Spaceship::TestFlight::Tester.all(app_id: app.apple_id)
       list_by_app(testers, "All Testers")
     end
 
     def list_by_app(all_testers, title)
       headers = ["First", "Last", "Email", "Groups"]
       list(all_testers, "#{title} (#{all_testers.count})", headers) do |tester|
-        tester_groups = tester.groups.nil? ? nil : tester.groups.join(";")
+        tester_groups = tester.beta_groups.nil? ? nil : tester.beta_groups.map(&:name).join(";")
         [
           tester.first_name,
           tester.last_name,
@@ -200,13 +148,15 @@ module Pilot
       rows << ["Last name", tester.last_name]
       rows << ["Email", tester.email]
 
-      if tester.groups.to_s.length > 0
-        rows << ["Groups", tester.groups.join(";")]
+      if tester.beta_groups
+        rows << ["Groups", tester.beta_groups.map(&:name).join(";")]
       end
 
-      if tester.latest_installed_date
-        rows << ["Latest Version", "#{tester.latest_install_info['latestInstalledShortVersion']} (#{tester.latest_install_info['latestInstalledVersion']})"]
-        rows << ["Latest Install Date", tester.pretty_install_date]
+      metric = (tester.beta_tester_metrics || []).first
+      if metric.installed?
+        rows << ["Latest Version", "#{metric.installed_cf_bundle_short_version_string} (#{metric.installed_cf_bundle_version})"]
+        rows << ["Latest Install Date", metric.installed_cf_bundle_version]
+        rows << ["Installed", metric.installed?]
       end
 
       puts(Terminal::Table.new(

data/spaceship/lib/spaceship/connect_api.rb

@@ -1,2 +1,20 @@
 require 'spaceship/connect_api/client'
 require 'spaceship/connect_api/base'
+require 'spaceship/connect_api/response'
+require 'spaceship/connect_api/token'
+
+require 'spaceship/connect_api/models/model'
+require 'spaceship/connect_api/models/app'
+require 'spaceship/connect_api/models/beta_app_localization'
+require 'spaceship/connect_api/models/beta_build_localization'
+require 'spaceship/connect_api/models/beta_build_metric'
+require 'spaceship/connect_api/models/beta_app_review_detail'
+require 'spaceship/connect_api/models/beta_app_review_submission'
+require 'spaceship/connect_api/models/beta_group'
+require 'spaceship/connect_api/models/beta_tester'
+require 'spaceship/connect_api/models/beta_tester_metric'
+require 'spaceship/connect_api/models/build'
+require 'spaceship/connect_api/models/build_delivery'
+require 'spaceship/connect_api/models/build_beta_detail'
+require 'spaceship/connect_api/models/pre_release_version'
+require 'spaceship/connect_api/models/user'

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

@@ -1,6 +1,8 @@
 require_relative '../client'
+require_relative './response'
 
 module Spaceship
+  # rubocop:disable Metrics/ClassLength
   module ConnectAPI
     class Client < Spaceship::Client
       ##
@@ -18,9 +20,15 @@ module Spaceship
         'https://appstoreconnect.apple.com/iris/v1/'
       end
 
+      #
+      # Helpers
+      #
+
       def build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
         params = {}
 
+        filter = filter.delete_if { |k, v| v.nil? } if filter
+
         params[:filter] = filter if filter && !filter.empty?
         params[:include] = includes if includes
         params[:limit] = limit if limit
@@ -30,62 +38,71 @@ module Spaceship
         return params
       end
 
-      def get_beta_app_review_detail(filter: {}, includes: nil, limit: nil, sort: nil)
-        # GET
-        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewDetails?filter[app]=<app_id>
-        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-
-        response = request(:get, "betaAppReviewDetails") do |req|
+      def get(url_or_path, params = nil)
+        response = request(:get) do |req|
+          req.url(url_or_path)
           req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
+          req.params = params if params
         end
         handle_response(response)
       end
 
-      def patch_beta_app_review_detail(app_id: nil, attributes: {})
-        # PATCH
-        # https://appstoreconnect.apple.com/iris/v1/apps/<app_id>/betaAppReviewDetails
-        path = "betaAppReviewDetails/#{app_id}"
-
-        body = {
-          data: {
-            attributes: attributes,
-            id: app_id,
-            type: "betaAppReviewDetails"
-          }
-        }
+      def post(url_or_path, body)
+        response = request(:post) do |req|
+          req.url(url_or_path)
+          req.body = body.to_json
+          req.headers['Content-Type'] = 'application/json'
+        end
+        handle_response(response)
+      end
 
+      def patch(url_or_path, body)
         response = request(:patch) do |req|
-          req.url(path)
+          req.url(url_or_path)
           req.body = body.to_json
           req.headers['Content-Type'] = 'application/json'
         end
         handle_response(response)
       end
 
-      def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        # GET
-        # https://appstoreconnect.apple.com/iris/v1/betaAppLocalizations?filter[app]=<app_id>
-        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-
-        response = request(:get, "betaAppLocalizations") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
+      def delete(url_or_path, params = nil, body = nil)
+        response = request(:delete) do |req|
+          req.url(url_or_path)
+          req.options.params_encoder = Faraday::NestedParamsEncoder if params
+          req.params = params if params
+          req.body = body.to_json if body
+          req.headers['Content-Type'] = 'application/json' if body
         end
         handle_response(response)
       end
 
-      def get_beta_build_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+      #
+      # apps
+      #
+
+      def get_apps(filter: {}, includes: nil, limit: nil, sort: nil)
         # GET
-        # https://appstoreconnect.apple.com/iris/v1/betaBuildLocalizations?filter[build]=<build_id>
-        path = "betaBuildLocalizations"
+        # https://appstoreconnect.apple.com/iris/v1/apps
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("apps", params)
+      end
 
-        response = request(:get, path) do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response)
+      def get_app(app_id: nil, includes: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/apps/<app_id>
+        params = build_params(filter: nil, includes: includes, limit: nil, sort: nil)
+        get("apps/#{app_id}", params)
+      end
+
+      #
+      # betaAppLocalizations
+      #
+
+      def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaAppLocalizations?filter[app]=<app_id>
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("betaAppLocalizations", params)
       end
 
       def post_beta_app_localizations(app_id: nil, attributes: {})
@@ -108,12 +125,7 @@ module Spaceship
           }
         }
 
-        response = request(:post) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        post(path, body)
       end
 
       def patch_beta_app_localizations(localization_id: nil, attributes: {})
@@ -129,12 +141,85 @@ module Spaceship
           }
         }
 
-        response = request(:patch) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        patch(path, body)
+      end
+
+      #
+      # betaAppReviewDetails
+      #
+
+      def get_beta_app_review_detail(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewDetails?filter[app]=<app_id>
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("betaAppReviewDetails", params)
+      end
+
+      def patch_beta_app_review_detail(app_id: nil, attributes: {})
+        # PATCH
+        # https://appstoreconnect.apple.com/iris/v1/apps/<app_id>/betaAppReviewDetails
+        path = "betaAppReviewDetails/#{app_id}"
+
+        body = {
+          data: {
+            attributes: attributes,
+            id: app_id,
+            type: "betaAppReviewDetails"
+          }
+        }
+
+        patch(path, body)
+      end
+
+      #
+      # betaAppReviewSubmissions
+      #
+
+      def get_beta_app_review_submissions(filter: {}, includes: nil, limit: nil, sort: nil, cursor: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewSubmissions
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+        get("betaAppReviewSubmissions", params)
+      end
+
+      def post_beta_app_review_submissions(build_id: nil)
+        # POST
+        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewSubmissions
+        path = "betaAppReviewSubmissions"
+        body = {
+          data: {
+            type: "betaAppReviewSubmissions",
+            relationships: {
+              build: {
+                data: {
+                  type: "builds",
+                  id: build_id
+                }
+              }
+            }
+          }
+        }
+
+        post(path, body)
+      end
+
+      def delete_beta_app_review_submission(beta_app_review_submission_id: nil)
+        # DELETE
+        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewSubmissions/<beta_app_review_submission_id>
+        params = build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
+        delete("betaAppReviewSubmissions/#{beta_app_review_submission_id}", params)
+      end
+
+      #
+      # betaBuildLocalizations
+      #
+
+      def get_beta_build_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaBuildLocalizations
+        path = "betaBuildLocalizations"
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get(path, params)
       end
 
       def post_beta_build_localizations(build_id: nil, attributes: {})
@@ -157,12 +242,7 @@ module Spaceship
           }
         }
 
-        response = request(:post) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        post(path, body)
       end
 
       def patch_beta_build_localizations(localization_id: nil, feedbackEmail: nil, attributes: {})
@@ -178,69 +258,147 @@ module Spaceship
           }
         }
 
-        response = request(:patch) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        patch(path, body)
       end
 
-      def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
+      #
+      # betaBuildMetrics
+      #
+
+      def get_beta_build_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
         # GET
-        # https://appstoreconnect.apple.com/iris/v1/buildBetaDetails
+        # https://appstoreconnect.apple.com/iris/v1/betaBuildMetrics
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("betaBuildMetrics", params)
+      end
 
-        response = request(:get, "buildBetaDetails") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response)
+      #
+      # betaGroups
+      #
+
+      def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaGroups
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("betaGroups", params)
       end
 
-      def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
-        # PATCH
-        # https://appstoreconnect.apple.com/iris/v1/buildBetaDetails/<build_beta_details_id>
-        path = "buildBetaDetails/#{build_beta_details_id}"
+      def add_beta_groups_to_build(build_id: nil, beta_group_ids: [])
+        # POST
+        # https://appstoreconnect.apple.com/iris/v1/builds/<build_id>/relationships/betaGroups
+        path = "builds/#{build_id}/relationships/betaGroups"
+        body = {
+          data: beta_group_ids.map do |id|
+            {
+              type: "betaGroups",
+              id: id
+            }
+          end
+        }
+
+        post(path, body)
+      end
+
+      #
+      # betaTesters
+      #
+
+      def get_beta_testers(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/betaTesters
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("betaTesters", params)
+      end
+
+      # beta_testers - [{email: "", firstName: "", lastName: ""}]
+      def post_bulk_beta_tester_assignments(beta_group_id: nil, beta_testers: nil)
+        # POST
+        # https://appstoreconnect.apple.com/iris/v1/bulkBetaTesterAssignments
+        beta_testers || []
+
+        beta_testers.map do |tester|
+          tester[:errors] = []
+        end
 
         body = {
           data: {
-            attributes: attributes,
-            id: build_beta_details_id,
-            type: "buildBetaDetails"
+            attributes: {
+              betaTesters: beta_testers
+            },
+            relationships: {
+              betaGroup: {
+                data: {
+                  type: "betaGroups",
+                  id: beta_group_id
+                }
+              }
+            },
+            type: "bulkBetaTesterAssignments"
           }
         }
 
-        response = request(:patch) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        post("bulkBetaTesterAssignments", body)
       end
 
-      def get_build_deliveries(filter: {}, includes: nil, limit: 10, sort: nil)
+      def delete_beta_tester_from_apps(beta_tester_id: nil, app_ids: [])
+        # DELETE
+        # https://appstoreconnect.apple.com/iris/v1/betaTesters/<beta_tester_id>/relationships/apps
+        path = "betaTesters/#{beta_tester_id}/relationships/apps"
+        body = {
+          data: app_ids.map do |id|
+            {
+              type: "apps",
+              id: id
+            }
+          end
+        }
+
+        delete(path, nil, body)
+      end
+
+      def delete_beta_tester_from_beta_groups(beta_tester_id: nil, beta_group_ids: [])
+        # DELETE
+        # https://appstoreconnect.apple.com/iris/v1/betaTesters/<beta_tester_id>/relationships/betaGroups
+        path = "betaTesters/#{beta_tester_id}/relationships/betaGroups"
+        body = {
+          data: beta_group_ids.map do |id|
+            {
+              type: "betaGroups",
+              id: id
+            }
+          end
+        }
+
+        delete(path, nil, body)
+      end
+
+      #
+      # betaTesterMetrics
+      #
+
+      def get_beta_tester_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
         # GET
-        # https://appstoreconnect.apple.com/iris/v1/buildDeliveries
+        # https://appstoreconnect.apple.com/iris/v1/betaTesterMetrics
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-
-        response = request(:get, "buildDeliveries") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response)
+        get("betaTesterMetrics", params)
       end
 
-      def get_builds(filter: {}, includes: "buildBetaDetail,betaBuildMetrics", limit: 10, sort: "uploadedDate", cursor: nil, only_data: true)
+      #
+      # builds
+      #
+
+      def get_builds(filter: {}, includes: "buildBetaDetail,betaBuildMetrics", limit: 10, sort: "uploadedDate", cursor: nil)
         # GET
         # https://appstoreconnect.apple.com/iris/v1/builds
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+        get("builds", params)
+      end
 
-        response = request(:get, "builds") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response, only_data: only_data)
+      def get_build(build_id: nil, includes: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/builds/<build_id>?
+        params = build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
+        get("builds/#{build_id}", params)
       end
 
       def patch_builds(build_id: nil, attributes: {})
@@ -256,88 +414,72 @@ module Spaceship
           }
         }
 
-        response = request(:patch) do |req|
-          req.url(path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        patch(path, body)
       end
 
-      def post_beta_app_review_submissions(build_id: nil)
-        # POST
-        # https://appstoreconnect.apple.com/iris/v1/betaAppReviewSubmissions
+      #
+      # buildBetaDetails
+      #
+
+      def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/buildBetaDetails
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("buildBetaDetails", params)
+      end
+
+      def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
+        # PATCH
+        # https://appstoreconnect.apple.com/iris/v1/buildBetaDetails/<build_beta_details_id>
+        path = "buildBetaDetails/#{build_beta_details_id}"
 
         body = {
           data: {
-            type: "betaAppReviewSubmissions",
-            relationships: {
-              build: {
-                data: {
-                  type: "builds",
-                  id: build_id
-                }
-              }
-            }
+            attributes: attributes,
+            id: build_beta_details_id,
+            type: "buildBetaDetails"
           }
         }
 
-        response = request(:post) do |req|
-          req.url("betaAppReviewSubmissions")
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+        patch(path, body)
       end
 
-      def get_pre_release_versions(filter: {}, includes: nil, limit: 40, sort: nil)
+      #
+      # buildDeliveries
+      #
+
+      def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
         # GET
-        # https://appstoreconnect.apple.com/iris/v1/preReleaseVersions
+        # https://appstoreconnect.apple.com/iris/v1/buildDeliveries
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-
-        response = request(:get, "preReleaseVersions") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response)
+        get("buildDeliveries", params)
       end
 
-      def get_beta_groups(filter: {}, includes: nil, limit: 40, sort: nil)
+      #
+      # preReleaseVersions
+      #
+
+      def get_pre_release_versions(filter: {}, includes: nil, limit: nil, sort: nil)
         # GET
-        # https://appstoreconnect.apple.com/iris/v1/betaGroups
+        # https://appstoreconnect.apple.com/iris/v1/preReleaseVersions
         params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-
-        response = request(:get, "betaGroups") do |req|
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params
-        end
-        handle_response(response)
+        get("preReleaseVersions", params)
       end
 
-      def add_beta_groups_to_build(build_id: nil, beta_group_ids: [])
-        # POST
-        # https://appstoreconnect.apple.com/iris/v1/builds/<build_id>/relationships/betaGroups
-
-        body = {
-          data: beta_group_ids.map do |id|
-            {
-              type: "betaGroups",
-              id: id
-            }
-          end
-        }
+      #
+      # users
+      #
 
-        response = request(:post) do |req|
-          req.url("builds/#{build_id}/relationships/betaGroups")
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
-        handle_response(response)
+      def get_users(filter: {}, includes: nil, limit: nil, sort: nil)
+        # GET
+        # https://appstoreconnect.apple.com/iris/v1/users
+        params = build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        get("users", params)
       end
 
       protected
 
-      def handle_response(response, only_data: true)
+      def handle_response(response)
         if (200...300).cover?(response.status) && (response.body.nil? || response.body.empty?)
           return
         end
@@ -354,9 +496,7 @@ module Spaceship
 
         raise UnexpectedResponse, "Temporary App Store Connect error: #{response.body}" if response.body['statusCode'] == 'ERROR'
 
-        return response.body['data'] if response.body['data'] && only_data
-
-        return response.body
+        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status)
       end
 
       def handle_errors(response)
@@ -407,4 +547,5 @@ module Spaceship
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end