fastlane 2.161.0 → 2.166.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/snapshot/lib/snapshot/test_command_generator.rb

@@ -13,7 +13,7 @@ module Snapshot
         parts << "xcodebuild"
         parts += options(language, locale)
         parts += destination(devices)
-        parts += build_settings
+        parts += build_settings(language, locale)
         parts += actions
         parts += suffix
         parts += pipe(log_path: log_path)

data/snapshot/lib/snapshot/test_command_generator_base.rb

@@ -40,11 +40,13 @@ module Snapshot
         return options
       end
 
-      def build_settings
+      def build_settings(language, locale)
         config = Snapshot.config
 
         build_settings = []
         build_settings << "FASTLANE_SNAPSHOT=YES"
+        build_settings << "FASTLANE_LANGUAGE=#{language}" if language
+        build_settings << "FASTLANE_LOCALE=#{locale}" if locale
         build_settings << "TEST_TARGET_NAME=#{config[:test_target_name].shellescape}" if config[:test_target_name]
 
         return build_settings

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -14,7 +14,7 @@ module Snapshot
         parts << "xcodebuild"
         parts += options(language, locale)
         parts += destination(device_type)
-        parts += build_settings
+        parts += build_settings(language, locale)
         parts += actions
         parts += suffix
         parts += pipe(device_type, language, locale)

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'
@@ -30,6 +31,8 @@ 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/custom_app_organization'
+require 'spaceship/connect_api/models/custom_app_user'
 require 'spaceship/connect_api/models/pre_release_version'
 
 require 'spaceship/connect_api/models/age_rating_declaration'
@@ -85,5 +88,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

@@ -13,20 +13,23 @@ module Spaceship
 
       # Initializes client with Apple's App Store Connect JWT auth key.
       #
-      # This method will automatically use the key id, issuer id, and filepath from environment
+      # This method will automatically use the arguments from environment
       # variables if not given.
       #
-      # All three parameters are needed to authenticate.
+      # The key_id, issuer_id and either filepath or key are needed to authenticate.
       #
       # @param key_id (String) (optional): The key id
       # @param issuer_id (String) (optional): The issuer id
       # @param filepath (String) (optional): The filepath
+      # @param key (String) (optional): The key
+      # @param duration (Integer) (optional): How long this session should last
+      # @param in_house (Boolean) (optional): Whether this session is an Enterprise one
       #
       # @raise InvalidUserCredentialsError: raised if authentication failed
       #
       # @return (Spaceship::ConnectAPI::Client) The client the login method was called for
-      def self.auth(key_id: nil, issuer_id: nil, filepath: nil)
-        token = Spaceship::ConnectAPI::Token.create(key_id: key_id, issuer_id: issuer_id, filepath: filepath)
+      def self.auth(key_id: nil, issuer_id: nil, filepath: nil, key: nil, duration: nil, in_house: nil)
+        token = Spaceship::ConnectAPI::Token.create(key_id: key_id, issuer_id: issuer_id, filepath: filepath, key: key, duration: duration, in_house: in_house)
         return ConnectAPI::Client.new(token: token)
       end
 
@@ -97,8 +100,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 +139,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

@@ -18,11 +18,26 @@ module Spaceship
       attr_accessor :app_store_versions
       attr_accessor :prices
 
+      # Only available with Apple ID auth
+      attr_accessor :distribution_type
+      attr_accessor :educationDiscountType
+
       module ContentRightsDeclaration
         USES_THIRD_PARTY_CONTENT = "USES_THIRD_PARTY_CONTENT"
         DOES_NOT_USE_THIRD_PARTY_CONTENT = "DOES_NOT_USE_THIRD_PARTY_CONTENT"
       end
 
+      module DistributionType
+        APP_STORE = "APP_STORE"
+        CUSTOM = "CUSTOM"
+      end
+
+      module EducationDiscountType
+        DISCOUNTED = "DISCOUNTED"
+        NOT_APPLICABLE = "NOT_APPLICABLE"
+        NOT_DISCOUNTED = "NOT_DISCOUNTED"
+      end
+
       self.attr_mapping({
         "name" => "name",
         "bundleId" => "bundle_id",
@@ -32,6 +47,8 @@ module Spaceship
         "removed" => "removed",
         "isAAG" => "is_aag",
         "availableInNewTerritories" => "available_in_new_territories",
+        "distributionType" => "distribution_type",
+        "educationDiscountType" => "education_discount_type",
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
@@ -252,6 +269,24 @@ module Spaceship
         return resps.flat_map(&:to_models)
       end
 
+      #
+      # B2B
+      #
+
+      def disable_b2b
+        update(attributes: {
+          distributionType: DistributionType::APP_STORE,
+          education_discount_type: EducationDiscountType::NOT_DISCOUNTED
+        })
+      end
+
+      def enable_b2b
+        update(attributes: {
+          distributionType: App::DistributionType::CUSTOM,
+          education_discount_type: EducationDiscountType::NOT_APPLICABLE
+        })
+      end
+
       #
       # Beta Feedback
       #
@@ -323,6 +358,22 @@ module Spaceship
         return resps.flat_map(&:to_models).first
       end
 
+      #
+      # Education
+      #
+
+      def disable_educational_discount
+        update(attributes: {
+          education_discount_type: EducationDiscountType::NOT_DISCOUNTED
+        })
+      end
+
+      def enable_educational_discount
+        update(attributes: {
+          education_discount_type: EducationDiscountType::DISCOUNTED
+        })
+      end
+
       #
       # Users
       #

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/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/custom_app_organization.rb

@@ -0,0 +1,43 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class CustomAppOrganization
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :device_enrollment_program_id
+      attr_accessor :name
+
+      attr_mapping({
+        "deviceEnrollmentProgramId" => "device_enrollment_program_id",
+        "name" => "name"
+      })
+
+      def self.type
+        return "customAppOrganizations"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        resps = Spaceship::ConnectAPI.get_custom_app_organization(
+          app_id: app_id,
+          filter: filter,
+          includes: includes,
+          limit: nil,
+          sort: nil
+        ).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
+      def self.create(app_id: nil, device_enrollment_program_id: nil, name: nil)
+        return Spaceship::ConnectAPI.post_custom_app_organization(app_id: app_id, device_enrollment_program_id: device_enrollment_program_id, name: name).first
+      end
+
+      def delete!
+        Spaceship::ConnectAPI.delete_custom_app_organization(custom_app_organization_id: id)
+      end
+    end
+  end
+end