spaceship/lib/spaceship/connect_api/token.rb in fastlane-2.156.1 vs spaceship/lib/spaceship/connect_api/token.rb in fastlane-2.157.0

@@ -14,39 +14,80 @@
       MAX_TOKEN_DURATION = 1200
 
       attr_reader :key_id
       attr_reader :issuer_id
       attr_reader :text
+      attr_reader :duration
+      attr_reader :expiration
 
-      def self.create(key_id: nil, issuer_id: nil, filepath: nil)
+      # Temporary attribute not needed to create the JWT text
+      # There is no way to determine if the team associated with this
+      # key is for App Store or Enterprise so this is the temporary workaround
+      attr_accessor :in_house
+
+      def self.from_json_file(filepath)
+        json = JSON.parse(File.read(filepath), { symbolize_names: true })
+
+        missing_keys = []
+        missing_keys << 'key_id' unless json.key?(:key_id)
+        missing_keys << 'issuer_id' unless json.key?(:issuer_id)
+        missing_keys << 'key' unless json.key?(:key)
+
+        unless missing_keys.empty?
+          raise "App Store Connect API key JSON is missing field(s): #{missing_keys.join(', ')}"
+        end
+
+        self.create(json)
+      end
+
+      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, duration: nil, in_house: nil)
         key_id ||= ENV['SPACESHIP_CONNECT_API_KEY_ID']
         issuer_id ||= ENV['SPACESHIP_CONNECT_API_ISSUER_ID']
         filepath ||= ENV['SPACESHIP_CONNECT_API_KEY_FILEPATH']
+        duration ||= ENV['SPACESHIP_CONNECT_API_TOKEN_DURATION']
 
+        in_house_env = ENV['SPACESHIP_CONNECT_API_IN_HOUSE']
+        in_house ||= !["", "no", "false", "off", "0"].include?(in_house_env) if in_house_env
+
+        key ||= ENV['SPACESHIP_CONNECT_API_KEY']
+        key ||= File.binread(filepath)
+
         self.new(
           key_id: key_id,
           issuer_id: issuer_id,
-          key: OpenSSL::PKey::EC.new(File.read(filepath))
+          key: OpenSSL::PKey::EC.new(key),
+          duration: duration,
+          in_house: in_house
         )
       end
 
-      def initialize(key_id: nil, issuer_id: nil, key: nil)
-        @expiration = Time.now + MAX_TOKEN_DURATION
+      def initialize(key_id: nil, issuer_id: nil, key: nil, duration: nil, in_house: nil)
         @key_id = key_id
         @key = key
         @issuer_id = issuer_id
+        @duration = duration
+        @in_house = in_house
 
+        @duration ||= MAX_TOKEN_DURATION
+        @duration = @duration.to_i if @duration
+
+        refresh!
+      end
+
+      def refresh!
+        @expiration = Time.now + @duration
+
         header = {
           kid: key_id
         }
 
         payload = {
           iss: issuer_id,
           exp: @expiration.to_i,
           aud: 'appstoreconnect-v1'
         }
 
-        @text = JWT.encode(payload, key, 'ES256', header)
+        @text = JWT.encode(payload, @key, 'ES256', header)
       end
 
       def expired?
         @expiration < Time.now
       end