fastlane 2.34.0 → 2.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 476b447650ec03fab7e9903ca3bee62d3f42bfde
-  data.tar.gz: 86a6d8fa75d294749c345b5c074099cd13805209
+  metadata.gz: 2a703ca979d3b3cd10a0396a0cc9a826bfa43d67
+  data.tar.gz: 5909052758266430d88fc2a1970b8399848039da
 SHA512:
-  metadata.gz: 2b707014f17a86db8c73206c69a3eb2db15253fef2249815ce4feb73ab3ce1457c1ea28ba8c4e0d1253ef4be4403dcebe48a45406e0bf1f9f3d3138dbc54d470
-  data.tar.gz: 541aedfd64deceb114b1f472a477fefa2e8bf5626bf8c2a9192c75ab88b259a826994292b3e65e600d5b33358efb242c51127950b1e218f9955b3d971fc9612d
+  metadata.gz: 17c241d3e80cf683d5ff1a5426cea3870cd1f58bb4574d8d3a823499e0a472ea079fbd80d37d0bb604b56f0ca150aeb47afc48b96f1e67f6bb047dcf7c2683e8
+  data.tar.gz: 1f8ee5eccdccfd78b1270c1a604037faac1b474d94b84bc6e3d0c24b0a3402ec3e322c9586119f8d3a6cb2ddea5a6e0fed395e02a325709d5e871cb8226c7461

data/fastlane/lib/fastlane/actions/slather.rb

@@ -28,6 +28,7 @@ module Fastlane
 
           input_format: '--input-format',
           scheme: '--scheme',
+          configuration: '--configuration',
           workspace: '--workspace',
           binary_file: '--binary-file',
           binary_basename: '--binary-basename',
@@ -52,7 +53,20 @@ module Fastlane
         File.file?('.slather.yml')
       end
 
+      def self.slather_version
+        require 'slather'
+        Slather::VERSION
+      end
+
+      def self.configuration_available?
+        Gem::Version.new('2.4.1') <= Gem::Version.new(slather_version)
+      end
+
       def self.validate_params!(params)
+        if params[:configuration]
+          UI.user_error!('configuration option is available since version 2.4.1') unless configuration_available?
+        end
+
         if params[:proj] || has_config_file
           true
         else
@@ -121,6 +135,10 @@ Slather is available at https://github.com/SlatherOrg/slather
                                        env_name: "FL_SLATHER_SCHEME", # The name of the environment variable
                                        description: "Scheme to use when calling slather",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :configuration,
+                                       env_name: "FL_SLATHER_CONFIGURATION", # The name of the environment variable
+                                       description: "Configuration to use when calling slather (since slather-2.4.1)",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :input_format,
                                        env_name: "FL_SLATHER_INPUT_FORMAT", # The name of the environment variable
                                        description: "The input format that slather should look for",

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.34.0'.freeze
+  VERSION = '2.35.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/spaceship/lib/spaceship/client.rb

@@ -137,6 +137,50 @@ module Spaceship
       end
     end
 
+    # Fetch the general information of the user, is used by various methods across spaceship
+    # Sample return value
+    # => {"associatedAccounts"=>
+    #   [{"contentProvider"=>{"contentProviderId"=>11142800, "name"=>"Felix Krause", "contentProviderTypes"=>["Purple Software"]}, "roles"=>["Developer"], "lastLogin"=>1468784113000}],
+    #  "sessionToken"=>{"dsId"=>"8501011116", "contentProviderId"=>18111111, "expirationDate"=>nil, "ipAddress"=>nil},
+    #  "permittedActivities"=>
+    #   {"EDIT"=>
+    #     ["UserManagementSelf",
+    #      "GameCenterTestData",
+    #      "AppAddonCreation"],
+    #    "REPORT"=>
+    #     ["UserManagementSelf",
+    #      "AppAddonCreation"],
+    #    "VIEW"=>
+    #     ["TestFlightAppExternalTesterManagement",
+    #      ...
+    #      "HelpGeneral",
+    #      "HelpApplicationLoader"]},
+    #  "preferredCurrencyCode"=>"EUR",
+    #  "preferredCountryCode"=>nil,
+    #  "countryOfOrigin"=>"AT",
+    #  "isLocaleNameReversed"=>false,
+    #  "feldsparToken"=>nil,
+    #  "feldsparChannelName"=>nil,
+    #  "hasPendingFeldsparBindingRequest"=>false,
+    #  "isLegalUser"=>false,
+    #  "userId"=>"1771111155",
+    #  "firstname"=>"Detlef",
+    #  "lastname"=>"Mueller",
+    #  "isEmailInvalid"=>false,
+    #  "hasContractInfo"=>false,
+    #  "canEditITCUsersAndRoles"=>false,
+    #  "canViewITCUsersAndRoles"=>true,
+    #  "canEditIAPUsersAndRoles"=>false,
+    #  "transporterEnabled"=>false,
+    #  "contentProviderFeatures"=>["APP_SILOING", "PROMO_CODE_REDESIGN", ...],
+    #  "contentProviderType"=>"Purple Software",
+    #  "displayName"=>"Detlef",
+    #  "contentProviderId"=>"18742800",
+    #  "userFeatures"=>[],
+    #  "visibility"=>true,
+    #  "DYCVisibility"=>false,
+    #  "contentProvider"=>"Felix Krause",
+    #  "userName"=>"detlef@krausefx.com"}
     def user_details_data
       return @_cached_user_details if @_cached_user_details
       r = request(:get, '/WebObjects/iTunesConnect.woa/ra/user/detail')
@@ -186,6 +230,13 @@ module Spaceship
       @current_team_id = team_id
     end
 
+    # @return (Hash) Fetches all information of the currently used team
+    def team_information
+      teams.find do |t|
+        t['teamId'] == team_id
+      end
+    end
+
     # Instantiates a client but with a cookie derived from another client.
     #
     # HACK: since the `@cookie` is not exposed, we use this hacky way of sharing the instance.
@@ -350,7 +401,7 @@ module Spaceship
         if keychain_entry.invalid_credentials
           login(user)
         else
-          puts "Please run this tool again to apply the new password"
+          raise ex
         end
       end
     end
@@ -392,10 +443,11 @@ module Spaceship
         end
 
         response = request(:post) do |req|
-          req.url "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{itc_service_key}"
+          req.url "https://idmsa.apple.com/appleauth/auth/signin"
           req.body = data.to_json
           req.headers['Content-Type'] = 'application/json'
           req.headers['X-Requested-With'] = 'XMLHttpRequest'
+          req.headers['X-Apple-Widget-Key'] = self.itc_service_key
           req.headers['Accept'] = 'application/json, text/javascript'
           req.headers["Cookie"] = modified_cookie if modified_cookie
         end
@@ -403,23 +455,22 @@ module Spaceship
         raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
       end
 
-      # get `woinst` and `wois` cookie values
-      request(:get, "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/wa")
-
-      # Get the `itctx` from the new (22nd May 2017) API endpoint "olympus"
-      request(:get, "https://olympus.itunes.apple.com/v1/session")
+      # Now we know if the login is successful or if we need to do 2 factor
 
       case response.status
       when 403
         raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
       when 200
+        fetch_olympus_session
         return response
+      when 409
+        # 2 factor is enabled for this account, first handle that
+        # and then get the olympus session
+        handle_two_step(response)
+        fetch_olympus_session
+        return true
       else
-        location = response["Location"]
-        if location && URI.parse(location).path == "/auth" # redirect to 2 step auth page
-          handle_two_step(response)
-          return true
-        elsif (response.body || "").include?('invalid="true"')
+        if (response.body || "").include?('invalid="true"')
           # User Credentials are wrong
           raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
         elsif (response['Set-Cookie'] || "").include?("itctx")
@@ -431,6 +482,11 @@ module Spaceship
       end
     end
 
+    # Get the `itctx` from the new (22nd May 2017) API endpoint "olympus"
+    def fetch_olympus_session
+      request(:get, "https://olympus.itunes.apple.com/v1/session")
+    end
+
     def itc_service_key
       return @service_key if @service_key
 
@@ -438,16 +494,10 @@ module Spaceship
       itc_service_key_path = "/tmp/spaceship_itc_service_key.txt"
       return File.read(itc_service_key_path) if File.exist?(itc_service_key_path)
 
