motion-provisioning 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273aab1a938e5d52d30b14c0a2538ec9d4a973ac902e10be63c5969bb238867c
-  data.tar.gz: 14e1ae35c646f2ef1f2430434f0ca31e8526e852202b52e9bc3a5d76b157dcc9
+  metadata.gz: 1c76a060ff83ed382da227fbe52f1dd8f14d8580d586f647f1983bb9f2f8e379
+  data.tar.gz: c6d1822c316b30d3c617433e030fd7103972015524c673af37ee9562fa4e6375
 SHA512:
-  metadata.gz: ef44dead0d80e6db7d71d8ef8f66d9ec74a75be7526acea5d0e58b0471362092bf1dcef7518facc6dc313773e7a324615417627eb360e49cc03fe2d27a29a05e
-  data.tar.gz: 2ae333afe71816a440033eea21e48bea2f754233eef2429bd3692822c732ba6f3f3c9943be359313ef81e6c9272035992914fd784d9818c84888ff15b5574e80
+  metadata.gz: 503580b9c3fbcb91cf3509988025f36a6dc6d4463b117a7723b64fe589ef37a1d7aa2a2d4c5b15c33ed061de2ac2e49f38a4446386aa28627c7fbc2dddd614e0
+  data.tar.gz: 0f8f12fa5f4fa5e208dd35f9de1730af3d3085c0f0045bf8631a2ce42b63d71ab88db1b3fbdd60dcdbeab2b90f59d611f61a8cbfc3edf47937dcc5f9863e1604

data/lib/motion-provisioning/certificate.rb

@@ -24,14 +24,13 @@ module MotionProvisioning
         installed_cert = identities.detect { |e| e[:fingerprint] == fingerprint }
         if installed_cert
           Utils.log("Info", "Using certificate '#{installed_cert[:name]}'.")
-          return installed_cert[:name]
+          return installed_cert[:fingerprint]
         else
           # The certificate is not installed, so we install the cert and the key
           import_file(private_key_path)
           import_file(certificate_path)
-          name = common_name(certificate_path)
-          Utils.log("Info", "Using certificate '#{name}'.")
-          return name
+          Utils.log("Info", "Using certificate '#{common_name(certificate_path)}'.")
+          return sha1_fingerprint(certificate_path)
         end
       end
 
@@ -48,17 +47,17 @@ module MotionProvisioning
         end
       end
 
-      # There are no certificates in the server so we create a new one
       if certificates.empty?
+        # There are no certificates in the server so we create a new one
         Utils.log("Warning", "Couldn't find any existing certificates... creating a new one.")
         if certificate = create_certificate
-          return common_name(certificate)
+          return sha1_fingerprint(certificate)
         else
           Utils.log("Error", "Something went wrong when trying to create a new certificate.")
           abort
         end
-      # There are certificates in the server, but none are installed locally. Revoke all and create a new one.
       elsif installed_certificate.nil?
+        # There are certificates in the server, but none are installed locally. Revoke all and create a new one.
         Utils.log("Error", "None of the available certificates (#{certificates.count}) is installed on the local machine. Revoking...")
 
         # For distribution, ask before revoking
@@ -79,13 +78,43 @@ module MotionProvisioning
         end
 
         if certificate = create_certificate
-          return common_name(certificate)
+          return sha1_fingerprint(certificate)
         else
           Utils.log("Error", "Something went wrong when trying to create a new certificate...")
           abort
         end
-      # There are certificates on the server, and one of them is installed locally.
+      elsif ENV['recreate_certificate'] != nil
+        # Force recreate certificate, even though a valid certificate is already installed locally
+
+        if self.type == :distribution
+          answer = Utils.ask("Info", "There are #{certificates.count} distribution certificates in your account.\n" \
+                    "Before revoking and creating a new one, ask other team members who might have them installed to share them with you.\n" \
+                    "Do you want to revoke the existing certificates? (Y/n):")
+          if answer.yes?
+            certificates.each(&:revoke!)
+          end
+        else
+          answer = Utils.ask("Info", "You have #{certificates.count} development certificates in your account.\n" \
+                    "Do you want to revoke your existing certificates? (Y/n):")
+          if answer.yes?
+            if MotionProvisioning.free
+              certificates.each do |certificate|
+                client.revoke_development_certificate(certificate.motionprovisioning_serialNumber)
+              end
+            else
+              certificates.each(&:revoke!)
+            end
+          end
+        end
+
+        if certificate = create_certificate
+          return sha1_fingerprint(certificate)
+        else
+          Utils.log("Error", "Something went wrong when trying to create a new certificate.")
+          abort
+        end
       else
+        # There are certificates on the server, and one of them is installed locally.
         Utils.log("Info", "Found certificate '#{installed_certificate.name}' which is installed in the local machine.")
 
         path = store_certificate_raw(installed_certificate.motionprovisioning_certContent || installed_certificate.download_raw)
@@ -97,7 +126,7 @@ module MotionProvisioning
         # This certificate is installed on the local machine
         Utils.log("Info", "Using certificate '#{installed_certificate.name}'.")
 
-        common_name(path)
+        sha1_fingerprint(path)
       end
     end
 
@@ -191,9 +220,9 @@ module MotionProvisioning
       Utils.log("Info", "Successfully installed certificate.")
 
       if self.type == :distribution
-        Utils.log("Warning", "You have just created a distribution certificate. These certificates must be shared with other team members by sending them the private key (.p12) and certificate (.cer) files in your output folder and install them in the keychain.")
+        Utils.log("Warning", "You have just created a distribution certificate. These certificates must be shared with other team members by sending them the private key (.p12) and certificate (.cer) files in your 'provisioning' folder and install them in the keychain.")
       else
-        Utils.log("Warning", "You have just created a development certificate. If you want to use this certificate on another machine, transfer the private key (.p12) and certificate (.cer) files in your output folder and install them in the keychain.")
+        Utils.log("Warning", "You have just created a development certificate. If you want to use this certificate on another machine, transfer the private key (.p12) and certificate (.cer) files in your 'provisioning' folder and install them in the keychain.")
       end
       Utils.ask("Info", "Press any key to continue...")
 

data/lib/motion-provisioning/version.rb

@@ -1,3 +1,3 @@
 module MotionProvisioning
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Mark Villacampa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline