foobara 0.0.89 → 0.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424a065d4e4a0543f55ac9c3b7c0c87db4a5f334241c5b8e5a46b44a45907a55
-  data.tar.gz: ec082f769eaae6bc5f9b4dd079722b044e417243ad1cf0cabcf0c21b9648efa6
+  metadata.gz: afa85ac4f9b3b8a144859108c7d4273fc290449bcf831cc6a3ff6c9445530f10
+  data.tar.gz: 918c40b8fd082cc4982d984716b7f7e0fbaac6f2110d445bc248d4985dfa2726
 SHA512:
-  metadata.gz: 5b6b51362c480c26f1690c17874607a2bcf34d14b6d3882665798efe6511e3fc2f602214cae1b005dd788cf23f33a68a4c1781b631108248e2bb1baca0ed0204
-  data.tar.gz: 2e910c95484b092eb2bfdef1eeed079f99794801a3bb345efc0291f51ca1b832301f3540e454b0bd749d9028b591bbc3b919a0301d03db965e576644c9c72284
+  metadata.gz: 2aca63aa3477913c4289896d64b62a53065951da6d7c24982fa7ec8569a97bfc490320ffa002a1f219b97ee205dc2230bd3c5a66def92932da42df133a600ced
+  data.tar.gz: 26546b93d55db31c3c88a322dcc1cd472ab2be4392b8410f1a1206a25f060f86b3be2db2628d2cf3897c0b461844acff52bd063a299ab917c0c05c22119cb4ac

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [0.0.91] - 2025-03-31
+
+- Fix bug that was including removed types in command manifest's inputs_types_depended_on
+- Hoist authentication check up into command connector further from transformed command
+
+# [0.0.90] - 2025-03-29
+
+- Implement request mutator concept
+
 # [0.0.89] - 2025-03-29
 
 - Make attributes transformers work with either a from type or a to type

data/projects/command/src/transformed_command.rb

@@ -17,6 +17,7 @@ module Foobara
                     # On exposed command? On the command registry? On the command connector?
                     # This is the easiest place to implement them but feels awkward.
                     :response_mutators,
+                    :request_mutators,
                     :allowed_rule,
                     :requires_authentication,
                     :authenticator
@@ -32,6 +33,7 @@ module Foobara
         pre_commit_transformers:,
         serializers:,
         response_mutators:,
+        request_mutators:,
         allowed_rule:,
         requires_authentication:,
         authenticator:,
@@ -64,6 +66,7 @@ module Foobara
           klass.pre_commit_transformers = Util.array(pre_commit_transformers)
           klass.serializers = Util.array(serializers)
           klass.response_mutators = Util.array(response_mutators)
+          klass.request_mutators = Util.array(request_mutators)
           klass.allowed_rule = allowed_rule
           klass.requires_authentication = requires_authentication
           klass.authenticator = authenticator
@@ -126,6 +129,18 @@ module Foobara
         @result_type_for_manifest = mutated_result_type
       end
 
+      def inputs_type_for_manifest
+        return @inputs_type_for_manifest if defined?(@inputs_type_for_manifest)
+
+        mutated_inputs_type = inputs_type
+
+        request_mutators&.each do |mutator|
+          mutated_inputs_type = mutator.instance.inputs_type_from(mutated_inputs_type)
+        end
+
+        @inputs_type_for_manifest = mutated_inputs_type
+      end
+
       def error_context_type_map
         @error_context_type_map ||= begin
           set = {}
@@ -165,6 +180,14 @@ module Foobara
         end.sort.to_h
       end
 
+      def inputs_types_depended_on
+        inputs_type&.types_depended_on || []
+      end
+
+      def result_types_depended_on(remove_sensitive: true)
+        result_type&.types_depended_on(remove_sensitive:) || []
+      end
+
       def types_depended_on(remove_sensitive: true)
         # TODO: memoize this
         # TODO: this should not delegate to command since transformers are in play
@@ -173,29 +196,29 @@ module Foobara
         type = inputs_type
 
         if type != command_class.inputs_type
-          types |= if type.registered?
-                     # TODO: if we ever change from attributes-only inputs type
-                     # then this will be handy
-                     # :nocov:
-                     [type]
-                     # :nocov:
-                   else
-                     type.types_depended_on(remove_sensitive:)
-                   end
+          if type.registered?
+            # TODO: if we ever change from attributes-only inputs type
+            # then this will be handy
+            # :nocov:
+            types |= [type]
+            # :nocov:
+          end
+
+          types |= type.types_depended_on
         end
 
         type = result_type
 
         if type != command_class.result_type
-          types |= if type.registered?
-                     # TODO: if we ever change from attributes-only inputs type
-                     # then this will be handy
-                     # :nocov:
-                     [type]
-                     # :nocov:
-                   else
-                     type.types_depended_on(remove_sensitive:)
-                   end
+          if type.registered?
+            # TODO: if we ever change from attributes-only inputs type
+            # then this will be handy
+            # :nocov:
+            types |= [type]
+            # :nocov:
+          end
+
+          types |= type.types_depended_on(remove_sensitive:)
         end
 
         possible_errors.each do |possible_error|
@@ -226,11 +249,29 @@ module Foobara
         end
 
         response_mutators = self.response_mutators.map { |t| t.foobara_manifest(to_include:) }
+        request_mutators = self.request_mutators.map { |t| t.foobara_manifest(to_include:) }
+
+        authenticator_manifest = if authenticator
+                                   if authenticator.respond_to?(:foobara_manifest)
+                                     # TODO: test this path
+                                     # :nocov:
+                                     authenticator.foobara_manifest(to_include:)
+                                     # :nocov:
+                                   else
+                                     true
+                                   end
+                                 end
+
+        inputs_types_depended_on = self.inputs_types_depended_on.map(&:foobara_manifest_reference).sort
+        result_types_depended_on = self.result_types_depended_on(remove_sensitive:).map(&:foobara_manifest_reference)
+        result_types_depended_on = result_types_depended_on.sort
 
         command_class.foobara_manifest(to_include:, remove_sensitive:).merge(
           Util.remove_blank(
+            inputs_types_depended_on:,
+            result_types_depended_on:,
             types_depended_on: types,
-            inputs_type: inputs_type&.reference_or_declaration_data,
+            inputs_type: inputs_type_for_manifest&.reference_or_declaration_data,
             result_type: result_type_for_manifest&.reference_or_declaration_data(remove_sensitive:),
             possible_errors: possible_errors_manifest(to_include:, remove_sensitive:),
             capture_unknown_error:,
@@ -240,8 +281,9 @@ module Foobara
             pre_commit_transformers:,
             serializers:,
             response_mutators:,
+            request_mutators:,
             requires_authentication:,
-            authenticator: authenticator&.manifest
+            authenticator: authenticator_manifest
           )
         )
       end
@@ -285,6 +327,29 @@ module Foobara
         end
       end
 
+      def request_mutator
+        return @request_mutator if defined?(@request_mutator)
+
+        if request_mutators.empty?
+          @request_mutator = nil
+          return
+        end
+
+        @request_mutator = begin
+          transformers = transformers_to_processors(request_mutators, result_type, direction: :to)
+
+          if transformers.size == 1
+            transformers.first
+          else
+            Value::Processor::Pipeline.new(processors: transformers)
+          end
+        end
+      end
+
+      def mutate_request(request)
+        request_mutator&.process_value!(request)
+      end
+
       def result_transformer
         return @result_transformer if defined?(@result_transformer)
 
@@ -354,7 +419,6 @@ module Foobara
                      to: :class
 
     def run
-      authenticate if requires_authentication?
       apply_allowed_rule
       apply_pre_commit_transformers
       run_command
@@ -442,19 +506,6 @@ module Foobara
       self.command = command_class.new(transformed_inputs)
     end
 
-    def authenticate
-      command.after_load_records do |command:, **|
-        self.authenticated_user = instance_eval(&:authenticator)
-
-        unless authenticated_user
-          self.outcome = Outcome.error(CommandConnector::UnauthenticatedError.new)
-
-          command.state_machine.error!
-          command.halt!
-        end
-      end
-    end
-
     def apply_allowed_rule
       rule = allowed_rule
 

data/projects/command_connectors/src/command_connector/request.rb

@@ -4,8 +4,7 @@ module Foobara
       include TruncatedInspect
 
       # TODO: this feels like a smell of some sort...
-      attr_accessor :command_class,
-                    :command,
+      attr_accessor :command,
                     :error,
                     :command_connector,
                     :serializers,
@@ -13,6 +12,8 @@ module Foobara
                     :full_command_name,
                     :action
 