-      # Some customers in Asia have had trouble with the CDNs there that cache and serve this content, leading
-      # to "buffer error (Zlib::BufError)" from deep in the Ruby HTTP stack. Setting this header requests that
-      # the content be served only as plain-text, which seems to work around their problem, while not affecting
-      # other clients.
-      #
-      # https://github.com/fastlane/fastlane/issues/4610
-      headers = { 'Accept-Encoding' => 'identity' }
-      # We need a service key from a JS file to properly auth
-      js = request(:get, "https://itunesconnect.apple.com/itc/static-resources/controllers/login_cntrl.js", nil, headers)
-      @service_key = js.body.match(/itcServiceKey = '(.*)'/)[1]
+      response = request(:get, "https://olympus.itunes.apple.com/v1/app/config?hostname=itunesconnect.apple.com")
+      @service_key = response.body["authServiceKey"].to_s
+
+      raise "Service key is empty" if @service_key.length == 0
 
       # Cache the key locally
       File.write(itc_service_key_path, @service_key)

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

@@ -43,59 +43,6 @@ module Spaceship
       "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/"
     end
 
-    # @return (Array) A list of all available teams
-    def teams
-      user_details_data['associatedAccounts'].sort_by do |team|
-        [
-          team['contentProvider']['name'],
-          team['contentProvider']['contentProviderId']
-        ]
-      end
-    end
-
-    # @return (String) The currently selected Team ID
-    def team_id
-      return @current_team_id if @current_team_id
-
-      if teams.count > 1
-        puts "The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now."
-      end
-      @current_team_id ||= teams[0]['contentProvider']['contentProviderId']
-    end
-
-    # Set a new team ID which will be used from now on
-    def team_id=(team_id)
-      # First, we verify the team actually exists, because otherwise iTC would return the
-      # following confusing error message
-      #
-      #     invalid content provider id
-      #
-      available_teams = teams.collect do |team|
-        (team["contentProvider"] || {})["contentProviderId"]
-      end
-
-      result = available_teams.find do |available_team_id|
-        team_id.to_s == available_team_id.to_s
-      end
-
-      unless result
-        raise ITunesConnectError.new, "Could not set team ID to '#{team_id}', only found the following available teams: #{available_teams.join(', ')}"
-      end
-
-      response = request(:post) do |req|
-        req.url "ra/v1/session/webSession"
-        req.body = {
-          contentProviderId: team_id,
-          dsId: user_detail_data.ds_id # https://github.com/fastlane/fastlane/issues/6711
-        }.to_json
-        req.headers['Content-Type'] = 'application/json'
-      end
-
-      handle_itc_response(response.body)
-
-      @current_team_id = team_id
-    end
-
     # Shows a team selection for the user in the terminal. This should not be
     # called on CI systems
     def select_team
@@ -149,13 +96,6 @@ module Spaceship
       end
     end
 
-    # @return (Hash) Fetches all information of the currently used team
-    def team_information
-      teams.find do |t|
-        t['teamId'] == team_id
-      end
-    end
-
     def send_login_request(user, password)
       clear_user_cached_data
       send_shared_login_request(user, password)
@@ -679,56 +619,6 @@ module Spaceship
       Spaceship::Tunes::AppVersionRef.factory(data)
     end
 
