motion-provisioning 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d69f93994879578dcfb06e0479a90988ae2547
-  data.tar.gz: b3fcb46905b35bd2d1bb26a803e4b5542d4e1a0a
+  metadata.gz: 83572e34ead0dbc5ff1f9c311ab85037b4f46c76
+  data.tar.gz: 5f45dd856b6dcd387b317201f1bf6b9233442007
 SHA512:
-  metadata.gz: 75a89c24204b2e2d01e91f4e92c490ab91ed4357461301432b06cb5369e221a26b1ba9b565bf0625c7d01c5442525c9303746977e9b7d8534a0ef476089fbd35
-  data.tar.gz: 476ad3dcf919cc07a784b870254f470a6339e39676841e0095325496717ed55418680ddd6e058f6dc5dac92ffa0dbb847c70b67f9c42b51357d7e21e2281b142
+  metadata.gz: d06e517948d74114699e810431b419b51af91dc31a8af28e89f719bfc32c0e62c1c24db642be52ae9c98eb7517659b45d629473724f70bae8392966e45134147
+  data.tar.gz: d0d156bde61fcf391c116da4743551cb1e251c2a03cfa7bc8692cce9c130046a17ac6736fd6a198f89fdd20bb7ec43a5f3265e7025eb62c43b748c568a47ddd9

data/README.md

