Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change protocol to https #4513

Merged
merged 53 commits into from
Dec 3, 2019
Merged

Change protocol to https #4513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
d6365ac
Outcon bid adapter.
TinchoF Sep 5, 2019
61ad7d0
Fix identation
TinchoF Sep 5, 2019
fce10ac
Fixes
TinchoF Sep 5, 2019
ea3c819
Fixes
TinchoF Sep 5, 2019
a147937
Fixes
TinchoF Sep 5, 2019
b67849b
Spec fixes
TinchoF Sep 5, 2019
b3d73a4
Fixes
TinchoF Sep 5, 2019
70358d6
Fix urls
TinchoF Sep 5, 2019
46b3f88
Fix
TinchoF Sep 5, 2019
45b3890
Fix parameters
TinchoF Sep 5, 2019
a78be96
Fix space operators
TinchoF Sep 5, 2019
1ecdbc5
Fix bidder timeout
TinchoF Sep 6, 2019
7dde757
Update
TinchoF Sep 6, 2019
631b9a9
Fix whitespace
TinchoF Sep 6, 2019
fc4415d
no message
TinchoF Sep 6, 2019
4f8bf32
Outcon unit test
TinchoF Sep 11, 2019
b3eb6ba
no message
TinchoF Sep 12, 2019
b80296f
no message
TinchoF Sep 12, 2019
bff07a0
no message
TinchoF Sep 12, 2019
f6418d7
no message
TinchoF Sep 12, 2019
aa23fe0
Fixes
TinchoF Sep 14, 2019
a4ebc1f
Fixes
TinchoF Sep 14, 2019
b19a6fb
Change url
TinchoF Sep 17, 2019
0e5f10c
no message
TinchoF Sep 17, 2019
f755375
no message
TinchoF Sep 17, 2019
bbb6d52
no message
TinchoF Sep 17, 2019
fd5970c
Added bidId
TinchoF Sep 24, 2019
5db92a6
no message
TinchoF Sep 24, 2019
ee9c89d
no message
TinchoF Sep 24, 2019
7b749e0
no message
TinchoF Sep 24, 2019
936f94b
no message
TinchoF Sep 26, 2019
820a61c
Wrapping url with html
TinchoF Sep 30, 2019
26373d8
no message
TinchoF Sep 30, 2019
2de6d7b
no message
TinchoF Sep 30, 2019
48664ba
no message
TinchoF Sep 30, 2019
62e42b8
Fix mediaTypes
TinchoF Oct 17, 2019
e0042cb
no message
TinchoF Oct 17, 2019
22e9607
Merge branch 'master' into master
TinchoF Oct 17, 2019
1046ddc
Update outconBidAdapter_spec.js
TinchoF Oct 17, 2019
c30ce94
Adding VAS response
TinchoF Oct 18, 2019
51cb692
no message
TinchoF Oct 18, 2019
69ccca3
no message
TinchoF Oct 18, 2019
637193e
no message
TinchoF Oct 18, 2019
1af03b0
Fix
TinchoF Oct 18, 2019
ce1d632
Changed ttl
TinchoF Oct 18, 2019
6aef061
no message
TinchoF Oct 19, 2019
9421e74
supportedMediaTypes
TinchoF Oct 21, 2019
9e7819b
no message
TinchoF Oct 21, 2019
3bc0839
no message
TinchoF Oct 21, 2019
eee95ae
Change protocol to https
Nov 28, 2019
20a7d3b
Merge branch 'master' into master
TinchoF Nov 28, 2019
cff30f6
no message
Nov 28, 2019
ef1cb13
Merge branch 'master' of https://github.com/TinchoF/Prebid.js
Nov 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/outconBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const spec = {
switch (validBidRequests[i].params.env) {
case 'test':
par = par + '&demo=true';
url = 'http://test.outcondigital.com:8048/ad/' + par;
url = 'https://test.outcondigital.com/ad/' + par;
break;
case 'api':
url = 'http://api.outcondigital.com:8048/ad/' + par;
url = 'https://api.outcondigital.com/ad/' + par;
break;
case 'stg':
url = 'http://stg.outcondigital.com:8048/ad/' + par;
url = 'https://stg.outcondigital.com/ad/' + par;
break;
}
return {
Expand Down
11 changes: 4 additions & 7 deletions test/spec/modules/outconBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ describe('outconBidAdapter', function () {
})).to.equal(true);
});
});

describe('buildRequests', function () {
it('Build requests with pod param', function () {
expect(spec.buildRequests([{
Expand All @@ -34,7 +33,6 @@ describe('outconBidAdapter', function () {
}
}])).to.have.keys('method', 'url', 'data');
});

it('Build requests with internalID and publisherID params', function () {
expect(spec.buildRequests([{
bidder: 'outcon',
Expand All @@ -46,11 +44,10 @@ describe('outconBidAdapter', function () {
}])).to.have.keys('method', 'url', 'data');
});
});

describe('interpretResponse', function () {
const bidRequest = {
method: 'GET',
url: 'http://test.outcondigital.com:8048/ad/',
url: 'https://test.outcondigital.com/ad/',
data: {
pod: '5d603538eba7192ae14e39a4',
env: 'test',
Expand All @@ -64,7 +61,7 @@ describe('outconBidAdapter', function () {
exp: 10,
creatives: [
{
url: 'http://test.outcondigital.com/uploads/5d42e7a7306ea4689b67c122/frutas.mp4',
url: 'https://test.outcondigital.com/uploads/5d42e7a7306ea4689b67c122/frutas.mp4',
size: 3,
width: 1920,
height: 1080,
Expand All @@ -74,8 +71,8 @@ describe('outconBidAdapter', function () {
ad: '5d6e6aef22063e392bf7f564',
type: 'video',
campaign: '5d42e44b306ea469593c76a2',
trackingURL: 'http://test.outcondigital.com:8048/ad/track?track=5d6e6aef22063e392bf7f564',
vastURL: 'http://test.outcondigital.com:8048/outcon.xml?impression=5d6e6aef22063e392bf7f564&demo=true'
trackingURL: 'https://test.outcondigital.com/ad/track?track=5d6e6aef22063e392bf7f564',
vastURL: 'https://test.outcondigital.com/outcon.xml?impression=5d6e6aef22063e392bf7f564&demo=true'
},
};
it('check all the keys that are needed to interpret the response', function () {
Expand Down