Merge pull request #21 from gladly-team/kevin/qc-choice-v22

Upgrade to Quantcast Choice v22
gladly-team · Nov 13, 2020 · 0067bce · 0067bce
2 parents 6e9dcf9 + 4e14aed
commit 0067bce
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 28 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -5,8 +5,6 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      LOG_TEST_COVERAGE: true
     steps:
     - uses: actions/checkout@v2
     - name: Run tests and build on Node

diff --git a/package.json b/package.json
@@ -18,11 +18,11 @@
     "test:coverage": "yarn run test:run --coverage",
     "test:watch": "yarn run test:run --watch",
     "quantcast:update": "npm-run-all -s quantcast:update:info quantcast:choice-js:update quantcast:cmp-js:download",
-    "quantcast:update:info": "echo \"########## Downloading the original source JS for Quantcast Choice version 14. To use a different version, first update change the version number in the QC portal for the tab.gladly.dev domain, then modify the version number in the cmp2.js URL in the package.json script.##########\"",
+    "quantcast:update:info": "echo \"########## Downloading the original source JS for Quantcast Choice version 22. To use a different version, first update change the version number in the QC portal for the tab.gladly.dev domain, then modify the version number in the cmp2.js URL in the package.json script.##########\"",
     "quantcast:choice-js:update": "npm-run-all -s quantcast:choice-js:download quantcast:choice-js:format",
     "quantcast:choice-js:download": "curl https://quantcast.mgr.consensu.org/choice/FPBLJYpJgR9Zu/tab.gladly.dev/choice.js > ./quantcast/qcChoiceOriginal.js",
     "quantcast:choice-js:format": "eslint ./quantcast/qcChoiceOriginal.js --fix --no-ignore; exit 0",
-    "quantcast:cmp-js:download": "curl https://quantcast.mgr.consensu.org/tcfv2/14/cmp2.js > ./quantcast/qcCmpOriginal.js",
+    "quantcast:cmp-js:download": "curl https://quantcast.mgr.consensu.org/tcfv2/22/cmp2.js > ./quantcast/qcCmpOriginal.js",
     "quantcast:cmp-js:copy-with-edits": "sed -E 's/SameSite=Lax;secure/SameSite=None;secure/g; s/_isUserInUS=(true|false)/_isUserInUS=window.tabCMP.doesCCPAApply/g; s/_isUserInEU=(true|false)/_isUserInEU=window.tabCMP.doesGDPRApply/g;' ./quantcast/qcCmpOriginal.js > ./src/qcCmpModified.js",
     "dev:publish": "npm-run-all -s build dev:yalc-publish-push",
     "dev:yalc-publish-push": "yalc publish --push"

diff --git a/quantcast/qcChoiceOriginal.js b/quantcast/qcChoiceOriginal.js
@@ -4,7 +4,7 @@
     const firstScript = document.getElementsByTagName('script')[0]
     cmpScriptElement.async = true
     cmpScriptElement.type = 'text/javascript'