@@ -50,7 +50,7 @@ MotionProvisioning.certificate(platform: platform,
 |Parameter|Description|
 |---------|------|
 |`platform`|`:ios`, `:tvos`, `:mac`|
-|`type`|`:development`, `:distribution`, `:developer_id` (only mac)|
+|`type`|`:beta`, `:distribution`, `:developer_id` (only mac)|
 |`free`|`true` if you want to use a free developer account. Default: `false`|
 
 ```ruby
@@ -180,6 +180,11 @@ For example, to recreate the development profile:
 
     rake device recreate_profile=1
 
+Or to recreate the development certificate:
+
+    rake device recreate_certificate=1
+
+
 ## Entitlements and App Services
 
 motion-provisioning does not (yet) manage entitlements and app services (like
@@ -199,7 +204,7 @@ You can also add arbitrary device IDs by running:
 
 Then, you will need to recreate the profile to include the newly registered device:
 
-    rake device recreate_profiles=1
+    rake device recreate_profile=1
 
 ## Testing
 

data/lib/motion-provisioning.rb

@@ -5,6 +5,7 @@ require 'date'
 
 require 'plist'
 require 'security'
+require 'highline/import'
 require 'spaceship'
 require 'motion-provisioning/spaceship/portal/certificate'
 require 'motion-provisioning/spaceship/portal_client'
@@ -66,7 +67,7 @@ module MotionProvisioning
       Utils.log("Info", "Logging into the Developer Portal with email '#{email}'.")
       begin
         client.user = email
-        client.send("do_login", email, password)
+        client.send_shared_login_request(email, password)
       rescue Spaceship::Client::InvalidUserCredentialsError => ex
         Utils.log("Error", "There was an error logging into your account. Your password may be wrong.")
 
@@ -95,7 +96,7 @@ module MotionProvisioning
         end
 
         if client.team_id.nil?
-          raise "could not find free team"
+          raise "The current user does not belong to a free team."
         end
       else
         if team_id = MotionProvisioning.config['team_id'] || ENV['MOTION_PROVISIONING_TEAM_ID']
@@ -112,23 +113,20 @@ module MotionProvisioning
             raise "The current user does not belong to team with ID '#{team_id}' selected in config.yml."
           end
         else
-
           team_id = client.select_team
-
-          if File.exist?(config_path) && ENV['MOTION_PROVISIONING_TEAM_ID'].nil?
-            answer = Utils.ask("Info", "Do you want to save the team id (#{team_id}) in the config file ('#{MotionProvisioning.output_path}/config.yaml') so you dont have to select it again? (Y/n):")
-            if answer.yes?
-              config = YAML.load(File.read(config_path))
-              config['team_id'] = team_id
-              File.write(config_path, config.to_yaml)
-            end
-          end
-
           self.team = client.teams.detect { |team| team['teamId'] == team_id }
         end
       end
 
-      Utils.log("Info", "Selected team '#{self.team['name']} (#{self.team['teamId']})'.")
+      Utils.log("Info", "Selected team \"#{team['name']}\" (#{team['teamId']}).")
+      if File.exist?(config_path) && ENV['MOTION_PROVISIONING_TEAM_ID'].nil? && MotionProvisioning.config['team_id'].nil?
+        answer = Utils.ask("Info", "Do you want to save the team \"#{team['name']}\" (#{team['teamId']}) in the config file ('#{MotionProvisioning.output_path}/config.yaml') so you dont have to select it again? (Y/n):")
+        if answer.yes?
+          config = YAML.load(File.read(config_path))
+          config['team_id'] = team['teamId']
+          File.write(config_path, config.to_yaml)
+        end
+      end
 
       Spaceship::App.set_client(client)
       Spaceship::AppGroup.set_client(client)

data/lib/motion-provisioning/provisioning_profile.rb

@@ -35,7 +35,7 @@ module MotionProvisioning
 
       app = Application.find_or_create(bundle_id: bundle_id, name: app_name, mac: platform == :mac)
 
-      profile = profile_type.find_by_bundle_id(bundle_id, mac: platform == :mac).detect do |profile|
+      profile = profile_type.find_by_bundle_id(bundle_id: bundle_id, mac: platform == :mac, sub_platform: ('tvOS' if platform == :tvos)).detect do |profile|
         next if profile.platform.downcase.include?("tvos") && platform != :tvos
         next if !profile.platform.downcase.include?("tvos") && platform == :tvos
         profile.name == provisioning_profile_name
@@ -124,10 +124,10 @@ module MotionProvisioning
     # The kind of provisioning profile we're interested in
     def profile_type
       return @profile_type if @profile_type
-      @profile_type = Spaceship.provisioning_profile.app_store
-      @profile_type = Spaceship.provisioning_profile.in_house if client.in_house?
-      @profile_type = Spaceship.provisioning_profile.ad_hoc if self.type == :adhoc
-      @profile_type = Spaceship.provisioning_profile.development if self.type == :development
+      @profile_type = Spaceship::Portal.provisioning_profile.app_store
+      @profile_type = Spaceship::Portal.provisioning_profile.in_house if client.in_house?
+      @profile_type = Spaceship::Portal.provisioning_profile.ad_hoc if self.type == :adhoc
+      @profile_type = Spaceship::Portal.provisioning_profile.development if self.type == :development
       @profile_type
     end
   end

data/lib/motion-provisioning/spaceship/free_portal_client.rb

@@ -1,7 +1,48 @@
 module Spaceship
   class FreePortalClient < Spaceship::PortalClient
+    XCODE_VERSION = '9.2 (9C40b)'
 
-    def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil)
+    def teams
+      return @teams if @teams
+      req = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/listTeams.action", nil, {
+        'X-Xcode-Version' => XCODE_VERSION # necessary in order to work with Xcode free team
+      })
+      @teams = parse_response(req, 'teams').sort_by do |team|
+        [
+          team['name'],
+          team['teamId']
+        ]
+      end
+    end
+
+    def development_certificates(mac: false)
+      paging do |page_number|
+        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listAllDevelopmentCerts.action?clientId=XABBG36SBA&teamId=#{team_id}", nil, {
+          'X-Xcode-Version' => XCODE_VERSION # necessary in order to work with Xcode free team
+        })
+        parse_response(r, 'certificates')
+      end
+    end
+
+    def provisioning_profiles_via_xcode_api(mac: false)
+      req = request(:post) do |r|
+        r.url("https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listProvisioningProfiles.action")
+        r.params = {
+          teamId: team_id,
+          includeInactiveProfiles: true,
+          onlyCountLists: true
+        }
+        r.headers['X-Xcode-Version'] = XCODE_VERSION # necessary in order to work with Xcode free team
+      end
+
+      result = parse_response(req, 'provisioningProfiles')
+
+      csrf_cache[Spaceship::Portal::ProvisioningProfile] = self.csrf_tokens
+
+      result
+    end
+
+    def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil, template_name: nil)
       ensure_csrf(Spaceship::App)
 
       params = {
@@ -67,12 +108,36 @@ module Spaceship
       parse_response(r, 'appId')
     end
 
-    def create_app!(type, name, bundle_id, mac: false)
+    def create_app!(type, name, bundle_id, mac: false, enable_services: {})
+      # 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(Spaceship::Portal::App)
+
+      ident_params = case type.to_sym
+                     when :explicit
+                       {
+                         type: 'explicit',
+                         # push: 'on',          # Not available to free teams
+                         # inAppPurchase: 'on', # Not available to free teams
+                         gameCenter: 'on'
+                       }
+                     when :wildcard
+                       {
+                         type: 'wildcard',
+                       }
+                     end
+
       params = {
         identifier: bundle_id,
         name: name,
         teamId: team_id
       }
+      params.merge!(ident_params)
+
+      enable_services.each do |k, v|
+        params[v.service_id.to_sym] = v.value
+      end
 
       ensure_csrf(Spaceship::App)
 
@@ -102,12 +167,15 @@ module Spaceship
     private
 
     def request_plist(method, url_or_path = nil, params = nil, headers = {}, &block)
-      headers['X-Xcode-Version'] = '7.3.1 (7D1014)'
-      headers['Content-Type'] = 'text/x-xml-plist'
+      headers['X-Xcode-Version'] = XCODE_VERSION
+      headers['Accept'] = 'text/x-xml-plist'
       headers['User-Agent'] = USER_AGENT
       headers.merge!(csrf_tokens)
 
-      params = params.to_plist if params
+      if params
+        headers['Content-Type'] = 'text/x-xml-plist'
+        params = params.to_plist
+      end
 
       send_request(method, url_or_path, params, headers, &block)
     end

data/lib/motion-provisioning/spaceship/portal_client.rb

@@ -1,32 +1,17 @@
 module Spaceship
   class PortalClient < Spaceship::Client
-    def distribution_certificates(mac: false)
+    def development_certificates(mac: false)
       paging do |page_number|
-        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/downloadDistributionCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
+        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listAllDevelopmentCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
         parse_response(r, 'certificates')
       end
     end
 
-    def development_certificates(mac: false)
+    def distribution_certificates(mac: false)
       paging do |page_number|
-        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listAllDevelopmentCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
+        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/downloadDistributionCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
         parse_response(r, 'certificates')
       end
     end
-
-    # Fix a bug in Fastlane where the slug is hardcoded to ios
-    def create_certificate!(type, csr, app_id = nil)
-      ensure_csrf(Spaceship::Certificate)
-
-      mac = Spaceship::Portal::Certificate::MAC_CERTIFICATE_TYPE_IDS.keys.include?(type)
-
-      r = request(:post, "account/#{platform_slug(mac)}/certificate/submitCertificateRequest.action", {
-        teamId: team_id,
-        type: type,
-        csrContent: csr,
-        appIdId: app_id # optional
-      })
-      parse_response(r, 'certRequest')
-    end
   end
 end

data/lib/motion-provisioning/version.rb

@@ -1,3 +1,3 @@
 module MotionProvisioning
-  VERSION = "0.0.7"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: motion-provisioning
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Mark Villacampa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spaceship
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '2.85'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '2.85'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +139,6 @@ files:
 - LICENSE.txt
 - README.md
 - bin/export_private_key
-- lib/.DS_Store
 - lib/motion-provisioning.rb
 - lib/motion-provisioning/application.rb
 - lib/motion-provisioning/certificate.rb
@@ -151,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simplified provisioning for RubyMotion iOS, tvOS and macOS apps.