spaceship 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a05323b6eb94cdb6d2e6cfd569a474b0b9d4458
-  data.tar.gz: 1b7dfa2048823baf113f92c5f85dca8c3e01ff27
+  metadata.gz: 0331855014bef933ae72ac1c53a5393245b03987
+  data.tar.gz: 469b03b9cefb35064f74904f2cf12911b3ba2851
 SHA512:
-  metadata.gz: 99c39230b509ed3e03be4bce69ba620f193c92b0646e7a64c095f00557fc9832f30c125ac8ac631de5ad7331087aacb4ca7641dfd0de4055a7371053e7d69336
-  data.tar.gz: acf379e3595f63f345b5d7fad8a8612cdd0338e97ef3eff38a8023b49b979060cfc0511fad5847eef01a63baf2af181ffabd437d1bc708466ace4539892add08
+  metadata.gz: 0ae10f270d59a7979d8e47f6ff1cd3aabbec0c5bcb69ed33c65028d6a306a9006a7feec83402dded431dd6fc35211539a4676c0f2d4d1a41fe300182a7424efe
+  data.tar.gz: d0c5bb81700c156275b7feda876628dfe66355b4a6e5e70233005d391cb4efcca7e9e39b8cfad3572910d8c4cefd93779e62fb467702b7c55eac5f297d5032b8

data/lib/spaceship/client.rb

@@ -1,6 +1,7 @@
 require 'faraday' # HTTP Client
 require 'logger'
 require 'faraday_middleware'
+require 'faraday-cookie_jar'
 require 'spaceship/ui'
 require 'spaceship/helper/plist_middleware'
 require 'spaceship/helper/net_http_generic_request'
@@ -14,9 +15,9 @@ end
 module Spaceship
   class Client
     PROTOCOL_VERSION = "QH65B2"
+    USER_AGENT = "Spaceship #{Spaceship::VERSION}"
 
     attr_reader :client
-    attr_accessor :cookie
 
     # The user that is currently logged in
     attr_accessor :user
@@ -67,6 +68,7 @@ module Spaceship
         c.response :json, content_type: /\bjson$/
         c.response :xml, content_type: /\bxml$/
         c.response :plist, content_type: /\bplist$/
+        c.use :cookie_jar
         c.adapter Faraday.default_adapter
 
         if ENV['DEBUG']
@@ -169,11 +171,6 @@ module Spaceship
       end
     end
 
-    # @return (Bool) Do we have a valid session?
-    def session?
-      !!@cookie
-    end
-
     def with_retry(tries = 5, &block)
       return block.call
     rescue Faraday::Error::TimeoutError, AppleTimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
@@ -204,11 +201,8 @@ module Spaceship
     end
 
     def request(method, url_or_path = nil, params = nil, headers = {}, &block)
-      if session?
-        headers.merge!({ 'Cookie' => cookie })
-        headers.merge!(csrf_tokens)
-      end
-      headers.merge!({ 'User-Agent' => 'spaceship' })
+      headers.merge!(csrf_tokens)
+      headers.merge!({ 'User-Agent' => USER_AGENT })
 
       # Before encoding the parameters, log them
       log_request(method, url_or_path, params)

data/lib/spaceship/portal/portal_client.rb

@@ -37,9 +37,11 @@ module Spaceship
         appIdKey: api_key
       })
 
-      if response['Set-Cookie'] =~ /myacinfo=(\w+);/
-        @cookie = "myacinfo=#{$1};"
-        return @client
+      case response.status
+      when 302
+        return response
+      when 200
+        raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
       else
         # Something went wrong. Was it invalid credentials or server issue
         if (response.body || "").include?("Your Apple ID or password was entered incorrectly")
@@ -51,6 +53,8 @@ module Spaceship
           info = [response.body, response['Set-Cookie']]
           raise UnexpectedResponse.new, info.join("\n")
         end
+        info = [response.body, response['Set-Cookie']]
+        raise UnexpectedResponse.new, info.join("\n")
       end
     end
 

data/lib/spaceship/tunes/tunes_client.rb

@@ -56,24 +56,16 @@ module Spaceship
     end
 
     # Set a new team ID which will be used from now on
-    def team_id=(t_id)
-      r = request(:post) do |req|
+    def team_id=(team_id)
+      response = request(:post) do |req|
         req.url "ra/v1/session/webSession"
-        req.body = { contentProviderId: t_id }.to_json
+        req.body = { contentProviderId: team_id }.to_json
         req.headers['Content-Type'] = 'application/json'
       end
 
-      unless r.headers['Set-Cookie'].to_s.include?("itctx")
-        raise "Looks like your Apple ID is not enabled for iTunes Connect, make sure to be able to login online"
-      end
-
-      itctx_regex = /itctx=([^;]*)/
-      new_itctx = r.headers['Set-Cookie'].match(itctx_regex).to_s
-
-      @cookie = @cookie.gsub(itctx_regex, new_itctx)
-      handle_itc_response(r.body)
+      handle_itc_response(response.body)
 
-      @current_team_id = t_id
+      @current_team_id = team_id
     end
 
     # Shows a team selection for the user in the terminal. This should not be
@@ -120,32 +112,6 @@ module Spaceship
       end
     end
 
