10 Commits

Author SHA1 Message Date
935bb64306 1.0.12 2020-10-20 23:52:32 +00:00
24e8a2d97a fix(core): update 2020-10-20 23:52:31 +00:00
571efa201f 1.0.11 2020-10-20 23:07:15 +00:00
a50e4df4ed fix(core): update 2020-10-20 23:07:14 +00:00
c6b75f9236 1.0.10 2020-10-20 22:09:35 +00:00
9157d51471 fix(core): update 2020-10-20 22:09:35 +00:00
0dc496d22a 1.0.9 2020-10-20 21:50:22 +00:00
5f2350a9e7 fix(core): update 2020-10-20 21:50:21 +00:00
e18fd0178d 1.0.8 2020-10-20 21:02:14 +00:00
ebd7ccc171 fix(core): update 2020-10-20 21:02:14 +00:00
3 changed files with 699 additions and 823 deletions

1497
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "@consentsoftware/webclient",
"version": "1.0.7",
"version": "1.0.12",
"private": false,
"description": "a webclient for using consent.software in your website. Works with vanilla js, angular, react, you name it.",
"main": "dist_ts/index.js",
@ -13,17 +13,17 @@
},
"devDependencies": {
"@gitzone/tsbuild": "^2.0.22",
"@gitzone/tstest": "^1.0.15",
"@gitzone/tstest": "^1.0.52",
"@pushrocks/tapbundle": "^3.0.7",
"@types/node": "^14.11.2",
"@types/node": "^14.14.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.15.0"
},
"dependencies": {
"@apiglobal/typedrequest": "^1.0.43",
"@consentsoftware/interfaces": "^1.0.7",
"@pushrocks/smarttime": "^3.0.35",
"@pushrocks/webstore": "^1.0.14"
"@apiglobal/typedrequest": "^1.0.54",
"@consentsoftware/interfaces": "^1.0.10",
"@pushrocks/smarttime": "^3.0.37",
"@pushrocks/webstore": "^1.0.16"
},
"browserslist": [
"last 1 chrome versions"

View File

@ -29,7 +29,7 @@ export class CsWebclient {
plugins.csInterfaces.IWebclientSettings['acceptedCookieLevels']
> {
const result = await this.webstore.get('acceptedCookieLevels');
return result.acceptedCookieLevels;
return result?.acceptedCookieLevels;
}
public async isCookieLevelStillValid(): Promise<boolean> {
@ -46,7 +46,7 @@ export class CsWebclient {
return true;
}
public async getAndRunConsentTuples() {
public async getAndRunConsentTuples(domainArg?: string) {
const acceptedCookieLevels = await this.getCookieLevels();
if (!acceptedCookieLevels) {
console.log('You need to set accepted cookielevels first');
@ -55,15 +55,16 @@ export class CsWebclient {
const csGetDomainSettingsRequest = new plugins.typedrequest.TypedRequest<
plugins.csInterfaces.IRequest_Client_ConsentSoftwareServer_GetDomainSettings
>('https://connect.api.global/consentsoftware', 'getDomainSettings');
const domainToRequest = domainArg || window.location.hostname;
const response = await csGetDomainSettingsRequest.fire({
domain: window.location.hostname
domain: domainToRequest
});
for (const consentTuple of response.consentTuples) {
if (consentTuple.level === 'functional' || acceptedCookieLevels.includes(consentTuple.level)) {
const scriptString = consentTuple.script as string;
// tslint:disable-next-line: function-constructor
const tupleFunction = new Function(scriptString);
await tupleFunction();
const tupleFunction = new Function(`return (${scriptString})()`);
await tupleFunction(consentTuple.scriptExecutionDataArg);
console.log (`Successfully executed ConsentTuple >>${consentTuple.name}<< -> ${consentTuple.description}`);
}
}