Cleanup use of checkServicePermission

Author: Lee Hicks

src/Components/BaseEngineAdapter.php

@@ -1,19 +1,18 @@
 <?php
 namespace DreamFactory\Core\Script\Components;
 
+use Cache;
+use Config;
 use DreamFactory\Core\Components\ExceptionResponse;
 use DreamFactory\Core\Script\Contracts\ScriptingEngineInterface;
 use DreamFactory\Core\Enums\DataFormats;
-use DreamFactory\Core\Enums\ServiceRequestorTypes;
 use DreamFactory\Core\Script\Exceptions\ScriptException;
 use DreamFactory\Core\Exceptions\RestException;
 use DreamFactory\Core\Exceptions\ServiceUnavailableException;
 use DreamFactory\Core\Utility\ResponseFactory;
 use DreamFactory\Core\Utility\Session;
 use DreamFactory\Core\Utility\Curl;
 use DreamFactory\Core\Enums\Verbs;
-use Cache;
-use Config;
 use Illuminate\Support\Arr;
 use ServiceManager;
 
@@ -53,7 +52,6 @@ abstract class BaseEngineAdapter implements ScriptingEngineInterface
     /**
      * @param array $settings
      *
-     * @throws ServiceUnavailableException
      */
     public function __construct(array $settings = [])
     {
@@ -65,6 +63,7 @@ public function __construct(array $settings = [])
      * @param array $options
      *
      * @return void
+     * @throws ServiceUnavailableException
      */
     public static function startup($options = null)
     {
@@ -115,7 +114,6 @@ abstract public function executeString($path, $identifier, array &$data = [], ar
      *
      * @return array
      * @throws ScriptException
-     * @throws ServiceUnavailableException
      */
     public function runScript(
         $script,
@@ -167,9 +165,6 @@ public function runScript(
      */
     public static function loadScript($name, $path = null, $returnContents = true)
     {
-        if ($path) {
-            // no longer support file paths for scripts?
-        }
         //  Already read, return script
         if (null !== ($script = array_get(static::$libraries, $name))) {
             return $returnContents ? file_get_contents($script) : $script;
@@ -178,8 +173,8 @@ public static function loadScript($name, $path = null, $returnContents = true)
         $script = ltrim($script, ' /');
 
         //  Spin through paths and look for the script
-        foreach (static::$libraryPaths as $path) {
-            $check = $path . '/' . $script;
+        foreach (static::$libraryPaths as $libPath) {
+            $check = $libPath . '/' . $script;
 
             if (is_file($check) && is_readable($check)) {
                 array_set(static::$libraries, $name, $check);
@@ -188,13 +183,20 @@ public static function loadScript($name, $path = null, $returnContents = true)
             }
         }
 
+        if ($path) {
+            if (is_file($path) && is_readable($path)) {
+                array_set(static::$libraries, $name, $path);
+
+                return $returnContents ? file_get_contents($path) : $path;
+            }
+        }
+
         return false;
     }
 
     /**
      * @param array $libraryPaths
      *
-     * @throws ServiceUnavailableException
      */
     protected static function initializeLibraryPaths($libraryPaths = null)
     {
@@ -384,6 +386,7 @@ protected static function externalRequest($method, $url, $payload = [], $curlOpt
      * @param array  $curlOptions Additional CURL options for external requests
      *
      * @return array
+     * @throws \DreamFactory\Core\Exceptions\BadRequestException
      */
     public static function inlineRequest($method, $path, $payload = null, $curlOptions = [])
     {
@@ -440,14 +443,11 @@ public static function inlineRequest($method, $path, $payload = null, $curlOptio
                     $format = DataFormats::TEXT;
                 }
 
-                Session::checkServicePermission($method, $serviceName, $resource, ServiceRequestorTypes::SCRIPT);
-
                 $request = new ScriptServiceRequest($method, $params, $headers);
                 $request->setContent($payload, $format);
 
                 //  Now set the request object and go...
-                $service = ServiceManager::getService($serviceName);
-                $result = $service->handleRequest($request, $resource);
+                $result = ServiceManager::handleServiceRequest($request, $serviceName, $resource);
             }
         } catch (\Exception $ex) {
             $result = static::exceptionToServiceResponse($ex);

src/Engines/ExecutedEngine.php

@@ -92,6 +92,7 @@ public function executeString($script, $identifier, array &$data = [], array $en
      * @param array  $engineArguments An array of arguments to pass when executing the string
      *
      * @return mixed
+     * @throws InternalServerErrorException
      */
     public function executeScript($path, $identifier, array &$data = [], array $engineArguments = [])
     {