event_store_client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098a9968e45cc7aa2d8374d48658a354f9d43b6338555b115718fb89aa1288a8'
-  data.tar.gz: cedd89ced40f1a571f12e841fd5266fc83e05e73a087a0135b74d27f6d8621eb
+  metadata.gz: 0bce23a0e16ce5f374964b63c3479adb7e55236465285c6dc73c9545e6507807
+  data.tar.gz: caac13b0506eb0323597db08303e604527475b11476b4af877f8ff6381f076eb
 SHA512:
-  metadata.gz: 12eac04fd6a932acbf7573edbcec9a8aa8d8deb85b91ea5a8de572e4976d1964f0791e71749f2157095be60c0d0e7e7a6ace270fdbccb3dc6eeef565b25cc5d0
-  data.tar.gz: 42579bd365d172bc63ae7bc10ff7c2e9543de5e7d69e29e3ef6d773f2cf5f595717fbdc4049d683ea5f90a6ba531cc3ec45c2533b0b4addd662c1c3c626a5c72
+  metadata.gz: 6d0c69349edd547872c656264c97f397edea084420ed492cd30ce7223961a6649894ba84eb9a2cc97828dc06805c30256f6f3f7346965bbdbf483447106e8a2d
+  data.tar.gz: 454e278dc1c5f1fd95f81d65dab0970fff87317ea8468e0da440ffc8903b85c2640c84d7b37429e133aab23d71f1d19688f8f4c332b21282a4e0163f2b79769a

data/lib/event_store_client/adapters/grpc/commands/persistent_subscriptions/read.rb

@@ -38,16 +38,17 @@ module EventStoreClient
 
             requests = [request.new(options: opts)] # please notice that it's an array. Should be?
 
+            skip_decryption = options[:skip_decryption] || false
             service.read(requests, metadata: metadata).each do |res|
               next if res.subscription_confirmation
-              yield deserialize_event(res.event.event) if block_given?
+              yield deserialize_event(res.event.event, skip_decryption: skip_decryption) if block_given?
             end
             Success()
           end
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             id = entry.id.string
             id = SecureRandom.uuid if id.nil? || id.empty?
 
@@ -65,7 +66,8 @@ module EventStoreClient
                 type: entry.metadata['type'],
                 data: data,
                 metadata: metadata
-              )
+              ),
+              skip_decryption: skip_decryption
             )
           end
         end

data/lib/event_store_client/adapters/grpc/commands/streams/read.rb

@@ -43,10 +43,10 @@ module EventStoreClient
               opts[:stream][:revision] = options[:start]
             end
 
+            skip_decryption = options[:skip_decryption] || false
             events = service.read(request.new(options: opts), metadata: metadata).map do |res|
               raise StreamNotFound if res.stream_not_found
-
-              deserialize_event(res.event.event)
+              deserialize_event(res.event.event, skip_decryption: skip_decryption)
             end
             Success(events)
           rescue StreamNotFound
@@ -55,7 +55,7 @@ module EventStoreClient
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             data = (entry.data.nil? || entry.data.empty?) ? '{}' : entry.data
 
             metadata =
@@ -71,7 +71,7 @@ module EventStoreClient
               metadata: metadata
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           end
         end
       end

data/lib/event_store_client/adapters/http/commands/persistent_subscriptions/read.rb

@@ -28,16 +28,19 @@ module EventStoreClient
 
             ack_info = body['links'].find { |link| link['relation'] == 'ackAll' }
             return { events: [] } unless ack_info
+
+            skip_decryption = options[:skip_decryption] || false
             body['entries'].map do |entry|
-              yield deserialize_event(entry)
+              yield deserialize_event(entry, skip_decryption: skip_decryption)
             end