-    const cmpVersion = 'https://quantcast.mgr.consensu.org/tcfv2/14/cmp2.js'
+    const cmpVersion = 'https://quantcast.mgr.consensu.org/tcfv2/22/cmp2.js'
     cmpScriptElement.src = cmpVersion
     window._qevents = window._qevents || []
     ;(function () {
@@ -130,13 +130,22 @@
     },
     theme: { uxPrimaryButtonColor: '#9d4ba3' },
     coreConfig: {
-      initScreenBodyTextOption: 1,
       consentScope: 'service',
+      thirdPartyStorageType: 'iframe',
+      consentIdentityEnabled: false,
+      initScreenBodyTextOption: 1,
+      consentOnSafari: false,
       lang_: 'en',
-      defaultToggleValue: 'off',
       displayUi: 'inEU',
-      displayPersistentConsentLink: false,
+      defaultToggleValue: 'off',
       initScreenRejectButtonShowing: false,
+      publisherConsentRestrictionIds: [],
+      publisherLIRestrictionIds: [],
+      softOptInEnabled: false,
+      showSummaryView: true,
+      persistentConsentLinkLocation: 4,
+      displayPersistentConsentLink: false,
+      uiLayout: 'popup',
       publisherLogo:
         'https://tab.gladly.io/static/logo-with-text-257bbffc6dcac5076e8ac31eed8ff73c.svg',
       publisherPurposeIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
@@ -145,15 +154,10 @@
       publisherFeaturesIds: [],
       publisherSpecialFeaturesIds: [],
       stacks: [1, 42],
-      softOptInEnabled: false,
-      uiLayout: 'popup',
       vendorListUpdateFreq: 90,
-      thirdPartyStorageType: 'iframe',
-      showSummaryView: true,
-      persistentConsentLinkLocation: 4,
       quantcastAccountId: 'FPBLJYpJgR9Zu',
       privacyMode: ['GDPR', 'USP'],
-      hashCode: 'klt866OJQEpWMQn5tnZBBg',
+      hashCode: 'viIA/yKcUUmwj5xfSRz5eQ',
       publisherCountryCode: 'US',
       publisherName: 'LOCAL - Tab for a Cause',
       vendorPurposeIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
@@ -167,5 +171,6 @@
       uspLspact: 'N',
       suppressCcpaLinks: true,
     },
+    nonIabVendorsInfo: {},
   })
 })()
diff --git a/quantcast/qcCmpOriginal.js b/quantcast/qcCmpOriginal.js
diff --git a/src/initCMP.js b/src/initCMP.js
@@ -32,29 +32,33 @@ const initCMP = (options) => {
     },
     theme: { uxPrimaryButtonColor: primaryButtonColor },
     coreConfig: {
-      initScreenBodyTextOption: 1,
       consentScope: 'service',
+      thirdPartyStorageType: 'iframe',
+      consentIdentityEnabled: false,
+      initScreenBodyTextOption: 1,
+      consentOnSafari: false,
       lang_: language,
-      defaultToggleValue: 'off',
       displayUi: 'inEU',
-      displayPersistentConsentLink,
+      defaultToggleValue: 'off',
       initScreenRejectButtonShowing: false,
+      publisherConsentRestrictionIds: [],
+      publisherLIRestrictionIds: [],
+      softOptInEnabled: false,
+      showSummaryView: true,
+      persistentConsentLinkLocation: 4,
+      displayPersistentConsentLink,
+      uiLayout: 'popup',
       publisherLogo,
       publisherPurposeIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
       publisherPurposeLegitimateInterestIds: [2, 7, 8, 10],
       publisherSpecialPurposesIds: [1, 2],
       publisherFeaturesIds: [],
       publisherSpecialFeaturesIds: [],
       stacks: [1, 42],
-      softOptInEnabled: false,
-      uiLayout: 'popup',
       vendorListUpdateFreq: 90,
-      thirdPartyStorageType: 'iframe',
-      showSummaryView: true,
-      persistentConsentLinkLocation: 4,
       quantcastAccountId: 'FPBLJYpJgR9Zu',
       privacyMode: ['GDPR', 'USP'],
-      hashCode: 'klt866OJQEpWMQn5tnZBBg',
+      hashCode: 'viIA/yKcUUmwj5xfSRz5eQ',
       publisherCountryCode: 'US',
       publisherName,
       vendorPurposeIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
@@ -68,6 +72,7 @@ const initCMP = (options) => {
       uspLspact: 'N',
       suppressCcpaLinks: true,
     },
+    nonIabVendorsInfo: {},
   })
 
   // Important: the CMP JS apparently must load after the

diff --git a/src/qcChoiceModified.js b/src/qcChoiceModified.js
@@ -9,7 +9,7 @@ export const setUpQuantcastChoice = () => {
   const firstScript = document.getElementsByTagName('script')[0]
   // cmpScriptElement.async = true
   // cmpScriptElement.type = 'text/javascript'
-  // const cmpVersion = 'https://quantcast.mgr.consensu.org/tcfv2/14/cmp2.js'
+  // const cmpVersion = 'https://quantcast.mgr.consensu.org/tcfv2/22/cmp2.js'
   // cmpScriptElement.src = cmpVersion
   window._qevents = window._qevents || []
 

diff --git a/src/qcCmpModified.js b/src/qcCmpModified.js