prebid.js 7.25.0 → 7.27.0

package/modules/beopBidAdapter.js

@@ -1,4 +1,4 @@
-import { deepAccess, isArray, logWarn, triggerPixel, buildUrl, logInfo, getValue, getBidIdParameter } from '../src/utils.js';
+import { deepAccess, isArray, isStr, logWarn, triggerPixel, buildUrl, logInfo, getValue, getBidIdParameter } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
@@ -40,6 +40,19 @@ export const spec = {
     const pageUrl = getPageUrl(bidderRequest.refererInfo, window);
     const gdpr = bidderRequest.gdprConsent;
     const firstSlot = slots[0];
+    const kwdsFromRequest = firstSlot.kwds;
+    let keywords = [];
+    if (kwdsFromRequest) {
+      if (isArray(kwdsFromRequest)) {
+        keywords = kwdsFromRequest;
+      } else if (isStr(kwdsFromRequest)) {
+        if (kwdsFromRequest.indexOf(',') != -1) {
+          keywords = kwdsFromRequest.split(',').map((e) => { return e.trim() });
+        } else {
+          keywords.push(kwdsFromRequest);
+        }
+      }
+    }
     const payloadObject = {
       at: new Date().toString(),
       nid: firstSlot.nid,
@@ -47,12 +60,13 @@ export const spec = {
       pid: firstSlot.pid,
       url: pageUrl,
       lang: (window.navigator.language || window.navigator.languages[0]),
-      kwds: bidderRequest.ortb2?.site?.keywords || [],
+      kwds: keywords,
       dbg: false,
       slts: slots,
       is_amp: deepAccess(bidderRequest, 'referrerInfo.isAmp'),
       tc_string: (gdpr && gdpr.gdprApplies) ? gdpr.consentString : null,
     };
+
     const payloadString = JSON.stringify(payloadObject);
     return {
       method: 'POST',
@@ -129,6 +143,7 @@ function beOpRequestSlotsMaker(bid) {
     sizes: isArray(bannerSizes) ? bannerSizes : bid.sizes,
     flr: floor,
     pid: getValue(bid.params, 'accountId'),
+    kwds: getValue(bid.params, 'keywords'),
     nid: getValue(bid.params, 'networkId'),
     nptnid: getValue(bid.params, 'networkPartnerId'),
     bid: getBidIdParameter('bidId', bid),

package/modules/browsiRtdProvider.js

@@ -59,10 +59,12 @@ export function addBrowsiTag(data) {
 
 export function sendPageviewEvent(eventType) {
   if (eventType === 'PAGEVIEW') {
-    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
-      vendor: 'browsi',
-      type: 'pageview',
-      billingId: generateUUID()
+    window.addEventListener('browsi_pageview', () => {
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: 'browsi',
+        type: 'pageview',
+        billingId: generateUUID()
+      })
     })
   }
 }

package/modules/bucksenseBidAdapter.js

@@ -4,7 +4,7 @@ import { BANNER } from '../src/mediaTypes.js';
 
 const WHO = 'BKSHBID-005';
 const BIDDER_CODE = 'bucksense';
-const URL = 'https://prebid.bksn.se/prebidjs/';
+const URL = 'https://directo.prebidserving.com/prebidjs/';
 
 export const spec = {
   code: BIDDER_CODE,

package/modules/captifyRtdProvider.js

@@ -0,0 +1,146 @@
+/**
+ * This module adds Captify real time data provider module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments (page-centric) from Captify live-classification server
+ * @module modules/captifyRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { submodule } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import {deepAccess, isArray, isEmptyStr, isNumber, logError} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'CaptifyRTDModule';
+const DEFAULT_LC_URL = 'https://live-classification.cpx.to/prebid-segments';
+
+const STATUS = {
+  SUCCESS: 200,
+  ACCEPTED: 202,
+};
+
+/**
+ * Set `appnexusAuctionKeywords` that appnexus bidder will read and send in request to Xandr
+ * @param {Array<number>} segments captify segments for Appnexus(Xandr) system, in form of [id1, id2, id3]
+ *                 where id1, id2, id3 - actual Xandr segment ids with keywords enabled
+ */
+export function setAppnexusSegments(segments) {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      'captify_segments': segments,
+    },
+  })
+}
+
+/**
+ * Function returns only bidders that contained both, in moduleConfig and at least one adUnit.
+ * @param {Array<string>} bidders Contains list of bidders, to set targeting for
+ * @param {Object} data Response of live-classification service
+ */
+export function addSegmentData(bidders, data) {
+  for (const bidder of bidders) {
+    if (bidder === 'appnexus') { setAppnexusSegments(data['xandr']) }
+  }
+}
+
+/**
+ * Function returns only bidders that contained in both, moduleConfig and at least one adUnit.
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ */
+export function getMatchingBidders(moduleConfig, reqBidsConfigObj) {
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+
+  const adUnitBidders = reqBidsConfigObj.adUnits
+    .flatMap(({bids}) => bids.map(({bidder}) => bidder))
+    .filter((e, i, a) => a.indexOf(e) === i);
+
+  if (!isArray(adUnitBidders) || !adUnitBidders.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in bidRequestConfig');
+    return [];
+  }
+
+  return biddersFromConf.filter(bidder => adUnitBidders.includes(bidder));
+}
+
+/**
+ * Main function that sets Captify targeting for various bidders
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Function} onDone callback function that executed when everything is done
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ * @param {Object} gcv contains data related to user consent, if applies
+ */
+export function setCaptifyTargeting(reqBidsConfigObj, onDone, moduleConfig, gcv) {
+  const pbjsVer = getGlobal();
+  const ref = getRefererInfo().referer;
+  const url = document.URL;
+  const pubId = moduleConfig.params.pubId;
+  const bidders = getMatchingBidders(moduleConfig, reqBidsConfigObj)
+  const requestBody = {
+    pubId,
+    ref,
+    url,
+    pbjsVer,
+    gcv
+  };
+  let requestUrl = moduleConfig.params.url;
+  if (!requestUrl || isEmptyStr(requestUrl)) {
+    requestUrl = DEFAULT_LC_URL;
+  }
+
+  if (!bidders.length) {
+    logError(SUBMODULE_NAME, 'There are no matched bidders to work with');
+    return;
+  }
+
+  ajax(requestUrl, {
+    success: function (response, req) {
+      if (req.status === STATUS.SUCCESS) {
+        try {
+          const data = JSON.parse(response);
+          if (data) {
+            addSegmentData(bidders, data);
+          }
+        } catch (e) {
+          logError(SUBMODULE_NAME, 'Unable to parse live-classification data' + e);
+        }
+      }
+      onDone();
+    },
+    error: function () {
+      onDone();
+      logError(SUBMODULE_NAME, 'Unable to get live-classification data');
+    }
+  },
+  JSON.stringify(requestBody),
+  {
+    contentType: 'application/json',
+    method: 'POST',
+  });
+}
+
+export function init(moduleConfig, userConsent) {
+  // Validate bidders
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+  if (!isArray(biddersFromConf) || !biddersFromConf.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in moduleConfig');
+    return false
+  }
+  const publisherId = deepAccess(moduleConfig, 'params.pubId');
+  // Publisher Id
+  if (!isNumber(publisherId)) {
+    logError(SUBMODULE_NAME, 'Missing parameter pubId in moduleConfig');
+    return false
+  }
+  return true
+}
+
+export const captifySubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  setCaptifyTargeting
+};
+
+submodule(MODULE_NAME, captifySubmodule);