+
             Ack.new(connection).call(ack_info['uri'])
             Success()
           end
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             event = EventStoreClient::Event.new(
               id: entry['eventId'],
               title: entry['title'],
@@ -46,7 +49,7 @@ module EventStoreClient
               metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           rescue EventStoreClient::DeserializedEvent::InvalidDataError
             event
           end

data/lib/event_store_client/adapters/http/commands/streams/read.rb

@@ -23,8 +23,9 @@ module EventStoreClient
 
             return Failure(:stream_not_found) unless response.success? || response.status == 404
             return Failure(:connection_failed) if response.body.nil? || response.body.empty?
+            skip_decryption = options[:skip_decryption] || false
             entries = JSON.parse(response.body)['entries'].map do |entry|
-              deserialize_event(entry)
+              deserialize_event(entry, skip_decryption: skip_decryption)
             end.reverse
             Success(entries)
           rescue Faraday::ConnectionFailed
@@ -33,7 +34,7 @@ module EventStoreClient
 
           private
 
-          def deserialize_event(entry)
+          def deserialize_event(entry, skip_decryption: false)
             event = EventStoreClient::Event.new(
               id: entry['eventId'],
               title: entry['title'],
@@ -42,7 +43,7 @@ module EventStoreClient
               metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
             )
 
-            config.mapper.deserialize(event)
+            config.mapper.deserialize(event, skip_decryption: skip_decryption)
           end
         end
       end

data/lib/event_store_client/adapters/in_memory.rb

@@ -46,8 +46,9 @@ module EventStoreClient
       res = Response.new(response.to_json, 200)
 
       return [] if res.body.nil? || res.body.empty?
+      skip_decryption = options[:skip_decryption] || false
       events = JSON.parse(res.body)['entries'].map do |entry|
-        deserialize_event(entry)
+        deserialize_event(entry, skip_decryption: skip_decryption)
       end.reverse
       Dry::Monads::Success(events)
     end
@@ -127,7 +128,7 @@ module EventStoreClient
       end
     end
 
-    def deserialize_event(entry)
+    def deserialize_event(entry, skip_decryption: false)
       event = EventStoreClient::Event.new(
         id: entry['eventId'],
         title: entry['title'],
@@ -136,7 +137,7 @@ module EventStoreClient
         metadata: entry['isMetaData'] ? entry['metaData'] : '{}'
       )
 
-      mapper.deserialize(event)
+      mapper.deserialize(event, skip_decryption: skip_decryption)
     end
   end
 end

data/lib/event_store_client/data_decryptor.rb

@@ -9,28 +9,28 @@ module EventStoreClient
     KeyNotFoundError = Class.new(StandardError)
 
     def call
-      return decrypted_data if encryption_metadata.empty?
+      return encrypted_data if encryption_metadata.empty?
 
       decrypt_attributes(
         key: find_key(encryption_metadata['key']),
-        data: decrypted_data,
+        data: encrypted_data,
         attributes: encryption_metadata['attributes']
       )
     end
 
-    attr_reader :decrypted_data, :encryption_metadata
-
     private
 
-    attr_reader :key_repository
+    attr_reader :key_repository, :encryption_metadata, :encrypted_data
 
     def initialize(data:, schema:, repository:)
-      @decrypted_data = deep_dup(data).transform_keys!(&:to_s)
+      @encrypted_data = deep_dup(data).transform_keys!(&:to_s)
       @key_repository = repository
       @encryption_metadata = schema&.transform_keys(&:to_s) || {}
     end
 
     def decrypt_attributes(key:, data:, attributes: {}) # rubocop:disable Lint/UnusedMethodArgument
+      return data unless key
+
       res = key_repository.decrypt(key: key, message: data['es_encrypted'])
       return data if res.failure?
 
@@ -42,6 +42,7 @@ module EventStoreClient
     end
 
     def deep_dup(hash)
+      return hash unless hash.instance_of?(Hash)
       dupl = hash.dup
       dupl.each { |k, v| dupl[k] = v.instance_of?(Hash) ? deep_dup(v) : v }
       dupl
@@ -53,8 +54,8 @@ module EventStoreClient
           key_repository.find(identifier).value!
         rescue StandardError => e
           config.error_handler&.call(e)
+          nil
         end
-      raise KeyNotFoundError unless key
 
       key
     end

data/lib/event_store_client/mapper/default.rb

@@ -12,7 +12,7 @@ module EventStoreClient
         )
       end
 
-      def deserialize(event)
+      def deserialize(event, **)
         metadata = serializer.deserialize(event.metadata)
         data = serializer.deserialize(event.data)
 

data/lib/event_store_client/mapper/encrypted.rb

@@ -49,14 +49,20 @@ module EventStoreClient
       #   which key should be used as an identifier.
       # *Returns*: Specific event class with all data decrypted
 
-      def deserialize(event)
+      def deserialize(event, skip_decryption: false)
         metadata = serializer.deserialize(event.metadata)
         encryption_schema = serializer.deserialize(event.metadata)['encryption']
-        decrypted_data = EventStoreClient::DataDecryptor.new(
-          data: serializer.deserialize(event.data),
-          schema: encryption_schema,
-          repository: key_repository
-        ).call
+
+        decrypted_data =
+          if skip_decryption
+            serializer.deserialize(event.data)
+          else
+            EventStoreClient::DataDecryptor.new(
+              data: serializer.deserialize(event.data),
+              schema: encryption_schema,
+              repository: key_repository
+            ).call
+          end
 
         event_class =
           begin

data/lib/event_store_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreClient
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: event_store_client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sebastian Wilgosz
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2021-06-07 00:00:00.000000000 Z
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.8
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +247,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +262,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Ruby integration for https://eventstore.org
 test_files: []