spaceship 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370ec337b82d693b4f075578ab84890ab2902e5f
-  data.tar.gz: 5e2606ea51d5c94ef8ec6f4f965f30c33a791ef8
+  metadata.gz: efe34135bd4966d4a8efe7ac21b7d638db2c085c
+  data.tar.gz: 44056669198645eb1de17498a975a7e66e613a53
 SHA512:
-  metadata.gz: df4dcbb65bea1cf44d5d67e2f07131970efef005f3467ea4d0311a1800496be35ba21478e10fb9fd6166670369ead31a2395163fef4db86f8f6523addb5fdd9f
-  data.tar.gz: ebb2ecb1788a9c54a0613faf5d313c6ee12616c5373b66641c8deb7cabce6fa72690f3bdc3cf4be2cf3b271c50191da9e1306500617b1b83c814b5eaef18e069
+  metadata.gz: 9d8ab0e67421cd0e5a3b93529823458c4e30d34d8c723b4dde29af757b308f2a12358e6217a75704868e5f95dc600d2e70531162ac01f46cf0f229d6dc38ba2b
+  data.tar.gz: 5293d69bfe011f6877e7885e7ba92e734d2a540d8a7763fe7e7e6af36f1545dd415a288de87c0e4babb71e82a467974bda48155666e086e8ee90dc65383ccad8

data/lib/spaceship/portal/portal_client.rb

@@ -287,10 +287,10 @@ module Spaceship
         type: type
       })
       a = parse_response(r)
-      if a.include?("Apple Inc")
+      if r.success? && a.include?("Apple Inc")
         return a
       else
-        raise "Couldn't download provisioning profile, got this instead: #{a}"
+        raise UnexpectedResponse.new, "Couldn't download provisioning profile, got this instead: #{a}"
       end
     end
 
@@ -338,10 +338,10 @@ module Spaceship
         displayId: profile_id
       })
       a = parse_response(r)
-      if a.include?("DOCTYPE plist PUBLIC")
+      if r.success? && a.include?("DOCTYPE plist PUBLIC")
         return a
       else
-        raise "Couldn't download provisioning profile, got this instead: #{a}"
+        raise UnexpectedResponse.new, "Couldn't download provisioning profile, got this instead: #{a}"
       end
     end
 

data/lib/spaceship/tunes/application.rb

@@ -130,7 +130,7 @@ module Spaceship
       #  if everything is alright, the result will be
       #  `{"sectionErrorKeys"=>[], "sectionInfoKeys"=>[], "sectionWarningKeys"=>[], "replyConstraints"=>{"minLength"=>1, "maxLength"=>4000}, "appNotes"=>{"threads"=>[]}, "betaNotes"=>{"threads"=>[]}, "appMessages"=>{"threads"=>[]}}`
       def resolution_center
-        client.get_resolution_center(apple_id)
+        client.get_resolution_center(apple_id, platform)
       end
 
       def details

data/lib/spaceship/tunes/tunes_client.rb

@@ -54,11 +54,23 @@ module Spaceship
         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
+      js = request(:get, "https://itunesconnect.apple.com/itc/static-resources/controllers/login_cntrl.js")
+      @service_key ||= js.body.match(/itcServiceKey = '(.*)'/)[1]
+    end
+
     def send_login_request(user, password)
       data = {
         accountName: user,
@@ -67,7 +79,7 @@ module Spaceship
       }
 
       response = request(:post) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/signin"
+        req.url "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{service_key}"
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -90,7 +102,9 @@ module Spaceship
 
         return @client
       else
-        if (response.body || "").include?("Your Apple ID or password was entered incorrectly")
+        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."
         else
@@ -238,8 +252,8 @@ module Spaceship
       handle_itc_response(data)
     end
 
-    def get_resolution_center(app_id)
-      r = request(:get, "ra/apps/#{app_id}/resolutionCenter?v=latest")
+    def get_resolution_center(app_id, platform)
+      r = request(:get, "ra/apps/#{app_id}/platforms/#{platform}/resolutionCenter?v=latest")
       parse_response(r, 'data')
     end
 

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager