Merge pull request #45 from dreamfactorysoftware/fix-hardcoded-event_…

…script Wrap hardcoded event_script parts in respective if statement
dreamfactorysoftware · Jul 18, 2019 · f25c94f · f25c94f
2 parents fc9e8ae + a57b94d
commit f25c94f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/Components/Package/Exporter.php b/src/Components/Package/Exporter.php
@@ -186,14 +186,18 @@ public function getManifestOnly($systemOnly = false, $fullTree = false)
         $this->data['system']['cors'] = $this->getAllResources('system', 'cors', ['fields' => 'id,path']);
         $this->data['system']['email_template'] = $this->getAllResources('system', 'email_template',
             ['fields' => 'id,name']);
-        $this->data['system']['event_script'] = $this->getAllResources('system', 'event_script', ['fields' => 'name']);
         $this->data['system']['lookup'] = $this->getAllResources('system', 'lookup', ['fields' => 'id,name']);
 
         /* Check for paid limits class */
         if (class_exists(\DreamFactory\Core\Limit\ServiceProvider::class)) {
             $this->data['system']['limit'] = $this->getAllResources('system', 'limit', ['fields' => 'id,name']);
         }
 
+        /* Check for paid event_script class */
+        if (class_exists(\DreamFactory\Core\Script\ServiceProvider::class)) {
+            $this->data['system']['event_script'] = $this->getAllResources('system', 'event_script', ['fields' => 'name']);
+        }
+
         $manifest = $this->package->getManifestHeader();
         $this->getAllowedSystemResources($manifest);
 

diff --git a/src/Components/Package/Importer.php b/src/Components/Package/Importer.php
@@ -767,14 +767,17 @@ protected function insertDbTableResources($service)
      */
     protected function insertEventScripts()
     {
-        if (empty($data = $this->package->getResourceFromZip('system/event_script.json'))) {
-            // pre-2.3.0 version
-            $data = $this->package->getResourceFromZip('system/event.json');
-        }
-        $scripts = $this->cleanDuplicates($data, 'system', 'event_script');
+        try {
 
-        if (!empty($scripts)) {
-            try {
+            if (class_exists(\DreamFactory\Core\Script\ServiceProvider::class)) throw new ForbiddenException('Upgrade to a paid license to import event scripts.');
+
+            if (empty($data = $this->package->getResourceFromZip('system/event_script.json'))) {
+                // pre-2.3.0 version
+                $data = $this->package->getResourceFromZip('system/event.json');
+            }
+            $scripts = $this->cleanDuplicates($data, 'system', 'event_script');
+
+            if (!empty($scripts)) {
                 foreach ($scripts as $script) {
                     $name = array_get($script, 'name');
                     $this->fixCommonFields($script);
@@ -786,9 +789,9 @@ protected function insertEventScripts()
                         throw ResponseFactory::createExceptionFromResponse($result);
                     }
                 }
-
                 return true;
-            } catch (\Exception $e) {
+            }
+        } catch (\Exception $e) {
 //                if ($e->getCode() === HttpStatusCodes::HTTP_FORBIDDEN) {
 //                    $this->log('error', 'Failed to insert event_script. ' . $this->getErrorDetails($e));
 //                } else {
@@ -797,8 +800,7 @@ protected function insertEventScripts()
 //                        $this->getErrorDetails($e)
 //                    );
 //                }
-                $this->throwExceptions($e, 'Failed to insert event_script');
-            }
+            $this->throwExceptions($e, 'Failed to insert event_script');
         }
 
         return false;