fastlane 2.170.0 → 2.175.0

data/snapshot/lib/snapshot/update.rb

@@ -8,7 +8,7 @@ module Snapshot
     def self.find_helper
       paths = Dir["./**/SnapshotHelper.swift"] + Dir["./**/SnapshotHelperXcode8.swift"]
       # exclude assets in gym
-      paths.reject { |p| p.include?("snapshot/lib/assets/") }
+      paths.reject { |p| p.include?("snapshot/lib/assets/") || p.include?("DerivedData") }
     end
 
     def update(force: false)

data/spaceship/README.md

@@ -83,7 +83,7 @@ Using spaceship, the execution time of [_sigh_](https://docs.fastlane.tools/acti
 
 _spaceship_ is part of _fastlane_:
 
-    sudo gem install fastlane
+    gem install fastlane
 
 # Usage
 
@@ -93,7 +93,7 @@ To try _spaceship_, just run `fastlane spaceship`. It will automatically start t
 
 ![assets/docs/Playground.png](assets/docs/Playground.png)
 
-This requires you to install `pry` using `sudo gem install pry`. `pry` is not installed by default, as most [_fastlane_](https://fastlane.tools) users won't need the `spaceship playground`. You can add the `pry` dependency to your `Gemfile`.
+This requires you to install `pry` using `gem install pry`. `pry` is not installed by default, as most [_fastlane_](https://fastlane.tools) users won't need the `spaceship playground`. You can add the `pry` dependency to your `Gemfile`.
 
 ## Apple Developer Portal API
 

data/spaceship/lib/spaceship/client.rb

@@ -403,6 +403,7 @@ module Spaceship
     # This will also handle 2 step verification and 2 factor authentication
     #
     # It is called in `send_login_request` of sub classes (which the method `login`, above, transferred over to via `do_login`)
+    # rubocop:disable Metrics/PerceivedComplexity
     def send_shared_login_request(user, password)
       # Check if we have a cached/valid session
       #
@@ -506,9 +507,19 @@ module Spaceship
           # User Credentials are wrong
           raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
         elsif response.status == 412 && AUTH_TYPES.include?(response.body["authType"])
+
+          if try_upgrade_2fa_later(response)
+            store_cookie
+            fetch_olympus_session
+            return true
+          end
+
           # Need to acknowledge Apple ID and Privacy statement - https://github.com/fastlane/fastlane/issues/12577
           # Looking for status of 412 might be enough but might be safer to keep looking only at what is being reported
-          raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement."
+          raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. " \
+                                                            "Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement. " \
+                                                            "Your account might also be asked to upgrade to 2FA. " \
+                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automaticaly bypass 2FA upgrade if possible."
         elsif (response['Set-Cookie'] || "").include?("itctx")
           raise "Looks like your Apple ID is not enabled for App Store Connect, make sure to be able to login online"
         else
@@ -517,6 +528,7 @@ module Spaceship
         end
       end
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get the `itctx` from the new (22nd May 2017) API endpoint "olympus"
     # Update (29th March 2019) olympus migrates to new appstoreconnect API
@@ -925,3 +937,4 @@ module Spaceship
 end
 
 require 'spaceship/two_step_or_factor_client'
+require 'spaceship/upgrade_2fa_later_client'

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

@@ -196,7 +196,7 @@ module Spaceship
 
         store_csrf_tokens(response)
 
-        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
+        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, headers: response.headers, client: self)
       end
 
       def handle_401(response)
@@ -247,8 +247,23 @@ module Spaceship
         # ]
         # }
 
+        # Detail is missing in this response making debugging super hard
+        # {"errors" =>
+        #   [
+        #     {
+        #       "id"=>"80ea6cff-0043-4543-9cd1-3e26b0fce383",
+        #       "status"=>"409",
+        #       "code"=>"ENTITY_ERROR.RELATIONSHIP.INVALID",
+        #       "title"=>"The provided entity includes a relationship with an invalid value",
+        #       "source"=>{
+        #         "pointer"=>"/data/relationships/primarySubcategoryOne"
+        #       }
+        #     }
+        #   ]
+        # }
+
         return response.body['errors'].map do |error|
-          messages = [[error['title'], error['detail']].compact.join(" - ")]
+          messages = [[error['title'], error['detail'], error.dig("source", "pointer")].compact.join(" - ")]
 
           meta = error["meta"] || {}
           associated_errors = meta["associatedErrors"] || {}

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

@@ -144,6 +144,12 @@ module Spaceship
         end.first
       end
 
+      def fetch_latest_app_info(client: nil, includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_app_infos(app_id: id, includes: includes)
+        return resp.to_models.first
+      end
+
       #
       # Available Territories
       #

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

@@ -21,6 +21,9 @@ module Spaceship
       attr_accessor :created_date
 
       attr_accessor :app_store_version_submission
+      attr_accessor :app_store_version_phased_release
+      attr_accessor :app_store_review_detail
+      attr_accessor :app_store_version_localizations
 
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
@@ -58,7 +61,10 @@ module Spaceship
         "createdDate" =>  "created_date",
 
         "appStoreVersionSubmission" => "app_store_version_submission",
-        "build" => "build"
+        "build" => "build",
+        "appStoreVersionPhasedRelease" => "app_store_version_phased_release",
+        "appStoreReviewDetail" => "app_store_review_detail",
+        "appStoreVersionLocalizations" => "app_store_version_localizations"
       })
 
       ESSENTIAL_INCLUDES = [

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

@@ -38,6 +38,15 @@ module Spaceship
         return client.post_bulk_beta_tester_assignments(beta_group_id: id, beta_testers: beta_testers)
       end
 
+      def update(client: nil, attributes: nil)
+        return if attributes.empty?
+
+        client ||= Spaceship::ConnectAPI
+
+        attributes = reverse_attr_mapping(attributes)
+        return client.patch_group(group_id: id, attributes: attributes).first
+      end
+
       def delete!
         return Spaceship::ConnectAPI.delete_beta_group(group_id: id)
       end

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

@@ -56,6 +56,30 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         return client.get_bundle_id(bundle_id_id: bundle_id_id, includes: includes).first
       end
+
+      def self.create(client: nil, name: nil, platform: nil, identifier: nil, seed_id: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_bundle_id(name: name, platform: platform, identifier: identifier, seed_id: seed_id)
+        return resp.to_models.first
+      end
+
+      #
+      # BundleIdsCapabilities
+      #
+
+      def get_capabilities(client: nil, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_bundle_id_capabilities(bundle_id_id: id, includes: includes)
+        return resp.to_models
+      end
+
+      def create_capability(capability_type, settings: [], client: nil)
+        raise "capability_type is required " if capability_type.nil?
+
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_bundle_id_capability(bundle_id_id: id, capability_type: capability_type, settings: settings)
+        return resp.to_models.first
+      end
     end
   end
 end

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

@@ -41,6 +41,21 @@ module Spaceship
         MARZIPAN = "MARZIPAN" # Catalyst
       end
 
+      module Settings
+        ICLOUD_VERSION = "ICLOUD_VERSION"
+        DATA_PROTECTION_PERMISSION_LEVEL = "DATA_PROTECTION_PERMISSION_LEVEL"
+        APPLE_ID_AUTH_APP_CONSENT = "APPLE_ID_AUTH_APP_CONSENT"
+      end
+
+      module Options
+        XCODE_5 = "XCODE_5"
+        XCODE_6 = "XCODE_6"
+        COMPLETE_PROTECTION = "COMPLETE_PROTECTION"
+        PROTECTED_UNLESS_OPEN = "PROTECTED_UNLESS_OPEN"
+        PROTECTED_UNTIL_FIRST_USER_AUTH = "PROTECTED_UNTIL_FIRST_USER_AUTH"
+        PRIMARY_APP_CONSENT = "PRIMARY_APP_CONSENT"
+      end
+
       def self.type
         return "bundleIdCapabilities"
       end
@@ -59,14 +74,21 @@ module Spaceship
       # API
       #
 
-      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def self.all(client: nil, bundle_id_id:, limit: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_bundle_id_capabilities(bundle_id_id: bundle_id_id, limit: limit).all_pages
+        return resp.flat_map(&:to_models)
+      end
+
+      def self.create(client: nil, bundle_id_id:, capability_type:, settings: [])
         client ||= Spaceship::ConnectAPI
-        return client.get_users(filter: filter, includes: includes)
+        resp = client.post_bundle_id_capability(bundle_id_id: bundle_id_id, capability_type: capability_type, settings: settings)
+        return resp.to_models.first
       end
 
-      def self.find(client: nil, email: nil, includes: nil)
+      def delete!(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
-        return all(client: client, filter: { email: email }, includes: includes)
+        client.delete_bundle_id_capability(bundle_id_capability_id: id)
       end
     end
   end

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

@@ -54,6 +54,32 @@ module Spaceship
         return resps.flat_map(&:to_models)
       end
 
+      # @param client [ConnectAPI] ConnectAPI client.
+      # @param platform [String] The platform of the device.
+      # @param include_disabled [Bool] Whether to include disable devices. false by default.
+      # @return (Device) Find a device based on the UDID of the device. nil if no device was found.
+      def self.find_by_udid(device_udid, client: nil, platform: nil, include_disabled: false)
+        self.all(client: client).find do |device|
+          device.udid.casecmp(device_udid) == 0 && (include_disabled ? true : device.enabled?)
+        end
+      end
+
+      # @param client [ConnectAPI] ConnectAPI client.
+      # @param name [String] The name to be assigned to the device, if it needs to be created.
+      # @param platform [String] The platform of the device.
+      # @param include_disabled [Bool] Whether to include disable devices. false by default.
+      # @return (Device) Find a device based on the UDID of the device. If no device was found,  nil if no device was found.
+      def self.find_or_create(device_udid, client: nil, name: nil, platform: nil, include_disabled: false)
+        existing = self.find_by_udid(device_udid, client: client, platform: platform)
+        return existing if existing
+        return self.create(client: client, name: name, platform: platform, udid: device_udid)
+      end
+
+      # @param client [ConnectAPI] ConnectAPI client.
+      # @param name [String] The name to be assigned to the device.
+      # @param platform [String] The platform of the device.
+      # @param udid [String] The udid of the device being created.
+      # @return (Device) Find a device based on the UDID of the device. nil if no device was found.
       def self.create(client: nil, name: nil, platform: nil, udid: nil)
         client ||= Spaceship::ConnectAPI
         resp = client.post_device(name: name, platform: platform, udid: udid)

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

@@ -27,6 +27,59 @@ module Spaceship
           provisioning_request_client.get("bundleIds/#{bundle_id_id}", params)
         end
 
+        def post_bundle_id(name:, platform:, identifier:, seed_id:)
+          attributes = {
+            name: name,
+            platform: platform,
+            identifier: identifier,
+            seedId: seed_id
+          }
+
+          body = {
+            data: {
+              attributes: attributes,
+              type: "bundleIds"
+            }
+          }
+
+          provisioning_request_client.post("bundleIds", body)
+        end
+
+        #
+        # bundleIdCapability
+        #
+
+        def get_bundle_id_capabilities(bundle_id_id:, includes: nil, limit: nil, sort: nil)
+          params = provisioning_request_client.build_params(filter: nil, includes: includes, limit: limit, sort: sort)
+          provisioning_request_client.get("bundleIds/#{bundle_id_id}/bundleIdCapabilities", params)
+        end
+
+        def post_bundle_id_capability(bundle_id_id:, capability_type:, settings: [])
+          body = {
+            data: {
+              attributes: {
+                capabilityType: capability_type,
+                settings: settings
+              },
+              type: "bundleIdCapabilities",
+              relationships: {
+                bundleId: {
+                  data: {
+                    type: "bundleIds",
+                    id: bundle_id_id
+                  }
+                }
+              }
+            }
+          }
+
+          provisioning_request_client.post("bundleIdCapabilities", body)
+        end
+
+        def delete_bundle_id_capability(bundle_id_capability_id:)
+          provisioning_request_client.delete("bundleIdCapabilities/#{bundle_id_capability_id}")
+        end
+
         #
         # certificates
         #

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

@@ -6,11 +6,13 @@ module Spaceship
       include Enumerable
       attr_reader :body
       attr_reader :status
+      attr_reader :headers
       attr_reader :client
 
-      def initialize(body: nil, status: nil, client: nil)
+      def initialize(body: nil, status: nil, headers: nil, client: nil)
         @body = body
         @status = status
+        @headers = headers
         @client = client
       end
 

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

@@ -214,6 +214,18 @@ module Spaceship
           test_flight_request_client.post("betaGroups", body)
         end
 
+        def patch_group(group_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: group_id,
+              type: "betaGroups"
+            }
+          }
+
+          test_flight_request_client.patch("betaGroups/#{group_id}", body)
+        end
+
         def delete_beta_group(group_id: nil)
           raise "group_id is nil" if group_id.nil?
 

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

@@ -40,7 +40,7 @@ module Spaceship
         self.create(json)
       end
 
-      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, is_key_content_base64: false, duration: nil, in_house: nil)
+      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, is_key_content_base64: false, duration: nil, in_house: nil, **)
         key_id ||= ENV['SPACESHIP_CONNECT_API_KEY_ID']
         issuer_id ||= ENV['SPACESHIP_CONNECT_API_ISSUER_ID']
         filepath ||= ENV['SPACESHIP_CONNECT_API_KEY_FILEPATH']

data/spaceship/lib/spaceship/playground.rb

@@ -13,8 +13,8 @@ module Spaceship
       rescue Gem::LoadError
         puts("Could not find gem 'pry'".red)
         puts("")
-        puts("If you installed spaceship using `sudo gem install spaceship` run")
-        puts("  sudo gem install pry".yellow)
+        puts("If you installed spaceship using `gem install spaceship` run")
+        puts("  gem install pry".yellow)
         puts("to install the missing gem")
         puts("")
         puts("If you use a Gemfile add this to your Gemfile:")

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -579,10 +579,10 @@ module Spaceship
       }
 
       r = request(:post) do |req|
-        req.url("https://analytics.itunes.apple.com/analytics/api/v1/data/time-series")
+        req.url("https://appstoreconnect.apple.com/analytics/api/v1/data/time-series")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Requested-By'] = 'analytics.itunes.apple.com'
+        req.headers['X-Requested-By'] = 'appstoreconnect.apple.com'
       end
 
       data = parse_response(r)

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -4,6 +4,7 @@ require_relative 'tunes/tunes_client'
 module Spaceship
   class Client
     def handle_two_step_or_factor(response)
+      raise "2FA can only be performed in interactive mode" if ENV["SPACESHIP_ONLY_ALLOW_INTERACTIVE_2FA"] == "true" && ENV["FASTLANE_IS_INTERACTIVE"] == "false"
       # extract `x-apple-id-session-id` and `scnt` from response, to be used by `update_request_headers`
       @x_apple_id_session_id = response["x-apple-id-session-id"]
       @scnt = response["scnt"]

data/spaceship/lib/spaceship/upgrade_2fa_later_client.rb

@@ -0,0 +1,91 @@
+require_relative 'globals'
+require_relative 'tunes/tunes_client'
+
+module Spaceship
+  class Client
+    def try_upgrade_2fa_later(response)
+      if ENV['SPACESHIP_SKIP_2FA_UPGRADE'].nil?
+        return false
+      end
+
+      puts("This account is being prompted to upgrade to 2FA")
+      puts("Attempting to automatically bypass the upgrade until a later date")
+      puts("To disable this, remove SPACESHIP_SKIP_2FA_UPGRADE=1 environment variable")
+
+      # Get URL that requests a repair and gets the widget key
+      widget_key_location = response.headers['location']
+      uri    = URI.parse(widget_key_location)
+      params = CGI.parse(uri.query)
+
+      widget_key = params.dig('widgetKey', 0)
+      if widget_key.nil?
+        STDERR.puts("Couldn't find widgetKey to continue with requests")
+        return false
+      end
+
+      # Step 1 - Request repair
+      response_repair = request(:get) do |req|
+        req.url(widget_key_location)
+      end
+
+      # Step 2 - Request repair options
+      response_repair_options = request(:get) do |req|
+        req.url("https://appleid.apple.com/account/manage/repair/options")
+
+        req.headers['scnt'] = response_repair.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Session-Token'] = response.headers['X-Apple-Repair-Session-Token']
+
+        req.headers['X-Apple-Skip-Repair-Attributes'] = '[]'
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json, text/javascript'
+      end
+
+      # Step 3 - Request setup later
+      request(:get) do |req|
+        req.url("https://appleid.apple.com/account/security/upgrade/setuplater")
+
+        req.headers['scnt'] = response_repair_options.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Session-Token'] = response_repair_options.headers['x-apple-session-token']
+        req.headers['X-Apple-Skip-Repair-Attributes'] = '[]'
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json, text/javascript'
+      end
+
+      # Step 4 - Post complete
+      response_repair_complete = request(:post) do |req|
+        req.url("https://idmsa.apple.com/appleauth/auth/repair/complete")
+
+        req.body = ''
+        req.headers['scnt'] = response.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Repair-Session-Token'] = response_repair_options.headers['X-Apple-Session-Token']
+
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json;charset=utf-8'
+      end
+
+      if response_repair_complete.status == 204
+        return true
+      else
+        STDERR.puts("Failed with status code of #{response_repair_complete.status}")
+        return false
+      end
+    rescue => error
+      STDERR.puts(error.backtrace)
+      STDERR.puts("Failed to bypass 2FA upgrade")
+      STDERR.puts("To disable this from trying again, set SPACESHIP_SKIP_UPGRADE_2FA_LATER=1")
+      return false
+    end
+  end
+end