foobara 0.0.90 → 0.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aef9e716ddfe89cbe85867f6bb5a0af642b3af7e1dab9fb502116380eb4e44e
-  data.tar.gz: 80f58463fdbc26ee8bdf90cfe56eeca95ecb56dd2d8fb8c4d4014a12d9f98d55
+  metadata.gz: afa85ac4f9b3b8a144859108c7d4273fc290449bcf831cc6a3ff6c9445530f10
+  data.tar.gz: 918c40b8fd082cc4982d984716b7f7e0fbaac6f2110d445bc248d4985dfa2726
 SHA512:
-  metadata.gz: 12a9d4519ac42c3b159b35260e768b67cfafe7811a83d3027ec7f7e278306a48ae5e4185b5416f94b915d1ea4b6dc4f65c1056b7a5c12c229f00d807436b3188
-  data.tar.gz: 1cb99a0a5e64de8585e578d50845118ffd817abcceafc37d04aeb9b892aebc74c11737560d8adb3656af4ed912dbc27aa3cc762888673114f6018068da1a43cc
+  metadata.gz: 2aca63aa3477913c4289896d64b62a53065951da6d7c24982fa7ec8569a97bfc490320ffa002a1f219b97ee205dc2230bd3c5a66def92932da42df133a600ced
+  data.tar.gz: 26546b93d55db31c3c88a322dcc1cd472ab2be4392b8410f1a1206a25f060f86b3be2db2628d2cf3897c0b461844acff52bd063a299ab917c0c05c22119cb4ac

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# [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

data/projects/command/src/transformed_command.rb

@@ -180,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
@@ -188,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|
@@ -243,8 +251,25 @@ module Foobara
         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_for_manifest&.reference_or_declaration_data,
             result_type: result_type_for_manifest&.reference_or_declaration_data(remove_sensitive:),
@@ -258,7 +283,7 @@ module Foobara
             response_mutators:,
             request_mutators:,
             requires_authentication:,
-            authenticator: authenticator&.manifest
+            authenticator: authenticator_manifest
           )
         )
       end
@@ -394,7 +419,6 @@ module Foobara
                      to: :class
 
     def run
-      authenticate if requires_authentication?
       apply_allowed_rule
       apply_pre_commit_transformers
       run_command
@@ -482,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.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/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.90
+  version: 0.0.91
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal