Moved secret to file table. Added "all" array to twig. Prepare for URL generation snippet.

Author: tonyklapatch

_bootstrap/index.php

@@ -107,8 +107,10 @@
 // Instruct Commerce to load modules from our directory, providing the base namespace and module path twice
 $commerce->loadModulesFromDirectory($modulePath, 'RogueClarity\\Digitalproduct\\Modules\\', $modulePath);
 
-$manager = $modx->getManager();
 $modx->addPackage('commerce_digitalproduct', $componentPath . '/core/components/commerce_digitalproduct/model/');
+$manager = $modx->getManager();
+$generator = $manager->getGenerator();
+$generator->parseSchema($componentPath . '/core/components/commerce_digitalproduct/model/schema/commerce_digitalproduct.mysql.schema.xml', $componentPath . '/core/components/commerce_digitalproduct/model/');
 $manager->createObjectContainer('Digitalproduct');
 $manager->createObjectContainer('DigitalproductFile');
 

_build/data/settings.php

@@ -8,5 +8,9 @@
     'expiration_times' => [
         'area' => 'general',
         'value' => '1 day==+1 day||1 week==+1 week||1 month==+1 month||Never=='
+    ],
+    'download_method' => [
+        'area' => 'general',
+        'value' => 'redirect'
     ]
 ];

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproduct.class.php

@@ -1,5 +1,4 @@
 <?php
-require_once strtr(realpath(dirname(dirname(__FILE__))), '\\', '/') . '/digitalproduct.class.php';
 /**
  * Digitalproduct for Commerce.
  *
@@ -10,7 +9,5 @@
  * @package commerce_digitalproduct
  * @license See core/components/commerce_digitalproduct/docs/license.txt
  */
-class Digitalproduct_mysql extends Digitalproduct
-{
-
-}
+require_once (dirname(__DIR__) . '/digitalproduct.class.php');
+class Digitalproduct_mysql extends Digitalproduct {}

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproduct.map.inc.php

@@ -24,7 +24,6 @@
     'order' => 0,
     'product' => 0,
     'user' => 0,
-    'secret' => '',
   ),
   'fieldMeta' => 
   array (
@@ -55,14 +54,6 @@
       'null' => false,
       'default' => 0,
     ),
-    'secret' => 
-    array (
-      'dbtype' => 'varchar',
-      'precision' => '190',
-      'phptype' => 'string',
-      'null' => false,
-      'default' => '',
-    ),
   ),
   'composites' => 
   array (

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproductfile.class.php

@@ -1,5 +1,4 @@
 <?php
-require_once strtr(realpath(dirname(dirname(__FILE__))), '\\', '/') . '/digitalproductfile.class.php';
 /**
  * Digitalproduct for Commerce.
  *
@@ -10,7 +9,5 @@
  * @package commerce_digitalproduct
  * @license See core/components/commerce_digitalproduct/docs/license.txt
  */
-class DigitalproductFile_mysql extends DigitalproductFile
-{
-
-}
+require_once (dirname(__DIR__) . '/digitalproductfile.class.php');
+class DigitalproductFile_mysql extends DigitalproductFile {}

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproductfile.map.inc.php

@@ -22,6 +22,7 @@
   'fields' => 
   array (
     'digitalproduct_id' => NULL,
+    'secret' => '',
     'resource' => NULL,
     'file' => NULL,
     'download_count' => 0,
@@ -37,6 +38,14 @@
       'phptype' => 'int',
       'null' => false,
     ),
+    'secret' => 
+    array (
+      'dbtype' => 'varchar',
+      'precision' => '190',
+      'phptype' => 'string',
+      'null' => false,
+      'default' => '',
+    ),
     'resource' => 
     array (
       'dbtype' => 'text',

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproductordershipment.class.php

@@ -1,5 +1,4 @@
 <?php
-require_once strtr(realpath(dirname(dirname(__FILE__))), '\\', '/') . '/digitalproductordershipment.class.php';
 /**
  * Digitalproduct for Commerce.
  *
@@ -10,7 +9,5 @@
  * @package commerce_digitalproduct
  * @license See core/components/commerce_digitalproduct/docs/license.txt
  */
-class DigitalproductOrderShipment_mysql extends DigitalproductOrderShipment
-{
-
-}
+require_once (dirname(__DIR__) . '/digitalproductordershipment.class.php');
+class DigitalproductOrderShipment_mysql extends DigitalproductOrderShipment {}

core/components/commerce_digitalproduct/model/commerce_digitalproduct/mysql/digitalproductproduct.class.php

@@ -1,5 +1,4 @@
 <?php
-require_once strtr(realpath(dirname(dirname(__FILE__))), '\\', '/') . '/digitalproductproduct.class.php';
 /**
  * Digitalproduct for Commerce.
  *
@@ -10,7 +9,5 @@
  * @package commerce_digitalproduct
  * @license See core/components/commerce_digitalproduct/docs/license.txt
  */
-class DigitalproductProduct_mysql extends DigitalproductProduct
-{
-
-}
+require_once (dirname(__DIR__) . '/digitalproductproduct.class.php');
+class DigitalproductProduct_mysql extends DigitalproductProduct {}

core/components/commerce_digitalproduct/model/schema/commerce_digitalproduct.mysql.schema.xml

@@ -8,8 +8,6 @@
         <field key="order" dbtype="int" attributes="unsigned" precision="10" phptype="int" null="false" default="0" />
         <field key="product" dbtype="int" attributes="unsigned" precision="10" phptype="int" null="false" default="0" />
         <field key="user" dbtype="int" attributes="unsigned" precision="10" phptype="int" null="false" default="0" />
-        <!-- Used in URLs for tracking and viewing -->
-        <field key="secret" dbtype="varchar" precision="190" phptype="string" null="false" default="" />
 
         <aggregate alias="Order" class="comOrder" local="order" foreign="id" cardinality="one" owner="foreign" />
         <aggregate alias="Product" class="comProduct" local="product" foreign="id" cardinality="one" owner="foreign" />
@@ -19,6 +17,8 @@
 
     <object class="DigitalproductFile" table="commerce_digitalproduct_file" extends="comSimpleObject">
         <field key="digitalproduct_id" dbtype="int" attributes="unsigned" precision="10" phptype="int" null="false" />
+        <!-- Used in URLs for tracking and viewing -->
+        <field key="secret" dbtype="varchar" precision="190" phptype="string" null="false" default="" />
 
         <field key="resource" dbtype="text" phptype="string" null="true" />
         <field key="file" dbtype="text" phptype="string" null="true" />

core/components/commerce_digitalproduct/src/Modules/Digitalproduct.php

@@ -6,7 +6,7 @@
 use Twig\Loader\FilesystemLoader;
 use modmore\Commerce\Events\Checkout;
 use modmore\Commerce\Frontend\Steps\ThankYou;
-// use modmore\Commerce\Frontend\Steps\Payment;
+use modmore\Commerce\Frontend\Steps\Payment;
 
 require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
 
@@ -53,7 +53,7 @@ public function initialize(EventDispatcher $dispatcher)
     public function getDigitalProducts(Checkout $event)
     {
         $step = $event->getStep();
-        if(!($step instanceof ThankYou)) {
+        if (!($step instanceof ThankYou)) {
             return;
         }
 
@@ -81,53 +81,66 @@ public function processDigitalProducts($order)
 
         foreach ($orderItems as $orderItem) {
             $product = $orderItem->getProduct();
-            if ($product->get('class_key') === 'DigitalproductProduct') {
-                // Add the product to the digitalproduct table for tracking
-                $digitalProduct = $this->adapter->newObject('Digitalproduct', [
-                    'order' => $order->get('id'),
-                    'product' => $product->get('id'),
-                    'user' => $user ? $user->get('id') : 0,
+            // This could support class variations in the future?
+            if ($product->get('class_key') !== 'DigitalproductProduct') {
+                continue;
+            }
+
+            // Add the product to the digitalproduct table for tracking
+            $digitalProduct = $this->adapter->newObject('Digitalproduct', [
+                'order' => $order->get('id'),
+                'product' => $product->get('id'),
+                'user' => $user ? $user->get('id') : 0,
+            ]);
+            $digitalProduct->save();
+
+            $id = $product->get('id');
+            // Get the resources attached to this product
+            $resources = $this->getDigitalProductResources($product);
+            if ($resources) {
+                $output['resources'][$id] = [
+                    'resources' => $resources,
+                    'product' => $product->toArray(),
+                ];
+            }
+
+            // Get the files attached to this product
+            $files = $this->getDigitalProductFiles($product);
+            if ($files) {
+                $output['files'][$id] = [
+                    'files' => $files,
+                    'product' => $product->toArray(),
+                ];
+            }
+
+            // Add the files/resources
+            if ($resource || $files) {
+                $digitalProductFile = $this->adapter->newObject('DigitalproductFile', [
+                    'digitalproduct_id' => $digitalProduct->get('id'),
+                    'resource' => $resources ? serialize($resources) : '',
+                    'file' => $files ? serialize($files) : '',
+                    'download_expiry' => $this->getDownloadExpiry($product),
                     'secret' => $this->generateSecret()
                 ]);
-                $digitalProduct->save();
-
-                $id = $product->get('id');
-                // Get the resources attached to this product
-                $resources = $this->getDigitalProductResources($product);
-                if ($resources) {
-                    $output['resources'][] = [
-                        'resources' => $resources,
-                        'product' => $product->toArray()
-                    ];
-                }
+                $digitalProductFile->save();
 
-                // Get the files attached to this product
-                $files = $this->getDigitalProductFiles($product);
-                if ($files) {
-                    $output['files'][] = [
-                        'files' => $files,
-                        'product' => $product->toArray()
-                    ];
+                if (!empty($digitalProductFile->get('file'))) {
+                    $output['resources'][$id]['data'] = $digitalProductFile->toArray();
                 }
-
-                // Add the files/resources
-                if ($resource || $files) {
-                    $digitalProductFile = $this->adapter->newObject('DigitalproductFile', [
-                        'digitalproduct_id' => $digitalProduct->get('id'),
-                        'resource' => $resources ? serialize($resources) : '',
-                        'file' => $files ? serialize($files) : '',
-                        'download_expiry' => $this->getDownloadExpiry($product)
-                    ]);
-                    $digitalProductFile->save();
+                if (!empty($digitalProductFile->get('resource'))) {
+                    $output['files'][$id]['data'] = $digitalProductFile->toArray();
                 }
 
-                // Joins the user to the product's usergroup
-                if ($user && $product->getProperty('usergroup')) {
-                    $user->joinGroup($product->getProperty('usergroup'));
-                }
+                // Also make these accessible in the all array in twig
+                $output['all'][$id] = array_merge($resources, $files);
             }
-        }
 
+            // Joins the user to the product's usergroup if they are logged in
+            if ($user && $product->getProperty('usergroup')) {
+                $user->joinGroup($product->getProperty('usergroup'));
+            }
+        }
+        
         return $output;
     }
 
@@ -195,15 +208,20 @@ public function getDownloadExpiry($product)
 
     /**
      * Generates secret to use for tracking and viewing order products.
-     *
+     * @todo support modifying bytes via system setting
+     * 
      * @return string
      */
-    public function generateSecret($bytes = 10, $check = true)
+    public function generateSecret($secret = null, $bytes = 20, $check = true)
     {
-        $secret = bin2hex(openssl_random_pseudo_bytes($bytes));
+        // Allow future customization of secret for custom downloads. 
+        if (!$secret) {
+            // $secret = random_bytes($bytes);
+            $secret = bin2hex(openssl_random_pseudo_bytes($bytes));
+        }
         // Check to ensure random generated string has not been used before
         if ($check) {
-            $query = $this->adapter->getObject('Digitalproduct', ['secret' => $secret]);
+            $query = $this->adapter->getObject('DigitalproductFile', ['secret' => $secret]);
 
             if ($query) {
                 // Generate a new one if it is being used.
@@ -216,11 +234,6 @@ public function generateSecret($bytes = 10, $check = true)
     public function getModuleConfiguration(\comModule $module)
     {
         $fields = [];
-
-//        $fields[] = new DescriptionField($this->commerce, [
-//            'description' => $this->adapter->lexicon('commerce_digitalproduct.module_description'),
-//        ]);
-
         return $fields;
     }
 }