From da73940ac9b52632904ad64f39938d1774090158 Mon Sep 17 00:00:00 2001
From: Taro FURUKAWA <furukawa_taro@cyberagent.co.jp>
Date: Thu, 29 Jul 2021 18:19:34 +0900
Subject: [PATCH] add adomain, fix native bid construct process

---
 modules/ajaBidAdapter.js                | 80 ++++++++++++++-----------
 test/spec/modules/ajaBidAdapter_spec.js | 20 +++++--
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/modules/ajaBidAdapter.js b/modules/ajaBidAdapter.js
index 933b06baa23..7b55ee7780a 100644
--- a/modules/ajaBidAdapter.js
+++ b/modules/ajaBidAdapter.js
@@ -21,10 +21,10 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
-    var bidRequests = [];
-    for (var i = 0, len = validBidRequests.length; i < len; i++) {
-      var bid = validBidRequests[i];
-      var queryString = '';
+    const bidRequests = [];
+    for (let i = 0, len = validBidRequests.length; i < len; i++) {
+      const bid = validBidRequests[i];
+      let queryString = '';
       const asi = utils.getBidIdParameter('asi', bid.params);
       queryString = utils.tryAppendQueryString(queryString, 'asi', asi);
       queryString = utils.tryAppendQueryString(queryString, 'skt', SDK_TYPE);
@@ -45,7 +45,7 @@ export const spec = {
     return bidRequests;
   },
 
-  interpretResponse: function(bidderResponse, request) {
+  interpretResponse: function(bidderResponse) {
     const bidderResponseBody = bidderResponse.body;
 
     if (!bidderResponseBody.is_ad_return) {
@@ -63,7 +63,7 @@ export const spec = {
       netRevenue: true,
       ttl: 300, // 5 minutes
       meta: {
-        advertiserDomains: ad.adomain || []
+        advertiserDomains: []
       },
     }
 
@@ -77,6 +77,8 @@ export const spec = {
         adResponse: bidderResponseBody,
         mediaType: VIDEO
       });
+
+      Array.prototype.push.apply(bid.meta.advertiserDomains, videoAd.adomain)
     } else if (AD_TYPE.BANNER === ad.ad_type) {
       const bannerAd = bidderResponseBody.ad.banner;
       Object.assign(bid, {
@@ -93,42 +95,48 @@ export const spec = {
       } catch (error) {
         utils.logError('Error appending tracking pixel', error);
       }
+
+      Array.prototype.push.apply(bid.meta.advertiserDomains, bannerAd.adomain)
     } else if (AD_TYPE.NATIVE === ad.ad_type) {
       const nativeAds = ad.native.template_and_ads.ads;
+      if (nativeAds.length === 0) {
+        return [];
+      }
 
-      nativeAds.forEach(nativeAd => {
-        const assets = nativeAd.assets;
+      const nativeAd = nativeAds[0];
+      const assets = nativeAd.assets;
 
-        Object.assign(bid, {
-          mediaType: NATIVE
-        });
+      Object.assign(bid, {
+        mediaType: NATIVE
+      });
 
-        bid.native = {
-          title: assets.title,
-          body: assets.description,
-          cta: assets.cta_text,
-          sponsoredBy: assets.sponsor,
-          clickUrl: assets.lp_link,
-          impressionTrackers: nativeAd.imps,
-          privacyLink: assets.adchoice_url,
+      bid.native = {
+        title: assets.title,
+        body: assets.description,
+        cta: assets.cta_text,
+        sponsoredBy: assets.sponsor,
+        clickUrl: assets.lp_link,
+        impressionTrackers: nativeAd.imps,
+        privacyLink: assets.adchoice_url
+      };
+
+      if (assets.img_main !== undefined) {
+        bid.native.image = {
+          url: assets.img_main,
+          width: parseInt(assets.img_main_width, 10),
+          height: parseInt(assets.img_main_height, 10)
         };
+      }
 
-        if (assets.img_main !== undefined) {
-          bid.native.image = {
-            url: assets.img_main,
-            width: parseInt(assets.img_main_width, 10),
-            height: parseInt(assets.img_main_height, 10)
-          };
-        }
-
-        if (assets.img_icon !== undefined) {
-          bid.native.icon = {
-            url: assets.img_icon,
-            width: parseInt(assets.img_icon_width, 10),
-            height: parseInt(assets.img_icon_height, 10)
-          };
-        }
-      });
+      if (assets.img_icon !== undefined) {
+        bid.native.icon = {
+          url: assets.img_icon,
+          width: parseInt(assets.img_icon_width, 10),
+          height: parseInt(assets.img_icon_height, 10)
+        };
+      }
+
+      Array.prototype.push.apply(bid.meta.advertiserDomains, nativeAd.adomain)
     }
 
     return [bid];
@@ -182,7 +190,7 @@ function newRenderer(bidderResponse) {
 
 function outstreamRender(bid) {
   bid.renderer.push(() => {
-    window.aja_vast_player.init({
+    window['aja_vast_player'].init({
       vast_tag: bid.adResponse.ad.video.vtag,
       ad_unit_code: bid.adUnitCode, // target div id to render video
       width: bid.width,
diff --git a/test/spec/modules/ajaBidAdapter_spec.js b/test/spec/modules/ajaBidAdapter_spec.js
index addf6a0a409..ccc2ab7de99 100644
--- a/test/spec/modules/ajaBidAdapter_spec.js
+++ b/test/spec/modules/ajaBidAdapter_spec.js
@@ -78,11 +78,11 @@ describe('AjaAdapter', function () {
             'tag': '<div></div>',
             'imps': [
               'https://as.amanad.adtdp.com/v1/imp'
+            ],
+            'adomain': [
+              'www.example.com'
             ]
           },
-          'adomain': [
-            'www.example.com'
-          ]
         },
         'syncs': [
           'https://example.com'
@@ -131,7 +131,10 @@ describe('AjaAdapter', function () {
             'purl': 'https://cdn/player',
             'progress': true,
             'loop': false,
-            'inread': false
+            'inread': false,
+            'adomain': [
+              'www.example.com'
+            ]
           }
         },
         'syncs': [
@@ -186,7 +189,10 @@ describe('AjaAdapter', function () {
                     'https://example.com/inview'
                   ],
                   'jstracker': '',
-                  'disable_trimming': false
+                  'disable_trimming': false,
+                  'adomain': [
+                    'www.example.com'
+                  ]
                 }
               ]
             }
@@ -229,7 +235,9 @@ describe('AjaAdapter', function () {
             'privacyLink': 'https://aja-kk.co.jp/optout'
           },
           'meta': {
-            'advertiserDomains': []
+            'advertiserDomains': [
+              'www.example.com'
+            ]
           }
         }
       ];