fastlane 2.187.0 → 2.191.0

data/scan/lib/scan/xcpretty_reporter_options_generator.rb

@@ -13,7 +13,7 @@ module Scan
                Scan.config[:xcpretty_args])
     end
 
-    # Intialize with values from Scan.config matching these param names
+    # Initialize with values from Scan.config matching these param names
     def initialize(open_report, output_types, output_files, output_directory, use_clang_report_name, xcpretty_args)
       @open_report = open_report
       @output_types = output_types

data/screengrab/lib/screengrab/runner.rb

@@ -54,7 +54,7 @@ module Screengrab
       device_screenshots_paths = [
         determine_external_screenshots_path(device_serial, @config[:app_package_name], @config[:locales]),
         determine_internal_screenshots_paths(device_serial, @config[:app_package_name], @config[:locales])
-      ].flatten
+      ].flatten(1)
 
       # Root is needed to access device paths at /data
       if @config[:use_adb_root]
@@ -301,7 +301,7 @@ module Screengrab
       device_screenshots_paths = [
         determine_external_screenshots_path(device_serial, @config[:app_package_name], [locale]),
         determine_internal_screenshots_paths(device_serial, @config[:app_package_name], [locale])
-      ].flatten
+      ].flatten(1)
 
       # Make a temp directory into which to pull the screenshots before they are moved to their final location.
       # This makes directory cleanup easier, as the temp directory will be removed when the block completes.

data/sigh/lib/sigh/options.rb

@@ -149,7 +149,8 @@ module Sigh
                                      env_name: "SIGH_SKIP_CERTIFICATE_VERIFICATION",
                                      description: "Skips the verification of the certificates for every existing profiles. This will make sure the provisioning profile can be used on the local machine",
                                      is_string: false,
-                                     default_value: false),
+                                     default_value: !FastlaneCore::Helper.mac?,
+                                     default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :platform,
                                      short_option: '-p',
                                      env_name: "SIGH_PLATFORM",

data/spaceship/lib/spaceship/client.rb

@@ -41,6 +41,7 @@ module Spaceship
     attr_accessor :logger
 
     attr_accessor :csrf_tokens
+    attr_accessor :additional_headers
 
     attr_accessor :provider
 
@@ -147,6 +148,7 @@ module Spaceship
       available_teams = teams.collect do |team|
         {
           team_id: (team["contentProvider"] || {})["contentProviderId"],
+          public_team_id: (team["contentProvider"] || {})["contentProviderPublicId"],
           team_name: (team["contentProvider"] || {})["name"]
         }
       end
@@ -161,10 +163,19 @@ module Spaceship
       end
 
       response = request(:post) do |req|
-        req.url("ra/v1/session/webSession")
+        req.url("https://appstoreconnect.apple.com/olympus/v1/providerSwitchRequests")
         req.body = {
-          contentProviderId: team_id,
-          dsId: user_detail_data.ds_id # https://github.com/fastlane/fastlane/issues/6711
+          "data": {
+            "type": "providerSwitchRequests",
+            "relationships": {
+              "provider": {
+                "data": {
+                  "type": "providers",
+                  "id": result[:public_team_id]
+                }
+              }
+            }
+          }
         }.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -707,8 +718,13 @@ module Spaceship
       @csrf_tokens || {}
     end
 
+    def additional_headers
+      @additional_headers || {}
+    end
+
     def request(method, url_or_path = nil, params = nil, headers = {}, auto_paginate = false, &block)
       headers.merge!(csrf_tokens)
+      headers.merge!(additional_headers)
       headers['User-Agent'] = USER_AGENT
 
       # Before encoding the parameters, log them

data/spaceship/lib/spaceship/connect_api.rb

@@ -10,6 +10,7 @@ require 'spaceship/connect_api/tunes/tunes'
 
 require 'spaceship/connect_api/models/bundle_id_capability'
 require 'spaceship/connect_api/models/bundle_id'
+require 'spaceship/connect_api/models/capabilities'
 require 'spaceship/connect_api/models/certificate'
 require 'spaceship/connect_api/models/device'
 require 'spaceship/connect_api/models/profile'

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

@@ -423,6 +423,13 @@ module Spaceship
           client.add_user_visible_apps(user_id: user_id, app_ids: [id])
         end
       end
