Merge branch 'prebid:master' into master

KargoGlobal · Jul 10, 2023 · 97840d6 · 97840d6
2 parents b03324a + 822c09e
commit 97840d6
Show file tree

Hide file tree

Showing 572 changed files with 25,048 additions and 23,892 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,7 +9,9 @@
 	},
 
 	"postCreateCommand": "bash .devcontainer/postCreate.sh",
-
+	// Make is-docker work again
+	"postStartCommand": "test -f /.dockerenv || sudo touch /.dockerenv",
+
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "master"]
   schedule:
     - cron: '22 11 * * 0'
 

diff --git a/integrationExamples/gpt/captifyRtdProvider_example.html b/integrationExamples/gpt/captifyRtdProvider_example.html
diff --git a/integrationExamples/gpt/growthcode.html b/integrationExamples/gpt/growthcode.html
@@ -7,10 +7,13 @@
   <script async src="../../build/dev/prebid.js"></script>
   <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
   <script>
-    var FAILSAFE_TIMEOUT = 3300;
-    var PREBID_TIMEOUT = 1000;
+    var FAILSAFE_TIMEOUT = 33000;
+    var PREBID_TIMEOUT = 10000;
 
     var adUnits = [{
+      debugging: {
+        enabled: true
+      },
       code: 'div-gpt-ad-1460505748561-0',
       mediaTypes: {
         banner: {
@@ -23,6 +26,11 @@
         params: {
           placementId: 13144370
         }
+      },{
+        bidder: 'criteo',
+        params: {
+          zoneId: 497747
+        },
       }],
     }];
 
@@ -67,12 +75,15 @@
       pbjs.setConfig({
         debugging: {
           enabled: true,
-          bids: [{
-            bidder: 'appnexus',
-            adUnitCode: '/19968336/header-bid-tag-0',
-            cpm: 1.5,
-            adId: '111111',
-            ad: '<html><body><img src="https://files.prebid.org/creatives/prebid300x250.png"></body></html>'
+        },
+        realTimeData: {
+          auctionDelay: 1000,
+          dataProviders: [{
+            name: 'growthCodeRtd',
+            waitForIt: true,
+            params: {
+              pid: 'TEST01',
+            }
           }]
         },
         userSync: {
@@ -81,7 +92,7 @@
             storage: {
               type: "html5",
               name: "_sharedID",         // create a cookie with this name
-              expires: 365             // expires in 1 years
+              expires: 365             // expires in 1 year
             }
           },{
             name: 'growthCodeId',

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
@@ -251,17 +251,31 @@
             {
               "name": "uid2",
               "params": {
+                "uid2ApiBase": "https://operator-integ.uidapi.com", // Omit this setting for production
                 "uid2Token": {
-                  "advertising_token": "example token",
-                  "refresh_token": "aslkdjaslkjdaslkhj",
-                  "identity_expires": Date.now() + 60*1000,
+                  "advertising_token": "advertising token goes here",
+                  "refresh_token": "refresh token goes here",
+                  "identity_expires": Date.now() + 60*1000, // These timestamps should be from the token generate response
                   "refresh_from": Date.now() - 10*1000,
                   "refresh_expires": Date.now() + 12*60*60*1000,
-                  "refresh_response_key": null
+                  "refresh_response_key": "refresh key goes here"
                 }
               }
-            }
-            ,
+            },
+            {
+              "name": "euid",
+              "params": {
+                "euidApiBase": "https://integ.euid.eu", // Omit this setting for production
+                "euidToken": {
+                  "advertising_token": "advertising token goes here",
+                  "refresh_token": "refresh token goes here",
+                  "identity_expires": Date.now() + 60*1000, // These timestamps should be from the token generate response
+                  "refresh_from": Date.now() - 10*1000,
+                  "refresh_expires": Date.now() + 12*60*60*1000,
+                  "refresh_response_key": "refresh key goes here"
+                }
+              }
+            },
             {
               "name": "imuid",
               "params": {