added some fixes

Oraki-io · Jun 11, 2024 · 9b86138 · 9b86138
1 parent 5ea0492
commit 9b86138
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 33 deletions.
diff --git a/modules/orakiBidAdapter.js b/modules/orakiBidAdapter.js
@@ -1,5 +1,4 @@
 import { logMessage, logError, deepAccess } from '../src/utils.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -117,44 +116,24 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const device = deepAccess(bidderRequest, 'ortb2.device');
+    const page = deepAccess(bidderRequest, 'refererInfo.page', '');
 
-    let deviceWidth = 0;
-    let deviceHeight = 0;
-
-    let winLocation;
-    try {
-      const winTop = window.top;
-      deviceWidth = winTop.screen.width;
-      deviceHeight = winTop.screen.height;
-      winLocation = winTop.location;
-    } catch (e) {
-      logMessage(e);
-      winLocation = window.location;
-    }
-
-    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
-    let refferLocation;
+    let pageURL;
     try {
-      refferLocation = refferUrl && new URL(refferUrl);
+      pageURL = page && new URL(page);
     } catch (e) {
       logMessage(e);
     }
 
-    let location = refferLocation || winLocation;
-    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
-    const host = location.host;
-    const page = location.pathname;
-    const secure = location.protocol === 'https:' ? 1 : 0;
     const placements = [];
     const request = {
-      deviceWidth,
-      deviceHeight,
-      language,
-      secure,
-      host,
-      page,
+      deviceWidth: device?.w || 0,
+      deviceHeight: device?.h || 0,
+      language: device?.language?.split('-')[0] || '',
+      secure: pageURL.protocol === 'https:' ? 1 : 0,
+      host: pageURL.host,
+      page: pageURL.href,
       placements,
       coppa: deepAccess(bidderRequest, 'ortb2.regs.coppa') ? 1 : 0,
       tmax: bidderRequest.timeout

diff --git a/test/spec/modules/orakiBidAdapter_spec.js b/test/spec/modules/orakiBidAdapter_spec.js
@@ -91,7 +91,15 @@ describe('OrakiBidAdapter', function () {
       vendorData: {}
     },
     refererInfo: {
-      referer: 'https://test.com'
+      referer: 'https://test.com',
+      page: 'https://test.com'
+    },
+    ortb2: {
+      device: {
+        w: 1512,
+        h: 982,
+        language: 'en-UK',
+      }
     },
     timeout: 500
   };
@@ -122,7 +130,8 @@ describe('OrakiBidAdapter', function () {
     it('Returns general data valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth',
+      expect(data).to.have.all.keys(
+        'deviceWidth',
         'deviceHeight',
         'language',
         'secure',