+      attr_reader :command_class
+
       def initialize(**opts)
         valid_keys = %i[inputs full_command_name action]
 
@@ -29,6 +30,15 @@ module Foobara
         self.full_command_name = opts[:full_command_name] if opts.key?(:full_command_name)
       end
 
+      def command_class=(klass)
+        @command_class = klass
+
+        # TODO: we really need to revisit these interfaces. Something is wrong.
+        if command_class.respond_to?(:mutate_request)
+          command_class.mutate_request(self)
+        end
+      end
+
       def serializer
         return @serializer if defined?(@serializer)
 

data/projects/command_connectors/src/command_connector.rb

@@ -338,6 +338,10 @@ module Foobara
       # TODO: feels like a smell
       request.command_connector = self
 
+      if command.respond_to?(:requires_authentication?) && command.requires_authentication?
+        authenticate(request)
+      end
+
       if command
         command.run
         # :nocov:
@@ -349,6 +353,23 @@ module Foobara
       build_response(request)
     end
 
+    def authenticate(request)
+      request_command = request.command
+
+      request_command.after_load_records do |command:, **|
+        authenticated_user = request.instance_eval(&authenticator)
+
+        request_command.authenticated_user = authenticated_user
+
+        unless authenticated_user
+          request_command.outcome = Outcome.error(CommandConnector::UnauthenticatedError.new)
+
+          command.state_machine.error!
+          command.halt!
+        end
+      end
+    end
+
     def build_request_and_command(...)
       request = build_request(...)
 

data/projects/command_connectors/src/command_registry/exposed_command.rb

@@ -12,6 +12,7 @@ module Foobara
                     :errors_transformers,
                     :pre_commit_transformers,
                     :serializers,
+                    :request_mutators,
                     :response_mutators,
                     :allowed_rule,
                     :requires_authentication,
@@ -29,6 +30,7 @@ module Foobara
         errors_transformers: nil,
         pre_commit_transformers: nil,
         response_mutators: nil,
+        request_mutators: nil,
         serializers: nil,
         allowed_rule: nil,
         requires_authentication: nil,
@@ -79,6 +81,7 @@ module Foobara
         self.errors_transformers = errors_transformers
         self.pre_commit_transformers = pre_commit_transformers
         self.response_mutators = response_mutators
+        self.request_mutators = request_mutators
         self.serializers = serializers
         self.allowed_rule = allowed_rule
         self.requires_authentication = requires_authentication
@@ -115,6 +118,7 @@ module Foobara
             errors_transformers,
             pre_commit_transformers,
             response_mutators,
+            request_mutators,
             serializers,
             allowed_rule,
             requires_authentication,
@@ -135,6 +139,7 @@ module Foobara
                                            errors_transformers:,
                                            pre_commit_transformers:,
                                            response_mutators:,
+                                           request_mutators:,
                                            serializers:,
                                            allowed_rule:,
                                            requires_authentication:,

data/projects/command_connectors/src/request_mutator.rb

@@ -0,0 +1,24 @@
+module Foobara
+  module CommandConnectors
+    class RequestMutator < Foobara::Value::Mutator
+      def inputs_type_declaration_from(_inputs_type)
+        # :nocov:
+        raise "subclass responsibility"
+        # :nocov:
+      end
+
+      def inputs_type_from(inputs_type)
+        declaration = inputs_type_declaration_from(inputs_type)
+        Foobara::Domain.current.foobara_type_from_declaration(declaration)
+      end
+
+      def mutate
+        # :nocov:
+        raise "subclass responsibility"
+        # :nocov:
+      end
+
+      alias request declaration_data
+    end
+  end
+end

data/projects/manifest/src/foobara/manifest/command.rb

@@ -3,6 +3,10 @@ module Foobara
     class Command < BaseManifest
       self.category_symbol = :command
 
+      def requires_authentication?
+        !!self[:requires_authentication]
+      end
+
       def command_manifest
         relevant_manifest
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.91
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-29 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -179,6 +179,7 @@ files:
 - projects/command_connectors/src/command_registry/exposed_command.rb
 - projects/command_connectors/src/command_registry/exposed_domain.rb
 - projects/command_connectors/src/command_registry/exposed_organization.rb
+- projects/command_connectors/src/request_mutator.rb
 - projects/command_connectors/src/response_mutator.rb
 - projects/command_connectors/src/serializer.rb
 - projects/command_connectors/src/serializers/aggregate_serializer.rb