-    # Fetch the general information of the user, is used by various methods across spaceship
-    # Sample return value
-    # => {"associatedAccounts"=>
-    #   [{"contentProvider"=>{"contentProviderId"=>11142800, "name"=>"Felix Krause", "contentProviderTypes"=>["Purple Software"]}, "roles"=>["Developer"], "lastLogin"=>1468784113000}],
-    #  "sessionToken"=>{"dsId"=>"8501011116", "contentProviderId"=>18111111, "expirationDate"=>nil, "ipAddress"=>nil},
-    #  "permittedActivities"=>
-    #   {"EDIT"=>
-    #     ["UserManagementSelf",
-    #      "GameCenterTestData",
-    #      "AppAddonCreation"],
-    #    "REPORT"=>
-    #     ["UserManagementSelf",
-    #      "AppAddonCreation"],
-    #    "VIEW"=>
-    #     ["TestFlightAppExternalTesterManagement",
-    #      ...
-    #      "HelpGeneral",
-    #      "HelpApplicationLoader"]},
-    #  "preferredCurrencyCode"=>"EUR",
-    #  "preferredCountryCode"=>nil,
-    #  "countryOfOrigin"=>"AT",
-    #  "isLocaleNameReversed"=>false,
-    #  "feldsparToken"=>nil,
-    #  "feldsparChannelName"=>nil,
-    #  "hasPendingFeldsparBindingRequest"=>false,
-    #  "isLegalUser"=>false,
-    #  "userId"=>"1771111155",
-    #  "firstname"=>"Detlef",
-    #  "lastname"=>"Mueller",
-    #  "isEmailInvalid"=>false,
-    #  "hasContractInfo"=>false,
-    #  "canEditITCUsersAndRoles"=>false,
-    #  "canViewITCUsersAndRoles"=>true,
-    #  "canEditIAPUsersAndRoles"=>false,
-    #  "transporterEnabled"=>false,
-    #  "contentProviderFeatures"=>["APP_SILOING", "PROMO_CODE_REDESIGN", ...],
-    #  "contentProviderType"=>"Purple Software",
-    #  "displayName"=>"Detlef",
-    #  "contentProviderId"=>"18742800",
-    #  "userFeatures"=>[],
-    #  "visibility"=>true,
-    #  "DYCVisibility"=>false,
-    #  "contentProvider"=>"Felix Krause",
-    #  "userName"=>"detlef@krausefx.com"}
-    def user_details_data
-      return @_cached_user_details if @_cached_user_details
-      r = request(:get, '/WebObjects/iTunesConnect.woa/ra/user/detail')
-      @_cached_user_details = parse_response(r, 'data')
-    end
-
     # Fetches the User Detail information from ITC. This gets called often and almost never changes
     # so we cache it
     # @return [UserDetail] the response

data/spaceship/lib/spaceship/two_step_client.rb

@@ -6,9 +6,7 @@ module Spaceship
 
       r = request(:get) do |req|
         req.url "https://idmsa.apple.com/appleauth/auth"
-        req.headers["scnt"] = @scnt
-        req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
-        req.headers["Accept"] = "application/json"
+        update_request_headers(req)
       end
 
       if r.body.kind_of?(Hash) && r.body["trustedDevices"].kind_of?(Array)
@@ -66,11 +64,10 @@ module Spaceship
       # Send securityCode back to server to get a valid session
       r = request(:post) do |req|
         req.url "https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode"
-        req.headers["Accept"] = "application/json"
         req.headers['Content-Type'] = 'application/json'
-        req.headers["scnt"] = @scnt
-        req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
         req.body = { "securityCode" => { "code" => code.to_s } }.to_json
+
+        update_request_headers(req)
       end
 
       # we use `Spaceship::TunesClient.new.handle_itc_response`
@@ -121,9 +118,7 @@ module Spaceship
       # Request Token
       r = request(:put) do |req|
         req.url "https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode"
-        req.headers["Accept"] = "application/json"
-        req.headers["scnt"] = @scnt
-        req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
+        update_request_headers(req)
       end
 
       # we use `Spaceship::TunesClient.new.handle_itc_response`
@@ -137,11 +132,10 @@ module Spaceship
       # Send token back to server to get a valid session
       r = request(:post) do |req|
         req.url "https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode"
-        req.headers["Accept"] = "application/json"
-        req.headers["scnt"] = @scnt
-        req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
         req.body = { "code" => code.to_s }.to_json
         req.headers['Content-Type'] = 'application/json'
+
+        update_request_headers(req)
       end
 
       begin
@@ -193,8 +187,8 @@ module Spaceship
 
       request(:get) do |req|
         req.url "https://idmsa.apple.com/appleauth/auth/2sv/trust"
-        req.headers["scnt"] = @scnt
-        req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
+
+        update_request_headers(req)
       end
       # This request will fail if the user isn't added to a team on iTC
       # However we don't really care, this request will still return the
@@ -202,5 +196,14 @@ module Spaceship
 
       self.store_cookie
     end
+
+    # Responsible for setting all required header attributes for the requests
+    # to succeed
+    def update_request_headers(req)
+      req.headers["X-Apple-Id-Session-Id"] = @x_apple_id_session_id
+      req.headers["X-Apple-Widget-Key"] = self.itc_service_key
+      req.headers["Accept"] = "application/json"
+      req.headers["scnt"] = @scnt
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.35.0
 platform: ruby
 authors:
 - Felix Krause