spaceship 0.31.8 → 0.31.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34363edf546d130d7ab1c2d98cb1bcd9d57a358
-  data.tar.gz: 7839f0cfd68685a391b87faa16dd2e781f258dee
+  metadata.gz: 3007b65bb9eddd5604158b7c809a0e6f05c4e8d6
+  data.tar.gz: 50ade9d99cea43718791fa7f48fa6f2855e91851
 SHA512:
-  metadata.gz: 6e5b05cae3b0e1cbc8d97bdc48979cef96bb5ab39e3c5f1d56a924be78fd65a6cfa898be2ccffb052eb1ace9dfdeec6eb124eb38ce92d9052d525f7f05849972
-  data.tar.gz: b34093969e1884de121c5e645bbd0d10757afabecfb9b718a20d7c3cd80a72a147b3c1df92ed8fe5aae8fc75ed34b9fa961b345566a28ae1b1e9c36c62602071
+  metadata.gz: 3c353f411cbd5de26fa6187889de6ebb47192f1e7a2fd151ebe3232adc4b171288716530ce89c155335b3379a94eeaff9a3cea0b4139bbca16b5a9f47d3b5cac
+  data.tar.gz: 8d05c8f60cfa4b79c21e63f56b7bdac0d8bee1a5d38067aa641491875941207ea311c21bc91dd17e74ffe9c4714dfe7ee673785aa633522e82d29dfe02dbc9db

data/lib/spaceship/client.rb

@@ -28,6 +28,8 @@ module Spaceship
     # /tmp/spaceship[time]_[pid].log by default
     attr_accessor :logger
 
+    attr_accessor :csrf_tokens
+
     # Base class for errors that want to present their message as
     # preferred error info for fastlane error handling. See:
     # fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb
@@ -345,11 +347,15 @@ module Spaceship
       raise ex # re-raise the exception
     end
 
+    # memorize the last csrf tokens from responses
+    def csrf_tokens
+      @csrf_tokens || {}
+    end
+
     private
 
     def do_login(user, password)
       @loggedin = false
-      @requested_csrf_token = nil
       ret = send_login_request(user, password) # different in subclasses
       @loggedin = true
       ret
@@ -365,11 +371,6 @@ module Spaceship
       end
     end
 
-    # memorize the last csrf tokens from responses
-    def csrf_tokens
-      @csrf_tokens || {}
-    end
-
     def request(method, url_or_path = nil, params = nil, headers = {}, &block)
       headers.merge!(csrf_tokens)
       headers['User-Agent'] = USER_AGENT

data/lib/spaceship/portal/portal_client.rb

@@ -1,4 +1,5 @@
 module Spaceship
+  # rubocop:disable Metrics/ClassLength
   class PortalClient < Spaceship::Client
     #####################################################
     # @!group Init and Login
@@ -129,7 +130,7 @@ module Spaceship
     end
 
     def update_service_for_app(app, service)
