DF-1254 #resolve #comment Allow setting response headers from output of script or external call from within scripting

Author: Lee Hicks

CHANGELOG.md

@@ -3,8 +3,11 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- DF-1254 Allow setting response headers in all cases
 ### Changed
 - DF-1226 Remove deprecated v8js extension methods
+- Use new df-system repository
 
 ## [0.7.0] - 2017-11-03
 ### Changed

composer.json

@@ -25,7 +25,8 @@
     }
   ],
   "require":     {
-    "dreamfactory/df-core": "~0.13.0"
+    "dreamfactory/df-core":   "~0.13.0",
+    "dreamfactory/df-system": "~0.1.0"
   },
   "autoload":    {
     "psr-4": {
@@ -36,7 +37,7 @@
     "branch-alias": {
       "dev-develop": "0.7.x-dev"
     },
-    "laravel": {
+    "laravel":      {
       "providers": [
         "DreamFactory\\Core\\Script\\ServiceProvider"
       ]

src/Components/BaseEngineAdapter.php

@@ -367,7 +367,14 @@ protected static function externalRequest($method, $url, $payload = [], $curlOpt
             throw new RestException($status, $result, $status);
         }
 
-        return ResponseFactory::create($result, $contentType, $status);
+        $resultHeaders = Curl::getLastResponseHeaders();
+        if ('chunked' === array_get(array_change_key_case($resultHeaders, CASE_LOWER), 'transfer-encoding')) {
+            // don't relay this header through to client as it isn't handled well in some cases
+            unset($resultHeaders['Transfer-Encoding']); // normal header case
+            unset($resultHeaders['transfer-encoding']); // Restlet has all lower for this header
+        }
+
+        return ResponseFactory::create($result, $contentType, $status, $resultHeaders);
     }
 
     /**

src/Handlers/Events/ScriptableEventHandler.php

@@ -10,13 +10,13 @@
 use DreamFactory\Core\Events\PostProcessApiEvent;
 use DreamFactory\Core\Events\PreProcessApiEvent;
 use DreamFactory\Core\Events\ServiceEvent;
-use DreamFactory\Core\Resources\System\Cache;
 use DreamFactory\Core\Script\Components\ScriptHandler;
 use DreamFactory\Core\Script\Events\BaseEventScriptEvent;
 use DreamFactory\Core\Script\Events\EventScriptDeletedEvent;
 use DreamFactory\Core\Script\Events\EventScriptModifiedEvent;
 use DreamFactory\Core\Script\Jobs\ServiceEventScriptJob;
 use DreamFactory\Core\Script\Models\EventScript;
+use DreamFactory\Core\System\Resources\Cache;
 use DreamFactory\Core\Utility\ResponseFactory;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -83,8 +83,9 @@ public function handleApiEvent($event)
                                 $content = array_get($response, 'content');
                                 $contentType = array_get($response, 'content_type');
                                 $status = array_get($response, 'status_code', HttpStatusCodeInterface::HTTP_OK);
+                                $headers = (array)array_get($response, 'headers');
 
-                                $event->response = ResponseFactory::create($content, $contentType, $status);
+                                $event->response = ResponseFactory::create($content, $contentType, $status, $headers);
                             } else {
                                 // otherwise assume raw content
                                 $event->response = ResponseFactory::create($response);

src/Jobs/ServiceEventScriptJob.php

@@ -4,8 +4,8 @@
 
 use Crypt;
 use DreamFactory\Core\Events\ServiceEvent;
-use DreamFactory\Core\Resources\System\Cache;
 use DreamFactory\Core\Script\Models\EventScript;
+use DreamFactory\Core\System\Resources\Cache;
 use Log;
 use Session;
 

src/Resources/System/EventScript.php

@@ -7,7 +7,7 @@
 use DreamFactory\Core\Exceptions\BadRequestException;
 use DreamFactory\Core\Exceptions\BatchException;
 use DreamFactory\Core\Exceptions\InternalServerErrorException;
-use DreamFactory\Core\Resources\System\BaseSystemResource;
+use DreamFactory\Core\System\Resources\BaseSystemResource;
 use DreamFactory\Core\Script\Models\EventScript as EventScriptModel;
 use DreamFactory\Core\Utility\ResourcesWrapper;
 use DreamFactory\Core\Utility\ResponseFactory;

src/Resources/System/ScriptType.php

@@ -2,7 +2,7 @@
 
 namespace DreamFactory\Core\Script\Resources\System;
 
-use DreamFactory\Core\Resources\System\ReadOnlySystemResource;
+use DreamFactory\Core\System\Resources\ReadOnlySystemResource;
 use DreamFactory\Core\Script\Contracts\ScriptEngineTypeInterface;
 use DreamFactory\Core\Exceptions\NotFoundException;
 use DreamFactory\Core\Utility\ResourcesWrapper;

src/ServiceProvider.php

@@ -3,8 +3,8 @@
 
 use DreamFactory\Core\Enums\ServiceTypeGroups;
 use DreamFactory\Core\Models\SystemTableModelMapper;
-use DreamFactory\Core\Resources\System\SystemResourceManager;
-use DreamFactory\Core\Resources\System\SystemResourceType;
+use DreamFactory\Core\System\Components\SystemResourceManager;
+use DreamFactory\Core\System\Components\SystemResourceType;
 use DreamFactory\Core\Script\Components\ScriptEngineManager;
 use DreamFactory\Core\Script\Facades\ScriptEngineManager as ScriptEngineManagerFacade;
 use DreamFactory\Core\Script\Handlers\Events\ScriptableEventHandler;

src/Services/Script.php

@@ -220,8 +220,9 @@ protected function processRequest()
             $content = array_get($result, 'content');
             $contentType = array_get($result, 'content_type');
             $status = array_get($result, 'status_code', HttpStatusCodeInterface::HTTP_OK);
+            $headers = (array)array_get($result, 'headers');
 
-            return ResponseFactory::create($content, $contentType, $status);
+            return ResponseFactory::create($content, $contentType, $status, $headers);
         }
 
         // otherwise assume raw content