Change to request DigiTrust ID "withCredentials". (#5013)

Fix to other discovered issues of DigiTrust ID failing to write into userId system. Adjust samples to call https pages in all cases for testing purposes.
prebid · Mar 31, 2020 · b95a2f6 · b95a2f6
1 parent edb33f4
commit b95a2f6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/integrationExamples/gpt/digitrust_Full.html b/integrationExamples/gpt/digitrust_Full.html
@@ -70,7 +70,7 @@
                 }());
                 var t = document.createElement('script');
                 t.async = false;
-                t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
+                t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js';
                 var tag = document.getElementsByTagName('head')[0];
                 tag.appendChild(t);
             }

diff --git a/integrationExamples/gpt/digitrust_Simple.html b/integrationExamples/gpt/digitrust_Simple.html
@@ -71,7 +71,7 @@
                 }());
                 var t = document.createElement('script');
                 t.async = false;
-                t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
+                t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js';
                 var tag = document.getElementsByTagName('head')[0];
                 tag.appendChild(t);
             }

diff --git a/integrationExamples/gpt/digitrust_cmp_test.html b/integrationExamples/gpt/digitrust_cmp_test.html
@@ -187,6 +187,6 @@ <h2>DigiTrust Prebid Sample - No Framework</h2>
             googletag.cmd.push(function () { googletag.display('test-div'); });
         </script>
     </div>
-    <script src="http://cmp-origin-release.digitru.st/1/cmp.bundle.js"></script>
+    <script src="https://cmp-origin-release.digitru.st/1/cmp.bundle.js"></script>
 </body>
 </html>
diff --git a/modules/digiTrustIdSystem.js b/modules/digiTrustIdSystem.js
@@ -46,17 +46,22 @@ var isFunc = function (fn) {
   return typeof (fn) === 'function';
 }
 
+var _savedId = null; // closure variable for storing Id to avoid additional requests
+
 function callApi(options) {
+  var ajaxOptions = {
+    method: 'GET',
+    withCredentials: true
+  };
+
   ajax(
     DT_ID_SVC,
     {
       success: options.success,
       error: options.fail
     },
     null,
-    {
-      method: 'GET'
-    }
+    ajaxOptions
   );
 }
 
@@ -91,8 +96,6 @@ function writeDigiId(id) {
  *
  */
 function initDigitrustFacade(config) {
-  var _savedId = null; // closure variable for storing Id to avoid additional requests
-
   clearTimeout(fallbackTimer);
   fallbackTimer = 0;
 
@@ -116,7 +119,7 @@ function initDigitrustFacade(config) {
           try {
             inter.initCallback(idResponse);
           } catch (ex) {
-            utils.logError('Exception in passed DigiTrust init callback');
+            utils.logError('Exception in passed DigiTrust init callback', ex);
           }
         }
       }
@@ -146,9 +149,9 @@ function initDigitrustFacade(config) {
             success: true
           }
           try {
-            writeDigiId(respText);
             idResult.identity = JSON.parse(respText);
-            _savedId = idResult;
+            _savedId = idResult; // Save result to the cache variable
+            writeDigiId(respText);
           } catch (ex) {
             idResult.success = false;
             delete idResult.identity;
@@ -253,6 +256,10 @@ var ResultWrapper = function (opts) {
    */
   this.userIdCallback = function (callback) {
     idSystemFn = callback;
+    if (me.idObj == null) {
+      me.idObj = _savedId;
+    }
+
     if (me.idObj != null && isFunc(callback)) {
       callback(wrapIdResult());
     }
@@ -262,6 +269,10 @@ var ResultWrapper = function (opts) {
    * Return a wrapped result formatted for userId system
    */
   function wrapIdResult() {
+    if (me.idObj == null) {
+      me.idObj = _savedId;
+    }
+
     if (me.idObj == null) {
       return null;
     }