+
+      def remove_users(client: nil, user_ids: nil)
+        client ||= Spaceship::ConnectAPI
+        user_ids.each do |user_id|
+          client.delete_user_visible_apps(user_id: user_id, app_ids: [id])
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,27 @@
+require_relative '../model'
+
+module Spaceship
+  class ConnectAPI
+    class Capabilities
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :name
+      attr_accessor :description
+
+      attr_mapping({
+        "name" => "name",
+        "description" => "description",
+      })
+
+      def self.type
+        return "capabilities"
+      end
+
+      def self.all(client: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_available_bundle_id_capabilities(bundle_id_id: id).all_pages
+        return resp.flat_map(&:to_models)
+      end
+    end
+  end
+end

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

@@ -16,6 +16,8 @@ module Spaceship
       attr_accessor :email_vetting_required
       attr_accessor :notifications
 
+      attr_accessor :visible_apps
+
       attr_mapping({
         "username" => "username",
         "firstName" => "first_name",
@@ -27,9 +29,15 @@ module Spaceship
         "allAppsVisible" => "all_apps_visible",
         "provisioningAllowed" => "provisioning_allowed",
         "emailVettingRequired" => "email_vetting_required",
-        "notifications" => "notifications"
+        "notifications" => "notifications",
+
+        "visibleApps" => "visible_apps"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "visibleApps"
+      ].join(",")
+
       def self.type
         return "users"
       end
@@ -38,16 +46,22 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def self.all(client: nil, filter: {}, includes: ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         resps = client.get_users(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.find(client: nil, email: nil, includes: nil)
+      def self.find(client: nil, email: nil, includes: ESSENTIAL_INCLUDES)
         client ||= Spaceship::ConnectAPI
         return all(client: client, filter: { email: email }, includes: includes)
       end
+
+      def get_visible_apps(client: nil, limit: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_user_visible_apps(user_id: id, limit: limit)
+        return resp.to_models
+      end
     end
   end
 end

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

@@ -11,15 +11,23 @@ module Spaceship
       attr_accessor :all_apps_visible
       attr_accessor :provisioning_allowed
 
+      attr_accessor :visible_apps
+
       attr_mapping({
         "firstName" => "first_name",
         "lastName" => "last_name",
         "email" => "email",
         "roles" => "roles",
         "allAppsVisible" => "all_apps_visible",
-        "provisioningAllowed" => "provisioning_allowed"
+        "provisioningAllowed" => "provisioning_allowed",
+
+        "visibleApps" => "visible_apps"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "visibleApps"
+      ].join(",")
+
       module UserRole
         ADMIN = "ADMIN"
         FINANCE = "FINANCE"
@@ -42,18 +50,23 @@ module Spaceship
       # Managing invitations
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, sort: nil)
+      def self.all(client: nil, filter: {}, includes: ESSENTIAL_INCLUDES, sort: nil)
         client ||= Spaceship::ConnectAPI
         resps = client.get_user_invitations(filter: filter, includes: includes, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.find(client: nil, email: nil, includes: nil)
+      def self.find(client: nil, email: nil, includes: ESSENTIAL_INCLUDES)
         client ||= Spaceship::ConnectAPI
         return all(client: client, filter: { email: email }, includes: includes)
       end
 
-      def self.create(client: nil, email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil)
+      # Create and post user invitation
+      # App Store Connect allows for the following combinations of `all_apps_visible` and `visible_app_ids`:
+      # - if `all_apps_visible` is `nil`, you don't have to provide values for `visible_app_ids`
+      # - if `all_apps_visible` is true, you must provide values for `visible_app_ids`.
+      # - if `all_apps_visible` is false, you must not provide values for `visible_app_ids`.
+      def self.create(client: nil, email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil, visible_app_ids: [])
         client ||= Spaceship::ConnectAPI
         resp = client.post_user_invitation(
           email: email,
@@ -61,7 +74,8 @@ module Spaceship
           last_name: last_name,
           roles: roles,
           provisioning_allowed: provisioning_allowed,
-          all_apps_visible: all_apps_visible
+          all_apps_visible: all_apps_visible,
+          visible_app_ids: visible_app_ids
         )
         return resp.to_models.first
       end
@@ -70,6 +84,13 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         client.delete_user_invitation(user_invitation_id: id)
       end
+
+      # Get visible apps for invited user
+      def get_visible_apps(client: nil, limit: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_user_invitation_visible_apps(user_invitation_id: id, limit: limit)
+        return resp.to_models
+      end
     end
   end
 end

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

@@ -54,6 +54,11 @@ module Spaceship
           provisioning_request_client.get("bundleIds/#{bundle_id_id}/bundleIdCapabilities", params)
         end
 
+        def get_available_bundle_id_capabilities(bundle_id_id:)
+          params = provisioning_request_client.build_params(filter: { bundleId: bundle_id_id })
+          provisioning_request_client.get("capabilities", params)
+        end
+
         def post_bundle_id_capability(bundle_id_id:, capability_type:, settings: [])
           body = {
             data: {

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

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::TestFlight::API)
           self.test_flight_request_client = self
         end

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

@@ -191,6 +191,19 @@ module Spaceship
           test_flight_request_client.post("builds/#{build_id}/relationships/betaGroups", body)
         end
 
+        def delete_beta_groups_from_build(build_id: nil, beta_group_ids: [])
+          body = {
+            data: beta_group_ids.map do |id|
+              {
+                type: "betaGroups",
+                id: id
+              }
+            end
+          }
+
+          test_flight_request_client.delete("builds/#{build_id}/relationships/betaGroups", nil, 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: {
@@ -340,6 +353,32 @@ module Spaceship
           test_flight_request_client.post("betaTesters/#{beta_tester_id}/relationships/builds", body)
         end
 
+        def add_beta_testers_to_build(build_id: nil, beta_tester_ids: [])
+          body = {
+            data: beta_tester_ids.map do |id|
+              {
+                type: "betaTesters",
+                id: id
+              }
+            end
+          }
+
+          test_flight_request_client.post("builds/#{build_id}/relationships/individualTesters", body)
+        end
+
+        def delete_beta_testers_from_build(build_id: nil, beta_tester_ids: [])
+          body = {
+            data: beta_tester_ids.map do |id|
+              {
+                type: "betaTesters",
+                id: id
+              }
+            end
+          }
+
+          test_flight_request_client.delete("builds/#{build_id}/relationships/individualTesters", nil, body)
+        end
+
         #
         # betaTesterMetrics
         #

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

@@ -13,6 +13,7 @@ module Spaceship
     class Token
       # maximum expiration supported by AppStore (20 minutes)
       MAX_TOKEN_DURATION = 1200
+      DEFAULT_TOKEN_DURATION = 500
 
       attr_reader :key_id
       attr_reader :issuer_id
@@ -80,7 +81,7 @@ module Spaceship
         @duration = duration
         @in_house = in_house
 
-        @duration ||= MAX_TOKEN_DURATION
+        @duration ||= DEFAULT_TOKEN_DURATION
         @duration = @duration.to_i if @duration
 
         refresh!

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

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::Tunes::API)
           self.tunes_request_client = self
         end

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

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::Users::API)
           self.users_request_client = self
         end

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

@@ -28,8 +28,13 @@ module Spaceship
           users_request_client.delete("users/#{user_id}")
         end
 
-        # Change app permissions for user
+        # Add app permissions for user
+        # @deprecated Use {#post_user_visible_apps} instead.
         def add_user_visible_apps(user_id: nil, app_ids: nil)
+          post_user_visible_apps(user_id: user_id, app_ids: app_ids)
+        end
+
+        def post_user_visible_apps(user_id: nil, app_ids: nil)
           body = {
             data: app_ids.map do |app_id|
               {
@@ -42,18 +47,52 @@ module Spaceship
           users_request_client.post("users/#{user_id}/relationships/visibleApps", body)
         end
 
+        # Replace app permissions for user
+        def patch_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+
+          users_request_client.patch("users/#{user_id}/relationships/visibleApps", body)
+        end
+
+        # Remove app permissions for user
+        def delete_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+          params = nil
+          users_request_client.delete("users/#{user_id}/relationships/visibleApps", params, body)
+        end
+
+        # Get app permissions for user
+        def get_user_visible_apps(user_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("users/#{user_id}/visibleApps", params)
+        end
+
         #
         # invitations (invited users)
         #
 
-        # Get all invited users (not yet accepted)
+        # Get all invited users
         def get_user_invitations(filter: {}, includes: nil, limit: nil, sort: nil)
           params = users_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
           users_request_client.get("userInvitations", params)
         end
 
         # Invite new users to App Store Connect
-        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil)
+        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil, visible_app_ids: [])
           body = {
             data: {
               type: "userInvitations",
@@ -64,6 +103,16 @@ module Spaceship
                 roles: roles,
                 provisioningAllowed: provisioning_allowed,
                 allAppsVisible: all_apps_visible
+              },
+              relationships: {
+                visibleApps: {
+                  data: visible_app_ids.map do |id|
+                    {
+                      id: id,
+                      type: "apps"
+                    }
+                  end
+                }
               }
             }
           }
@@ -74,6 +123,12 @@ module Spaceship
         def delete_user_invitation(user_invitation_id: nil)
           users_request_client.delete("userInvitations/#{user_invitation_id}")
         end
+
+        # Get all app permissions for invited user
+        def get_user_invitation_visible_apps(user_invitation_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("userInvitations/#{user_invitation_id}/visibleApps", params)
+        end
       end
     end
   end