lib/runtime/workflow.rb in factor-0.6.5 vs lib/runtime/workflow.rb in factor-0.6.6

@@ -71,11 +71,11 @@
             success "Listener '#{address}' started"
           end
 
           caller.on :start_workflow do |data|
             success "Listener '#{address}' triggered"
-            block.call(Factor::Common.simple_object_convert(data['payload']))
+            block.call(Factor::Common.simple_object_convert(data)) if block
           end
 
           caller.on :fail do |info|
             error "Listener '#{address}' failed"
             e.fail_block.call(action_response) if e.fail_block
@@ -83,11 +83,12 @@
 
           caller.on :log do |log_info|
             @logger.log log_info[:status], log_info
           end
 
-          caller.listen(address.id,params)
+          service_credentials = @credentials[address.service.to_sym] || {}
+          caller.listen(address.id,params.merge(service_credentials))
         end
         e
       end
 
       def workflow(service_ref, &block)
@@ -126,27 +127,27 @@
           end
 
           caller.on :return do |data|
             success "Action '#{address}' responded"
             caller.close
-            block.call(Factor::Common.simple_object_convert(data['payload']))
+            block.call(Factor::Common.simple_object_convert(data)) if block
           end
 
           caller.on :close do
             error "Action '#{address}' disconnected"
-            e.fail_block.call(action_response) if e.fail_block
           end
 
           caller.on :fail do |info|
             error "Action '#{address}' failed"
-            e.fail_block.call(action_response) if e.fail_block
+            e.fail_block.call(info) if e.fail_block
           end
 
           caller.on :log do |log_info|
             @logger.log log_info[:status], log_info
           end
 
-          caller.action(address.id,params)
+          service_credentials = @credentials[address.service.to_sym] || {}
+          caller.action(address.id,params.merge(service_credentials))
         end
         e
       end
 
       def success(message)