package/modules/captifyRtdProvider.md

@@ -0,0 +1,68 @@
+# Captify Real-Time Data Submodule
+
+# Overview
+
+    Module Name: Captify Rtd Provider
+    Module Type: Rtd Provider
+	Layout: integrationExamples/gpt/captifyRtdProvider_example.html
+    Maintainer: prebid@captify.tech
+
+# Description
+
+Captify uses publisher first-party on-site search data to power machine learning algorithms to create a suite of
+contextual based targeting solutions that activate in a cookieless environment.
+
+The RTD submodule allows bid requests to be classified by our live-classification service on the first ad call,
+maximising value for publishers by increasing scale for advertisers.
+
+Segments will be attached to bid request objects sent to different SSPs in order to optimize targeting.
+
+Contact prebid@captify.tech for information.
+
+### Publisher Usage
+
+Compile the Captify RTD module into your Prebid build:
+
+`npm ci && gulp build --modules=rtdModule,appnexusBidAdapter,captifyRtdProvider`
+
+Add the Captify RTD provider to your Prebid config.
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "CaptifyRTDModule",
+                waitForIt: true,
+                params: {
+                    pubId: 123456,
+                    bidders: ['appnexus'],
+                }
+            }
+        ]
+    }
+});
+```
+
+### Parameter Description
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+| Name           |Type           | Description                                                         |Mandatory | Notes  |
+| :------------- | :------------ | :------------------------------------------------------------------ |:---------|:------------ |
+| name           | String        | Real time data module name                                          | yes     | Always 'CaptifyRTDModule' |
+| waitForIt      | Boolean       | Should be `true` if there's an `auctionDelay` defined (recommended) | no      | Default `false` |
+| params         | Object        | |  | |
+| params.pubId   | Integer       | Partner ID, required to get results and provided by Captify         | yes      | Use 123456 for tests and speak to your Captify account manager to receive your pubId |
+| params.bidders | Array<String> | List of bidders for which you would like data to be set             | yes      | Currently only 'appnexus' supported |
+| params.url     | String        | Captify live-classification service url                             | no       | Defaults to `https://live-classification.cpx.to/prebid-segments`
+
+### Testing
+
+To view an example of available segments returned by Captify:
+
+`gulp serve --modules=rtdModule,captifyRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/captifyRtdProvider_example.html?pbjs_debug=true`