-    # returns wosinst, wosid and itctx
-    def login_overhead_cookies(myacinfo)
-      return @login_overhead_cookies if @login_overhead_cookies
-
-      response = request(:get, "route?noext") # for woinst and wosid
-      cookies = {
-        woinst: response['Set-Cookie'].match(/woinst=([^;]*)/)[1],
-        wosid: response['Set-Cookie'].match(/wosid=([^;]*)/)[1],
-        myacinfo: myacinfo
-      }
-
-      # The second request has to be after getting the woinst and wois
-      woa = request(:get) do |req|
-        req.url "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa"
-        req.headers["Cookie"] = cookies.collect { |k, v| "#{k}=#{v}; " }.join("")
-      end
-
-      unless woa['Set-Cookie'].include?("itctx")
-        raise "Looks like your Apple ID is not enabled for iTunes Connect, make sure to be able to login online"
-      end
-
-      cookies[:itctx] = woa['Set-Cookie'].match(/itctx=([^;]*)/)[1]
-
-      return @login_overhead_cookies ||= cookies
-    end
-
     def service_key
       return @service_key if @service_key
       # We need a service key from a JS file to properly auth
@@ -164,31 +130,27 @@ module Spaceship
         req.url "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{service_key}"
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json, text/javascript'
       end
 
-      if response['Set-Cookie'] =~ /myacinfo=(\w+);/
-        # To use the session properly we'll need the following cookies:
-        #  - myacinfo
-        #  - woinst
-        #  - wosid
-        #  - itctx
-        begin
-          re = response['Set-Cookie']
-          myacinfo = re.match(/myacinfo=([^;]*)/)[1]
-          cookies = login_overhead_cookies(myacinfo)
-
-          @cookie = cookies.collect { |k, v| "#{k}=#{v}; " }.join("")
-        rescue
-          raise ITunesConnectError.new, [response.body, response['Set-Cookie']].join("\n")
-        end
+      # get woinst, wois, and itctx cookie values
+      request(:get, "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/wa/route?noext")
+      request(:get, "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa")
 
-        return @client
+      case response.status
+      when 403, 401
+        raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
+      when 200
+        return response
       else
         if response["Location"] == "/auth" # redirect to 2 step auth page
           raise "spaceship / fastlane doesn't support 2 step enabled accounts yet. Please temporary disable 2 step verification until spaceship was updated."
         elsif (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")
+          raise "Looks like your Apple ID is not enabled for iTunes Connect, make sure to be able to login online"
         else
           info = [response.body, response['Set-Cookie']]
           raise ITunesConnectError.new, info.join("\n")
@@ -598,11 +560,7 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
-    def submit_testflight_build_for_review!( # Required:
-                                            app_id: nil,
-                                            train: nil,
-                                            build_number: nil,
-
+    def submit_testflight_build_for_review!(app_id: nil, train: nil, build_number: nil,
                                             # Required Metadata:
                                             changelog: nil,
                                             description: nil,
@@ -620,14 +578,7 @@ module Spaceship
                                             review_password: nil,
                                             encryption: false)
 
-      start_url = "ra/apps/#{app_id}/trains/#{train}/builds/#{build_number}/submit/start"
-      r = request(:get) do |req|
-        req.url start_url
-        req.headers['Content-Type'] = 'application/json'
-      end
-      handle_itc_response(r.body)
-
-      build_info = r.body['data']
+      build_info = get_build_info_for_review(app_id: app_id, train: train, build_number: build_number)
       # Now fill in the values provided by the user
 
       # First the localised values:
@@ -648,27 +599,45 @@ module Spaceship
       build_info['testInfo']['reviewPassword']['value'] = review_password
 
       r = request(:post) do |req| # same URL, but a POST request
-        req.url start_url
+        req.url "ra/apps/#{app_id}/trains/#{train}/builds/#{build_number}/submit/start"
+
         req.body = build_info.to_json
         req.headers['Content-Type'] = 'application/json'
       end
       handle_itc_response(r.body)
 
       encryption_info = r.body['data']
-      if encryption_info['exportComplianceRequired']
-        # only sometimes this is required
+      update_encryption_compliance(app_id: app_id,
+                                   train: train,
+                                   build_number: build_number,
+                                   encryption_info: encryption_info,
+                                   encryption: encryption)
+    end
 
-        encryption_info['usesEncryption']['value'] = encryption
-        encryption_info['encryptionUpdated']['value'] = encryption
+    def get_build_info_for_review(app_id: nil, train: nil, build_number: nil)
+      r = request(:get) do |req|
+        req.url "ra/apps/#{app_id}/trains/#{train}/builds/#{build_number}/submit/start"
+        req.headers['Content-Type'] = 'application/json'
+      end
+      handle_itc_response(r.body)
 
-        r = request(:post) do |req|
-          req.url "ra/apps/#{app_id}/trains/#{train}/builds/#{build_number}/submit/complete"
-          req.body = encryption_info.to_json
-          req.headers['Content-Type'] = 'application/json'
-        end
+      r.body['data']
+    end
+
+    def update_encryption_compliance(app_id: nil, train: nil, build_number: nil, encryption_info: nil, encryption: nil)
+      return unless encryption_info['exportComplianceRequired']
+      # only sometimes this is required
+
+      encryption_info['usesEncryption']['value'] = encryption
+      encryption_info['encryptionUpdated']['value'] = encryption
 
-        handle_itc_response(r.body)
+      r = request(:post) do |req|
+        req.url "ra/apps/#{app_id}/trains/#{train}/builds/#{build_number}/submit/complete"
+        req.body = encryption_info.to_json
+        req.headers['Content-Type'] = 'application/json'
       end
+
+      handle_itc_response(r.body)
     end
 
     #####################################################

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday-cookie_jar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement