Merge pull request j3k0#913 from j3k0/application_username_validation

Add applicationUsername to all validation requests
larskendall · Aug 16, 2019 · e0edbdd · e0edbdd
2 parents 2eeeb22 + a59a045
commit e0edbdd
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 4 deletions.
diff --git a/src/js/validator.js b/src/js/validator.js
@@ -68,10 +68,25 @@ function runValidation() {
   // Run one validation request for each product.
   Object.keys(byProduct).forEach(function(productId) {
       var request = byProduct[productId];
+      var product = request.product;
+
+      // Ensure applicationUsername is sent with validation requests
+      if (!product.additionalData) {
+          product.additionalData = {};
+      }
+      if (!product.additionalData.applicationUsername) {
+          product.additionalData.applicationUsername =
+              store._evaluateApplicationUsername(product);
+      }
+      if (!product.additionalData.applicationUsername) {
+          delete product.additionalData.applicationUsername;
+      }
+
+      // Post
       store.utils.ajax({
           url: store.validator,
           method: 'POST',
-          data: request.product,
+          data: product,
           success: function(data) {
               store.log.debug("validator success, response: " + JSON.stringify(data));
               request.callbacks.forEach(function(callback) {

diff --git a/www/store-android.js b/www/store-android.js
@@ -1471,10 +1471,25 @@ function runValidation() {
   // Run one validation request for each product.
   Object.keys(byProduct).forEach(function(productId) {
       var request = byProduct[productId];
+      var product = request.product;
+
+      // Ensure applicationUsername is sent with validation requests
+      if (!product.additionalData) {
+          product.additionalData = {};
+      }
+      if (!product.additionalData.applicationUsername) {
+          product.additionalData.applicationUsername =
+              store._evaluateApplicationUsername(product);
+      }
+      if (!product.additionalData.applicationUsername) {
+          delete product.additionalData.applicationUsername;
+      }
+
+      // Post
       store.utils.ajax({
           url: store.validator,
           method: 'POST',
-          data: request.product,
+          data: product,
           success: function(data) {
               store.log.debug("validator success, response: " + JSON.stringify(data));
               request.callbacks.forEach(function(callback) {

diff --git a/www/store-ios.js b/www/store-ios.js
@@ -1492,10 +1492,25 @@ function runValidation() {
   // Run one validation request for each product.
   Object.keys(byProduct).forEach(function(productId) {
       var request = byProduct[productId];
+      var product = request.product;
+
+      // Ensure applicationUsername is sent with validation requests
+      if (!product.additionalData) {
+          product.additionalData = {};
+      }
+      if (!product.additionalData.applicationUsername) {
+          product.additionalData.applicationUsername =
+              store._evaluateApplicationUsername(product);
+      }
+      if (!product.additionalData.applicationUsername) {
+          delete product.additionalData.applicationUsername;
+      }
+
+      // Post
       store.utils.ajax({
           url: store.validator,
           method: 'POST',
-          data: request.product,
+          data: product,
           success: function(data) {
               store.log.debug("validator success, response: " + JSON.stringify(data));
               request.callbacks.forEach(function(callback) {

diff --git a/www/store-windows.js b/www/store-windows.js
@@ -1471,10 +1471,25 @@ function runValidation() {
   // Run one validation request for each product.
   Object.keys(byProduct).forEach(function(productId) {
       var request = byProduct[productId];
+      var product = request.product;
+
+      // Ensure applicationUsername is sent with validation requests
+      if (!product.additionalData) {
+          product.additionalData = {};
+      }
+      if (!product.additionalData.applicationUsername) {
+          product.additionalData.applicationUsername =
+              store._evaluateApplicationUsername(product);
+      }
+      if (!product.additionalData.applicationUsername) {
+          delete product.additionalData.applicationUsername;
+      }
+
+      // Post
       store.utils.ajax({
           url: store.validator,
           method: 'POST',
-          data: request.product,
+          data: product,
           success: function(data) {
               store.log.debug("validator success, response: " + JSON.stringify(data));
               request.callbacks.forEach(function(callback) {