package/modules/criteoBidAdapter.js

@@ -672,18 +672,18 @@ function enrichSlotWithFloors(slot, bidRequest) {
       if (bidRequest.mediaTypes?.banner) {
         slotFloors.banner = {};
         const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
-        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor({ size: bannerSize, mediaType: BANNER }));
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor.call(bidRequest, { size: bannerSize, mediaType: BANNER }));
       }
 
       if (bidRequest.mediaTypes?.video) {
         slotFloors.video = {};
         const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
-        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor({ size: videoSize, mediaType: VIDEO }));
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor.call(bidRequest, { size: videoSize, mediaType: VIDEO }));
       }
 
       if (bidRequest.mediaTypes?.native) {
         slotFloors.native = {};
-        slotFloors.native['*'] = getFloor({ size: '*', mediaType: NATIVE });
+        slotFloors.native['*'] = getFloor.call(bidRequest, { size: '*', mediaType: NATIVE });
       }
 
       if (Object.keys(slotFloors).length > 0) {

package/modules/discoveryBidAdapter.js

@@ -12,7 +12,8 @@ let itemMaps = {};
 const MEDIATYPE = [BANNER, NATIVE];
 
 /* ----- _ss_pp_id:start ------ */
-const COOKIE_KEY_MGUID = '_ss_pp_id';
+const COOKIE_KEY_SSPPID = '_ss_pp_id';
+const COOKIE_KEY_MGUID = '__mguid_';
 
 const NATIVERET = {
   id: 'id',
@@ -58,14 +59,20 @@ const NATIVERET = {
  * @return {string}
  */
 const getUserID = () => {
-  const i = storage.getCookie(COOKIE_KEY_MGUID);
+  let idd = storage.getCookie(COOKIE_KEY_SSPPID);
+  let idm = storage.getCookie(COOKIE_KEY_MGUID);
 
-  if (i === null) {
+  if (idd && !idm) {
+    idm = idd
+  } else if (idm && !idd) {
+    idd = idm
+  } else if (!idd && !idm) {
     const uuid = utils.generateUUID();
     storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    storage.setCookie(COOKIE_KEY_SSPPID, uuid);
     return uuid;
   }
-  return i;
+  return idd;
 };
 
 /* ----- _ss_pp_id:end ------ */
@@ -80,7 +87,6 @@ function getKv(obj, ...keys) {
   let o = obj;
 
   for (let key of keys) {
-    // console.log(key, o);
     if (o && o[key]) {
       o = o[key];
     } else {
@@ -222,7 +228,7 @@ function getItems(validBidRequests, bidderRequest) {
     let id = '' + (i + 1);
 
     if (mediaTypes.native) {
-      ret = {...NATIVERET, ...{id, bidFloor}}
+      ret = { ...NATIVERET, ...{ id, bidFloor } }
     }
     // banner
     if (mediaTypes.banner) {
@@ -249,6 +255,7 @@ function getItems(validBidRequests, bidderRequest) {
           pos: 1,
         },
         ext: {},
+        tagid: globals['tagid'],
       };
     }
     itemMaps[id] = {
@@ -273,14 +280,19 @@ function getParam(validBidRequests, bidderRequest) {
   let auctionId = getKv(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
-  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-
   const timeout = bidderRequest.timeout || 2000;
 
+  const domain = utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+  const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
+  const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
+
   if (items && items.length) {
     let c = {
       id: 'pp_hbjs_' + auctionId,
       at: 1,
+      bcat: globals['bcat'],
+      badv: globals['adv'],
       cur: ['USD'],
       device: {
         connectiontype: 0,
@@ -295,16 +307,16 @@ function getParam(validBidRequests, bidderRequest) {
       },
       tmax: timeout,
       site: {
-        name: globals['media'],
-        domain: globals['media'],
-        page: location,
-        ref: location,
+        name: domain,
+        domain: domain,
+        page: page || location,
+        ref: referer,
         mobile: isMobile,
         cat: [], // todo
         publisher: {
+          id: globals['publisher']
           // todo
-          id: globals['media'],
-          name: globals['media'],
+          // name: xxx
         },
       },
       imp: items,
@@ -329,10 +341,19 @@ export const spec = {
     if (bid.params.token) {
       globals['token'] = bid.params.token;
     }
-    if (bid.params.media) {
-      globals['media'] = bid.params.media;
+    if (bid.params.publisher) {
+      globals['publisher'] = bid.params.publisher;
+    }
+    if (bid.params.tagid) {
+      globals['tagid'] = bid.params.tagid;
+    }
+    if (bid.params.bcat) {
+      globals['bcat'] = Array.isArray(bid.params.bcat) ? bid.params.bcat : [];
+    }
+    if (bid.params.badv) {
+      globals['badv'] = Array.isArray(bid.params.badv) ? bid.params.badv : [];
     }
-    return !!(bid.params.token && bid.params.media);
+    return !!(bid.params.token && bid.params.publisher && bid.params.tagid);
   },
 
   /**

package/modules/discoveryBidAdapter.md

@@ -1,15 +1,15 @@
 # Overview
 
 ```
-Module Name: DiscoveryDSP Bid Adapter
+Module Name: discovery Bid Adapter
 Module Type: Bidder Adapter
 ```
 
 # Description
 
-Module that connects to popIn's demand sources
+Module that connects to popIn's demand sources.
 
-The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
+The discovery Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
 
 # Test Parameters
 ```
@@ -32,7 +32,8 @@ The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact
             bidder: "discovery",
             params: {
               token: "a1b067897e4ae093d1f94261e0ddc6c9",
-              media: 'test_media' // your media host
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
             },
           },
         ],
@@ -45,13 +46,13 @@ The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact
             sizes: [[300, 250]],
           },
         },
-        // Replace this object to test a new adapter!
         bids: [
           {
             bidder: "discovery",
             params: {
               token: "d0f4902b616cc5c38cbe0a08676d0ed9",
-              media: 'test_media' // your media host
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
             },
           },
         ],

package/modules/eplanningBidAdapter.js

@@ -128,9 +128,9 @@ export const spec = {
                 advertiserDomains: ad.adom
               };
             }
-            if (isVastResponse(ad)) {
+            if (request && request.data && request.data.vv) {
               bidResponse.vastXml = ad.adm;
-              bidResponse.mediaTypes = VIDEO;
+              bidResponse.mediaType = VIDEO;
             } else {
               bidResponse.ad = ad.adm;
             }
@@ -504,8 +504,4 @@ function registerAuction(storageID) {
   return true;
 }
 
-function isVastResponse(bid) {
-  return bid.adm.match(/^(<VAST)|(<VideoAdServingTemplate)/gmi);
-}
-
 registerBidder(spec);

package/modules/fluctBidAdapter.js

@@ -62,6 +62,11 @@ export const spec = {
       });
 
       data.params = request.params;
+
+      if (request.schain) {
+        data.schain = request.schain;
+      }
+
       const searchParams = new URLSearchParams({
         dfpUnitCode: request.params.dfpUnitCode,
         tagId: request.params.tagId,

package/modules/gdprEnforcement.js

@@ -2,7 +2,7 @@
  * This module gives publishers extra set of features to enforce individual purposes of TCF v2
  */
 
-import {deepAccess, hasDeviceAccess, isArray, logWarn} from '../src/utils.js';
+import {deepAccess, hasDeviceAccess, isArray, logError, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import adapterManager, {gdprDataHandler} from '../src/adapterManager.js';
 import {find, includes} from '../src/polyfill.js';
@@ -11,13 +11,7 @@ import {getHook} from '../src/hook.js';
 import {validateStorageEnforcement} from '../src/storageManager.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
-
-// modules for which vendor consent is not needed (see https://github.com/prebid/Prebid.js/issues/8161)
-const VENDORLESS_MODULES = new Set([
-  'sharedId',
-  'pubCommonId',
-  'pubProvidedId',
-]);
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
 export const STRICT_STORAGE_ENFORCEMENT = 'strictStorageEnforcement';
 
@@ -71,7 +65,7 @@ export const internal = {
  * @param {{string|Object}} - module
  * @return {number} - GVL ID
  */
-export function getGvlid(module) {
+export function getGvlid(module, ...args) {
   let gvlid = null;
   if (module) {
     // Check user defined GVL Mapping in pbjs.setConfig()
@@ -86,7 +80,7 @@ export function getGvlid(module) {
       return gvlid;
     }
 
-    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode);
+    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode, ...args);
   }
   return gvlid;
 }
@@ -120,10 +114,19 @@ function getGvlidForUserIdModule(userIdModule) {
 /**
  * Returns GVL ID for an analytics adapter. If an analytics adapter does not have an associated GVL ID, it returns 'null'.
  * @param {string} code - 'provider' property on the analytics adapter config
+ * @param {{}} config - analytics configuration object
  * @return {number} GVL ID
  */
-function getGvlidForAnalyticsAdapter(code) {
-  return adapterManager.getAnalyticsAdapter(code) && (adapterManager.getAnalyticsAdapter(code).gvlid || null);
+function getGvlidForAnalyticsAdapter(code, config) {
+  const adapter = adapterManager.getAnalyticsAdapter(code);
+  return adapter?.gvlid || ((gvlid) => {
+    if (typeof gvlid !== 'function') return gvlid;
+    try {
+      return gvlid.call(adapter.adapter, config);
+    } catch (e) {
+      logError(`Error invoking ${code} adapter.gvlid()`, e)
+    }
+  })(adapter?.adapter?.gvlid)
 }
 
 export function shouldEnforce(consentData, purpose, name) {
@@ -145,20 +148,20 @@ export function shouldEnforce(consentData, purpose, name) {
  * @param {Object} consentData - gdpr consent data
  * @param {string=} currentModule - Bidder code of the current module
  * @param {number=} gvlId - GVL ID for the module
- * @param vendorlessModule a predicate function that takes a module name, and returns true if the module does not need vendor consent
  * @returns {boolean}
  */
-export function validateRules(rule, consentData, currentModule, gvlId, vendorlessModule = VENDORLESS_MODULES.has.bind(VENDORLESS_MODULES)) {
+export function validateRules(rule, consentData, currentModule, gvlId) {
   const purposeId = TCF2[Object.keys(TCF2).filter(purposeName => TCF2[purposeName].name === rule.purpose)[0]].id;
 
   // return 'true' if vendor present in 'vendorExceptions'
-  if (includes(rule.vendorExceptions || [], currentModule)) {
+  if ((rule.vendorExceptions || []).includes(currentModule)) {
     return true;
   }
+  const vendorConsentRequred = !((gvlId === VENDORLESS_GVLID || (rule.softVendorExceptions || []).includes(currentModule)))
 
   // get data from the consent string
   const purposeConsent = deepAccess(consentData, `vendorData.purpose.consents.${purposeId}`);
-  const vendorConsent = deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`);
+  const vendorConsent = vendorConsentRequred ? deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`) : true;
   const liTransparency = deepAccess(consentData, `vendorData.purpose.legitimateInterests.${purposeId}`);
 
   /*
@@ -166,7 +169,7 @@ export function validateRules(rule, consentData, currentModule, gvlId, vendorles
     or the user has consented. Similar with vendors.
   */
   const purposeAllowed = rule.enforcePurpose === false || purposeConsent === true;
-  const vendorAllowed = vendorlessModule(currentModule) || rule.enforceVendor === false || vendorConsent === true;
+  const vendorAllowed = rule.enforceVendor === false || vendorConsent === true;
 
   /*
     Few if any vendors should be declaring Legitimate Interest for Device Access (Purpose 1), but some are claiming
@@ -183,19 +186,18 @@ export function validateRules(rule, consentData, currentModule, gvlId, vendorles
 /**
  * This hook checks whether module has permission to access device or not. Device access include cookie and local storage
  * @param {Function} fn reference to original function (used by hook logic)
- * @param isVendorless if true, do not require vendor consent (for e.g. core modules)
  * @param {Number=} gvlid gvlid of the module
  * @param {string=} moduleName name of the module
  * @param result
  */
-export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {validate = validateRules} = {}) {
+export function deviceAccessHook(fn, gvlid, moduleName, result, {validate = validateRules} = {}) {
   result = Object.assign({}, {
     hasEnforcementHook: true
   });
   if (!hasDeviceAccess()) {
     logWarn('Device access is disabled by Publisher');
     result.valid = false;
-  } else if (isVendorless && !strictStorageEnforcement) {
+  } else if (gvlid === VENDORLESS_GVLID && !strictStorageEnforcement) {
     // for vendorless (core) storage, do not enforce rules unless strictStorageEnforcement is set
     result.valid = true;
   } else {
@@ -203,13 +205,13 @@ export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {v
     if (shouldEnforce(consentData, 1, moduleName)) {
       const curBidder = config.getCurrentBidder();
       // Bidders have a copy of storage object with bidder code binded. Aliases will also pass the same bidder code when invoking storage functions and hence if alias tries to access device we will try to grab the gvl id for alias instead of original bidder
-      if (curBidder && (curBidder != moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
+      if (curBidder && (curBidder !== moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
         gvlid = getGvlid(curBidder);
       } else {
         gvlid = getGvlid(moduleName) || gvlid;
       }
       const curModule = moduleName || curBidder;
-      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid, isVendorless ? () => true : undefined);
+      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid,);
       if (isAllowed) {
         result.valid = true;
       } else {
@@ -221,7 +223,7 @@ export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {v
       result.valid = true;
     }
   }
-  fn.call(this, isVendorless, gvlid, moduleName, result);
+  fn.call(this, gvlid, moduleName, result);
 }
 
 /**
@@ -314,7 +316,7 @@ export function enableAnalyticsHook(fn, config) {
     }
     config = config.filter(conf => {
       const analyticsAdapterCode = conf.provider;
-      const gvlid = getGvlid(analyticsAdapterCode);
+      const gvlid = getGvlid(analyticsAdapterCode, conf);
       const isAllowed = !!validateRules(purpose7Rule, consentData, analyticsAdapterCode, gvlid);
       if (!isAllowed) {
         analyticsBlocked.push(analyticsAdapterCode);