File tree 5 files changed +44
-0
lines changed
5 files changed +44
-0
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ var BID = require("../bid.js");
10
10
var util = require ( "../util.js" ) ;
11
11
var bidManager = require ( "../bidManager.js" ) ;
12
12
var CONF = require ( "../conf.js" ) ;
13
+ var COMMON_CONFIG = require ( "../common.config.js" ) ;
13
14
14
15
var parentAdapterID = CONSTANTS . COMMON . PARENT_ADAPTER_PREBID ;
15
16
@@ -830,6 +831,11 @@ function assignGdprConfigIfRequired(prebidConfig){
830
831
allowAuctionWithoutConsent : CONFIG . getAwc ( ) , // Auction without consent
831
832
defaultGdprScope : true
832
833
} ;
834
+ var gdprActionTimeout = COMMON_CONFIG . getGdprActionTimeout ( )
835
+ if ( gdprActionTimeout ) {
836
+ util . log ( "GDPR IS ENABLED, TIMEOUT: " + prebidConfig [ "consentManagement" ] [ 'gdpr' ] [ 'timeout' ] + ", ACTION TIMEOUT: " + gdprActionTimeout ) ;
837
+ prebidConfig [ "consentManagement" ] [ 'gdpr' ] [ 'actionTimeout' ] = gdprActionTimeout ;
838
+ }
833
839
}
834
840
}
835
841
Original file line number Diff line number Diff line change
1
+ var config = require ( "./conf.js" ) ;
2
+ var CONSTANTS = require ( "./constants.js" ) ;
3
+
4
+ exports . getGdprActionTimeout = function ( ) {
5
+ var gdprActionTimeout = config [ CONSTANTS . CONFIG . COMMON ] [ CONSTANTS . CONFIG . GDPR_ACTION_TIMEOUT ] ;
6
+ return gdprActionTimeout ? window . parseInt ( gdprActionTimeout ) : 0 ;
7
+ } ;
Original file line number Diff line number Diff line change @@ -112,6 +112,7 @@ exports.CONFIG = {
112
112
"TIMEOUT_ADJUSTMENT" : 50 ,
113
113
"SSO_ENABLED" : "ssoEnabled" ,
114
114
"FLOOR_SOURCE" : "floorSource" ,
115
+ "GDPR_ACTION_TIMEOUT" : "gdprActionTimeout" ,
115
116
"PB_GLOBAL_VAR_NAMESPACE" : "pbGlobalVarNamespace" ,
116
117
"OW_GLOBAL_VAR_NAMESPACE" : "owGlobalVarNamespace"
117
118
} ;
Original file line number Diff line number Diff line change 5
5
var CONFIG = require ( "../config.idhub.js" ) ;
6
6
var CONSTANTS = require ( "../constants.js" ) ;
7
7
var util = require ( "../util.idhub.js" ) ;
8
+ var COMMON_CONFIG = require ( "../common.config.js" ) ;
8
9
var refThis = this ;
9
10
var pbNameSpace = CONFIG . isIdentityOnly ( ) ? CONSTANTS . COMMON . IH_NAMESPACE : CONSTANTS . COMMON . PREBID_NAMESPACE ;
10
11
@@ -47,6 +48,11 @@ refThis.setConfig = function(){
47
48
allowAuctionWithoutConsent : CONFIG . getAwc ( ) ,
48
49
defaultGdprScope : true
49
50
} ;
51
+ var gdprActionTimeout = COMMON_CONFIG . getGdprActionTimeout ( )
52
+ if ( gdprActionTimeout ) {
53
+ util . log ( "GDPR IS ENABLED, TIMEOUT: " + prebidConfig [ "consentManagement" ] [ 'gdpr' ] [ 'timeout' ] + ", ACTION TIMEOUT: " + gdprActionTimeout ) ;
54
+ prebidConfig [ "consentManagement" ] [ 'gdpr' ] [ 'actionTimeout' ] = gdprActionTimeout ;
55
+ }
50
56
}
51
57
52
58
if ( CONFIG . getCCPA ( ) ) {
Original file line number Diff line number Diff line change
1
+ var CONF = require ( "../src_new/conf.js" ) ;
2
+ var CONSTANTS = require ( "../src_new/constants.js" ) ;
3
+ var COMMON_CONFIG = require ( "../src_new/common.config.js" ) ;
4
+
5
+ describe ( 'COMMON CONFIG FILE' , function ( ) {
6
+ describe ( '#getGdprActionTimeout' , function ( ) {
7
+ it ( 'is a function' , function ( done ) {
8
+ COMMON_CONFIG . getGdprActionTimeout . should . be . a ( 'function' ) ;
9
+ done ( ) ;
10
+ } ) ;
11
+
12
+ it ( 'should return 5000, as it is set to 5000 when getGdprActionTimeout is called' , function ( done ) {
13
+ CONF [ CONSTANTS . CONFIG . COMMON ] [ CONSTANTS . CONFIG . GDPR_ACTION_TIMEOUT ] = 5000 ;
14
+ COMMON_CONFIG . getGdprActionTimeout ( ) . should . be . equal ( 5000 ) ;
15
+ done ( ) ;
16
+ } ) ;
17
+
18
+ it ( 'should return default value for gdpr action timeout which is 0, as it is NOT set' , function ( done ) {
19
+ delete CONF [ CONSTANTS . CONFIG . COMMON ] [ CONSTANTS . CONFIG . GDPR_ACTION_TIMEOUT ] ;
20
+ COMMON_CONFIG . getGdprActionTimeout ( ) . should . be . equal ( 0 ) ;
21
+ done ( ) ;
22
+ } ) ;
23
+ } ) ;
24
+ } ) ;
You can’t perform that action at this time.
0 commit comments