Merge pull request #348 from privacysandbox/dev

Dev to Main
privacysandbox · Jul 1, 2024 · c282369 · c282369
2 parents 65b73d8 + 3a96fcf
commit c282369
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 101 deletions.
diff --git a/services/dsp/src/index.ts b/services/dsp/src/index.ts
@@ -421,12 +421,14 @@ app.post(
   },
 );
 
-app.get('/private-aggregation-aws', (req, res) => {
-  res.render('private-aggregation-aws');
-});
-
-app.get('/private-aggregation-gcp', (req, res) => {
-  res.render('private-aggregation-gcp');
+app.get('/private-aggregation', (req, res) => {
+  const bucket = req.query.bucket;
+  const cloudEnv = req.query.cloudEnv;
+  console.log(`${bucket}, ${cloudEnv}`);
+  res.render('private-aggregation', {
+    bucket: bucket,
+    cloudEnv: cloudEnv,
+  });
 });
 
 app.post(

diff --git a/services/dsp/src/public/js/dsp.js b/services/dsp/src/public/js/dsp.js
@@ -1,10 +1,10 @@
 let dsp = document.currentScript.getAttribute('dsp');
+let bucket = document.currentScript.getAttribute('bucket');
+let cloudEnv = document.currentScript.getAttribute('cloudenv');
 window.addEventListener('load', (event) => {
-  let iframeAws = document.createElement('iframe');
-  let iframeGcp = document.createElement('iframe');
-  // let dsp = document.currentScript.getAttribute('dsp');
-  iframeAws.src = `https://${dsp}/private-aggregation-aws`;
-  iframeGcp.src = `https://${dsp}/private-aggregation-gcp`;
-  document.body.appendChild(iframeAws);
-  document.body.appendChild(iframeGcp);
+  if (cloudEnv == 'aws' || cloudEnv == 'gcp') {
+    let iframe = document.createElement('iframe');
+    iframe.src = `https://${dsp}/private-aggregation?bucket=${bucket}&cloudEnv=${cloudEnv}`;
+    document.body.appendChild(iframe);
+  }
 });
diff --git a/services/dsp/src/public/js/private-aggregation-aws.js b/services/dsp/src/public/js/private-aggregation-aws.js
diff --git a/services/dsp/src/public/js/private-aggregation-gcp.js b/services/dsp/src/public/js/private-aggregation-gcp.js
diff --git a/services/dsp/src/public/js/private-aggregation-worklet-aws.js b/services/dsp/src/public/js/private-aggregation-worklet-aws.js
diff --git a/services/dsp/src/public/js/private-aggregation-worklet-gcp.js b/services/dsp/src/public/js/private-aggregation-worklet-gcp.js
diff --git a/services/dsp/src/public/js/private-aggregation-worklet.js b/services/dsp/src/public/js/private-aggregation-worklet.js
@@ -0,0 +1,26 @@
+class TestPrivateAggregation {
+  async run(data) {
+    let cloudEnv = await sharedStorage.get('cloudenv');
+    console.log(`Enabling ${cloudEnv} Private Aggregation Debug Mode`);
+    privateAggregation.enableDebugMode({debugKey: 1234n});
+    let bucketKey = await sharedStorage.get('bucket');
+    if (bucketKey === 'undefined') {
+      console.log(
+        'No bucket key found for client. Adding default bucketKey 1234567890.',
+      );
+      bucketKey = '1234567890';
+      sharedStorage.set('bucketKey', bucketKey);
+    } else {
+      console.log(`Bucket Key found: ${bucketKey}`);
+    }
+    function convertToBucket(bucketId) {
+      return BigInt(bucketId);
+    }
+    const bucket = convertToBucket(bucketKey);
+    const value = 128;
+    privateAggregation.contributeToHistogram({bucket, value});
+    sharedStorage.clear();
+  }
+}
+
+register('test-private-aggregation', TestPrivateAggregation);
diff --git a/services/dsp/src/public/js/private-aggregation.js b/services/dsp/src/public/js/private-aggregation.js
@@ -0,0 +1,22 @@
+let bucket = document.currentScript.getAttribute('bucket');
+let cloudEnv = document.currentScript.getAttribute('cloudenv');
+
+sharedStorage.set('bucket', `${bucket}`);
+sharedStorage.set('cloudenv', `${cloudEnv}`);
+console.log(
+  `https://publickeyservice.msmt.${cloudEnv}.privacysandboxservices.com`,
+);
+
+async function runPrivateAggregation() {
+  const privateAggCloud = {
+    'privateAggregationConfig': {
+      'aggregationCoordinatorOrigin': `https://publickeyservice.msmt.${cloudEnv}.privacysandboxservices.com`,
+    },
+  };
+  await window.sharedStorage.worklet.addModule(
+    'js/private-aggregation-worklet.js',
+  );
+  await window.sharedStorage.run('test-private-aggregation', privateAggCloud);
+}
+
+runPrivateAggregation();
diff --git a/services/dsp/src/views/private-aggregation-aws.ejs b/services/dsp/src/views/private-aggregation-aws.ejs
diff --git a/services/dsp/src/views/private-aggregation-gcp.ejs b/services/dsp/src/views/private-aggregation-gcp.ejs
diff --git a/services/dsp/src/views/private-aggregation.ejs b/services/dsp/src/views/private-aggregation.ejs
@@ -1,5 +1,5 @@
 <html>
     <header>
-        <script src="/js/private-aggregation.js"></script>
+        <script src="/js/private-aggregation.js" bucket="<%= `${bucket}` %>" cloudenv="<%= `${cloudEnv}` %>"></script>
     </header>
 </html>
diff --git a/services/news/src/index.ts b/services/news/src/index.ts
@@ -46,6 +46,8 @@ app.set('views', 'src/views');
 
 app.get('/', async (req: Request, res: Response) => {
   const {auctionType} = req.query;
+  const bucket = req.query.key;
+  const cloudEnv = req.query.env;
 
   res.render('index', {
     title: TITLE,
@@ -61,6 +63,8 @@ app.get('/', async (req: Request, res: Response) => {
     AD_SERVER_LIB_URL: `https://${AD_SERVER_HOST}/js/ad-server-lib.js`,
     HEADER_BIDDING_LIB_URL: `https://${NEWS_HOST}/js/header-bidding-lib.js`,
     isMultiSeller: auctionType === 'multi',
+    bucket: bucket,
+    cloudEnv: cloudEnv,
   });
 });
 

diff --git a/services/news/src/views/index.ejs b/services/news/src/views/index.ejs
@@ -9,7 +9,7 @@
   <link rel="stylesheet" href="/css/video-ad-style.css">
   <link rel="icon" href="/img/spy.svg" />
   <meta http-equiv="origin-trial" content="<%= NEWS_TOKEN %>">
-  <script src="<%= `https://${DSP_HOST}:${EXTERNAL_PORT}/js/dsp.js` %>" dsp="<%= `${DSP_HOST}:${EXTERNAL_PORT}` %>"></script>
+  <script src="<%= `https://${DSP_HOST}:${EXTERNAL_PORT}/js/dsp.js` %>" dsp="<%= `${DSP_HOST}:${EXTERNAL_PORT}` %>" bucket="<%= `${bucket}` %>" cloudenv="<%= `${cloudEnv}` %>"></script>
   <script defer src="//imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
   <script defer src="/js/video-ad-helper.js"></script>
   <style>