-      ensure_csrf
+      ensure_csrf(Spaceship::App)
 
       request(:post, service.service_uri, {
         teamId: team_id,
@@ -142,7 +143,7 @@ module Spaceship
     end
 
     def associate_groups_with_app(app, groups)
-      ensure_csrf
+      ensure_csrf(Spaceship::AppGroup)
 
       request(:post, 'account/ios/identifiers/assignApplicationGroupToAppId.action', {
         teamId: team_id,
@@ -158,7 +159,7 @@ module Spaceship
       # We moved the ensure_csrf to the top of this method
       # as we got some users with issues around creating new apps
       # https://github.com/fastlane/fastlane/issues/5813
-      ensure_csrf
+      ensure_csrf(Spaceship::App)
 
       ident_params = case type.to_sym
                      when :explicit
@@ -188,6 +189,8 @@ module Spaceship
     end
 
     def delete_app!(app_id, mac: false)
+      ensure_csrf(Spaceship::App)
+
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteAppId.action", {
         teamId: team_id,
         appIdId: app_id
@@ -212,7 +215,7 @@ module Spaceship
     end
 
     def create_app_group!(name, group_id)
-      ensure_csrf
+      ensure_csrf(Spaceship::AppGroup)
 
       r = request(:post, 'account/ios/identifiers/addApplicationGroup.action', {
         name: name,
@@ -223,7 +226,7 @@ module Spaceship
     end
 
     def delete_app_group!(app_group_id)
-      ensure_csrf
+      ensure_csrf(Spaceship::AppGroup)
 
       r = request(:post, 'account/ios/identifiers/deleteApplicationGroup.action', {
         teamId: team_id,
@@ -262,7 +265,7 @@ module Spaceship
     end
 
     def create_device!(device_name, device_id, mac: false)
-      ensure_csrf
+      ensure_csrf(Spaceship::Device)
 
       req = request(:post) do |r|
         r.url "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/addDevice.action"
@@ -294,7 +297,7 @@ module Spaceship
     end
 
     def create_certificate!(type, csr, app_id = nil)
-      ensure_csrf
+      ensure_csrf(Spaceship::Certificate)
 
       r = request(:post, 'account/ios/certificate/submitCertificateRequest.action', {
         teamId: team_id,
@@ -322,7 +325,7 @@ module Spaceship
     end
 
     def revoke_certificate!(certificate_id, type, mac: false)
-      ensure_csrf
+      ensure_csrf(Spaceship::Certificate)
 
       r = request(:post, "account/#{platform_slug(mac)}/certificate/revokeCertificate.action", {
         teamId: team_id,
@@ -350,7 +353,9 @@ module Spaceship
     end
 
     def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil)
-      ensure_csrf
+      # Calling provisioning_profiles uses a different api end point than creating or deleting them so we
+      # use a different entity to gather the csrf token
+      ensure_csrf(Spaceship::App)
 
       params = {
         teamId: team_id,
@@ -380,7 +385,9 @@ module Spaceship
     end
 
     def delete_provisioning_profile!(profile_id, mac: false)
-      ensure_csrf
+      # Calling provisioning_profiles uses a different api end point than creating or deleting them so we
+      # use a different entity to gather the csrf token
+      ensure_csrf(Spaceship::App)
 
       r = request(:post, "account/#{platform_slug(mac)}/profile/deleteProvisioningProfile.action", {
         teamId: team_id,
@@ -390,7 +397,9 @@ module Spaceship
     end
 
     def repair_provisioning_profile!(profile_id, name, distribution_method, app_id, certificate_ids, device_ids, mac: false)
-      ensure_csrf
+      # Calling provisioning_profiles uses a different api end point than creating or deleting them so we
+      # use a different entity to gather the csrf token
+      ensure_csrf(Spaceship::App)
 
       r = request(:post, "account/#{platform_slug(mac)}/profile/regenProvisioningProfile.action", {
         teamId: team_id,
@@ -407,27 +416,34 @@ module Spaceship
 
     private
 
-    def ensure_csrf
-      # It's important we store this state here
-      # as we always want to request something at least once
-      return unless @requested_csrf_token.nil?
+    # This is a cache of entity type (App, AppGroup, Certificate, Device) to csrf_tokens
+    def csrf_cache
+      @csrf_cache || {}
+    end
+
+    # Ensures that there are csrf tokens for the appropriate entity type
+    # Relies on store_csrf_tokens to set csrf_tokens to the appropriate value
+    # then stores that in the correct place in cache
+    def ensure_csrf(klass)
+      if csrf_cache[klass]
+        self.csrf_tokens = csrf_cache[klass]
+        return
+      end
 
-      # Update 23rd August 2016
-      # Instead of calling `Certificate::Production.all` we call `App.all`
-      # We've had issues when we only requested certificates, instead of apps, we don't know why
-      # Source: https://github.com/fastlane/fastlane/issues/5827
+      self.csrf_tokens = nil
 
       # If we directly create a new resource (e.g. app) without querying anything before
       # we don't have a valid csrf token, that's why we have to do at least one request
-      App.all
+      klass.all
 
       # Update 18th August 2016
       # For some reason, we have to query the resource twice to actually get a valid csrf_token
       # I couldn't find out why, the first response does have a valid Set-Cookie header
       # But it still needs this second request
-      App.all
+      klass.all
 
-      @requested_csrf_token = true if csrf_tokens.count > 0
+      csrf_cache[klass] = self.csrf_tokens
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/spaceship/version.rb

@@ -1,4 +1,4 @@
 module Spaceship
-  VERSION = "0.31.8".freeze
+  VERSION = "0.31.9".freeze
   DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.31.8
+  version: 0.31.9
 platform: ruby
 authors:
 - Felix Krause
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby library to access the Apple Dev Center and iTunes Connect