fastlane 2.159.0 → 2.164.0

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -165,7 +165,11 @@ open class Snapshot: NSObject {
             }
 
             let screenshot = XCUIScreen.main.screenshot()
+            #if os(iOS)
             let image = XCUIDevice.shared.orientation.isLandscape ?  fixLandscapeOrientation(image: screenshot.image) : screenshot.image
+            #else
+            let image = screenshot.image
+            #endif
 
             guard var simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
 

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -18,6 +18,7 @@ module Snapshot
 
     def initialize(launcher_configuration: nil)
       @launcher_config = launcher_configuration
+      @device_boot_datetime = DateTime.now
     end
 
     def collected_errors
@@ -192,7 +193,7 @@ module Snapshot
 
         UI.header("Collecting system logs #{device_name} - #{language}")
         log_identity = Digest::MD5.hexdigest(components.join("-"))
-        FastlaneCore::Simulator.copy_logs(device, log_identity, language_folder)
+        FastlaneCore::Simulator.copy_logs(device, log_identity, language_folder, @device_boot_datetime)
       end
     end
   end

data/spaceship/README.md

@@ -167,7 +167,7 @@ _spaceship_ uses all those API points to offer this seamless experience.
 _spaceship_ does a lot of magic to get everything working so neatly:
 
 - **Sensible Defaults**: You only have to provide the mandatory information (e.g. new provisioning profiles contain all devices by default)
-- **Local Validation**: When pushing changes back to the Apple Dev Portal _spaceship_ will make sure only valid data is sent to Apple (e.g. automatic repairing of provisioning profiles)
+- **Local Validation**: When pushing changes back to the Apple Developer Portal _spaceship_ will make sure only valid data is sent to Apple (e.g. automatic repairing of provisioning profiles)
 - **Various request/response types**: When working with the different API endpoints, _spaceship_ has to deal with `JSON`, `XML`, `txt`, `plist` and sometimes even `HTML` responses and requests.
 - **Automatic Pagination**: Even if you have thousands of apps, profiles or certificates, _spaceship_ **can** handle your scale. It was heavily tested by first using _spaceship_ to create hundreds of profiles and then accessing them using _spaceship_.
 - **Session, Cookie and CSRF token**: All the security aspects are handled by _spaceship_.

data/spaceship/lib/spaceship/client.rb

@@ -196,7 +196,7 @@ module Spaceship
       self.new(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
     end
 
-    def initialize(cookie: nil, current_team_id: nil, timeout: nil)
+    def initialize(cookie: nil, current_team_id: nil, csrf_tokens: nil, timeout: nil)
       options = {
        request: {
           timeout:       (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i,
@@ -204,6 +204,7 @@ module Spaceship
         }
       }
       @current_team_id = current_team_id
+      @csrf_tokens = csrf_tokens
       @cookie = cookie || HTTP::CookieJar.new
 
       @client = Faraday.new(self.class.hostname, options) do |c|
@@ -857,9 +858,7 @@ module Spaceship
 
         resp_hash = response.to_hash
         if resp_hash[:status] == 401
-          msg = "Auth lost"
-          logger.warn(msg)
-          raise UnauthorizedAccessError.new, "Unauthorized Access"
+          handle_401(response)
         end
 
         if response.body.to_s.include?("<title>302 Found</title>")
@@ -880,6 +879,12 @@ module Spaceship
       end
     end
 
+    def handle_401(response)
+      msg = "Auth lost"
+      logger.warn(msg)
+      raise UnauthorizedAccessError.new, "Unauthorized Access"
+    end
+
     def send_request_auto_paginate(method, url_or_path, params, headers, &block)
       response = send_request(method, url_or_path, params, headers, &block)
       return response unless should_process_next_rel?(response)

data/spaceship/lib/spaceship/connect_api.rb

@@ -15,6 +15,7 @@ require 'spaceship/connect_api/models/device'
 require 'spaceship/connect_api/models/profile'
 
 require 'spaceship/connect_api/models/user'
+require 'spaceship/connect_api/models/user_invitation'
 
 require 'spaceship/connect_api/models/app'
 require 'spaceship/connect_api/models/beta_app_localization'
@@ -85,5 +86,29 @@ module Spaceship
         end
       end
     end
+
+    # Defined in the App Store Connect API docs:
+    #
+    # Used for creating BundleId and Device
+    module BundleIdPlatform
+      IOS = "IOS"
+      MAC_OS = "MAC_OS"
+
+      ALL = [IOS, MAC_OS]
+
+      def self.map(platform)
+        return platform if ALL.include?(platform)
+
+        # Map from fastlane input and Spaceship::TestFlight platform values
+        case platform.to_sym
+        when :osx, :macos, :mac
+          return Spaceship::ConnectAPI::Platform::MAC_OS
+        when :ios
+          return Spaceship::ConnectAPI::Platform::IOS
+        else
+          raise "Cannot find a matching platform for '#{platform}' - valid values are #{ALL.join(', ')}"
+        end
+      end
+    end
   end
 end

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

@@ -17,7 +17,7 @@ module Spaceship
       #####################################################
 
       # Instantiates a client with cookie session or a JWT token.
-      def initialize(cookie: nil, current_team_id: nil, token: nil, another_client: nil)
+      def initialize(cookie: nil, current_team_id: nil, token: nil, csrf_tokens: nil, another_client: nil)
         params_count = [cookie, token, another_client].compact.size
         if params_count != 1
           raise "Must initialize with one of :cookie, :token, or :another_client"
@@ -25,10 +25,10 @@ module Spaceship
 
         if token.nil?
           if another_client.nil?
-            super(cookie: cookie, current_team_id: current_team_id, timeout: 1200)
+            super(cookie: cookie, current_team_id: current_team_id, csrf_tokens: csrf_tokens, timeout: 1200)
             return
           end
-          super(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
+          super(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id, csrf_tokens: another_client.csrf_tokens)
         else
           options = {
             request: {
@@ -152,6 +152,7 @@ module Spaceship
 
       def with_asc_retry(tries = 5, &_block)
         tries = 1 if Object.const_defined?("SpecHelper")
+
         response = yield
 
         status = response.status if response
@@ -162,6 +163,10 @@ module Spaceship
         end
 
         return response
+      rescue UnauthorizedAccessError => error
+        # Catch unathorized access and re-raising
+        # There is no need to try again
+        raise error
       rescue => error
         tries -= 1
         puts(error) if Spaceship::Globals.verbose?
@@ -194,6 +199,10 @@ module Spaceship
         return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
       end
 
+      def handle_401(response)
+        raise UnauthorizedAccessError, handle_errors(response) if response && (response.body || {})['errors']
+      end
+
       def handle_errors(response)
         # Example error format
         # {

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

@@ -97,8 +97,18 @@ module Spaceship
       end
 
       def portal_team_id
-        return nil if @portal_client.nil?
-        return @portal_client.team_id
+        if token
+          message = [
+            "Cannot determine portal team id via the App Store Connect API (yet)",
+            "Look to see if you can get the portal team id from somewhere else",
+            "View more info in the docs at https://docs.fastlane.tools/app-store-connect-api/"
+          ]
+          raise message.join('. ')
+        elsif @portal_client
+          return @portal_client.team_id
+        else
+          raise "No App Store Connect API token or Portal Client set"
+        end
       end
 
       def tunes_team_id
@@ -126,7 +136,7 @@ module Spaceship
               "Or set the 'SPACESHIP_CONNECT_API_IN_HOUSE' environment variable to 'true'",
               "View more info in the docs at https://docs.fastlane.tools/app-store-connect-api/"
             ]
-            raise message.join('\n')
+            raise message.join('. ')
           end
           return !!token.in_house
         elsif @portal_client

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

@@ -16,6 +16,7 @@ module Spaceship
       attr_accessor :available_in_new_territories
       attr_accessor :content_rights_declaration
       attr_accessor :app_store_versions
+      attr_accessor :prices
 
       module ContentRightsDeclaration
         USES_THIRD_PARTY_CONTENT = "USES_THIRD_PARTY_CONTENT"
@@ -34,9 +35,15 @@ module Spaceship
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
-        "appStoreVersions" => "app_store_versions"
+        "appStoreVersions" => "app_store_versions",
+        "prices" => "prices"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "appStoreVersions",
+        "prices"
+      ].join(",")
+
       def self.type
         return "apps"
       end
@@ -45,7 +52,7 @@ module Spaceship
       # Apps
       #
 
-      def self.all(filter: {}, includes: "appStoreVersions", limit: nil, sort: nil)
+      def self.all(filter: {}, includes: ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_apps(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
@@ -84,13 +91,13 @@ module Spaceship
       def fetch_live_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::READY_FOR_SALE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_APPLE_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
         ]
 
-        filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -106,8 +113,7 @@ module Spaceship
           Spaceship::ConnectAPI::AppInfo::AppStoreState::INVALID_BINARY
         ]
 
-        filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -128,8 +134,6 @@ module Spaceship
       #
 
       def fetch_app_prices(filter: {}, includes: "priceTier", limit: nil, sort: nil)
-        filter ||= {}
-        filter[:app] = id
         resp = Spaceship::ConnectAPI.get_app_prices(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
@@ -142,6 +146,7 @@ module Spaceship
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_APPLE_RELEASE,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW
@@ -233,7 +238,10 @@ module Spaceship
       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,
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_APPLE_RELEASE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE
+          ].join(','),
           platform: platform
         }
         return get_app_store_versions(filter: filter, includes: includes).first

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

@@ -20,6 +20,7 @@ module Spaceship
         READY_FOR_SALE = "READY_FOR_SALE"
         PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
         PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        PENDING_APPLE_RELEASE = "PENDING_APPLE_RELEASE"
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"

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

@@ -111,7 +111,9 @@ module Spaceship
           timeout_minutes = (ENV["SPACESHIP_SCREENSHOT_UPLOAD_TIMEOUT"] || 20).to_i
 
           loop do
-            puts("Waiting for screenshot to appear before uploading...")
+            # This error handling needs to be revised since any error occured can reach here.
+            # It should handle errors based on what status code is.
+            puts("Waiting for screenshots to appear before uploading. This is unlikely to be recovered unless it's 503 error. error=\"#{error}\"")
             sleep(30)
 
             screenshots = Spaceship::ConnectAPI::AppScreenshotSet

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

@@ -112,8 +112,8 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        resp = Spaceship::ConnectAPI.get_app_screenshot_sets(filter: filter, includes: includes, limit: limit, sort: sort)
+      def self.all(app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        resp = Spaceship::ConnectAPI.get_app_screenshot_sets(app_store_version_localization_id: app_store_version_localization_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
 

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

@@ -26,6 +26,7 @@ module Spaceship
         READY_FOR_SALE = "READY_FOR_SALE"
         PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
         PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        PENDING_APPLE_RELEASE = "PENDING_APPLE_RELEASE"
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
@@ -114,11 +115,8 @@ module Spaceship
         return resp.to_models.first
       end
 
-      # appScreenshotSets,appPreviewSets
-      def get_app_store_version_localizations(filter: {}, includes: "appScreenshotSets", limit: nil, sort: nil)
-        filter ||= {}
-        filter["appStoreVersion"] = id
-        return Spaceship::ConnectAPI::AppStoreVersionLocalization.all(filter: filter, includes: includes, limit: limit, sort: sort)
+      def get_app_store_version_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        return Spaceship::ConnectAPI::AppStoreVersionLocalization.all(app_store_version_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
       end
 
       #

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

@@ -39,8 +39,8 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        resp = Spaceship::ConnectAPI.get_app_store_version_localizations(filter: filter, includes: includes, limit: limit, sort: sort)
+      def self.all(app_store_version_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        resp = Spaceship::ConnectAPI.get_app_store_version_localizations(app_store_version_id: app_store_version_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
 
@@ -73,9 +73,7 @@ module Spaceship
       #
 
       def get_app_screenshot_sets(filter: {}, includes: "appScreenshots", limit: nil, sort: nil)
-        filter ||= {}
-        filter["appStoreVersionLocalization"] = id
-        return Spaceship::ConnectAPI::AppScreenshotSet.all(filter: filter, includes: includes, limit: limit, sort: sort)
+        return Spaceship::ConnectAPI::AppScreenshotSet.all(app_store_version_localization_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
       end
 
       def create_app_screenshot_set(attributes: nil)

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

@@ -35,7 +35,8 @@ module Spaceship
       #
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes)
+        resps = Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes).all_pages
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(email: nil, includes: nil)

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

@@ -1,4 +1,7 @@
 require_relative '../model'
+
+require 'openssl'
+
 module Spaceship
   class ConnectAPI
     class Certificate
@@ -6,6 +9,7 @@ module Spaceship
 
       attr_accessor :certificate_content
       attr_accessor :display_name
+      attr_accessor :expiration_date
       attr_accessor :name
       attr_accessor :platform
       attr_accessor :serial_number
@@ -47,6 +51,26 @@ module Spaceship
         Time.parse(expiration_date) > Time.now
       end
 
+      # Create a new code signing request that can be used to
+      # generate a new certificate
+      # @example
+      #  Create a new certificate signing request
+      #  csr, pkey = Spaceship.certificate.create_certificate_signing_request
+      #
+      #  # Use the signing request to create a new distribution certificate
+      #  Spaceship.certificate.production.create!(csr: csr)
+      def self.create_certificate_signing_request
+        key = OpenSSL::PKey::RSA.new(2048)
+        csr = OpenSSL::X509::Request.new
+        csr.version = 0
+        csr.subject = OpenSSL::X509::Name.new([
+                                                ['CN', 'PEM', OpenSSL::ASN1::UTF8STRING]
+                                              ])
+        csr.public_key = key.public_key
+        csr.sign(key, OpenSSL::Digest::SHA1.new)
+        return [csr, key]
+      end
+
       #
       # API
       #
@@ -55,6 +79,24 @@ module Spaceship
         resps = Spaceship::ConnectAPI.get_certificates(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
+
+      def self.create(certificate_type: nil, csr_content: nil)
+        attributes = {
+          certificateType: certificate_type,
+          csrContent: csr_content
+        }
+        resp = Spaceship::ConnectAPI.post_certificate(attributes: attributes)
+        return resp.to_models.first
+      end
+
+      def self.get(certificate_id: nil, includes: nil)
+        resp = Spaceship::ConnectAPI.get_certificate(certificate_id: certificate_id, includes: includes)
+        return resp.to_models.first
+      end
+
+      def delete!
+        Spaceship::ConnectAPI.delete_certificate(certificate_id: id)
+      end
     end
   end
 end

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

@@ -48,6 +48,11 @@ module Spaceship
         resps = Spaceship::ConnectAPI.get_devices(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
+
+      def self.create(name: nil, platform: nil, udid: nil)
+        resp = Spaceship::ConnectAPI.post_device(name: name, platform: platform, udid: udid)
+        return resp.to_models.first
+      end
     end
   end
 end