@newskit-render/my-account 7.129.1-alpha.1 → 7.129.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/helpers/cookiesUtils.d.ts +4 -3
- package/dist/cjs/helpers/cookiesUtils.js +22 -4
- package/dist/cjs/helpers/cookiesUtils.js.map +1 -1
- package/dist/cjs/helpers/featureFlagUtils.js +15 -14
- package/dist/cjs/helpers/featureFlagUtils.js.map +1 -1
- package/dist/esm/helpers/cookiesUtils.d.ts +4 -3
- package/dist/esm/helpers/cookiesUtils.js +20 -3
- package/dist/esm/helpers/cookiesUtils.js.map +1 -1
- package/dist/esm/helpers/featureFlagUtils.js +15 -14
- package/dist/esm/helpers/featureFlagUtils.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { RequestHeaders } from '@newskit-render/shared-components';
|
|
2
2
|
export declare const getCookieValue: (name: string, headers?: RequestHeaders) => {
|
|
3
|
-
name: string;
|
|
4
|
-
value: any;
|
|
5
|
-
} | {
|
|
6
3
|
name?: undefined;
|
|
7
4
|
value?: undefined;
|
|
5
|
+
} | {
|
|
6
|
+
name: string;
|
|
7
|
+
value: any;
|
|
8
8
|
};
|
|
9
|
+
export declare const hasTrackingConsent: (headers?: RequestHeaders) => boolean;
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCookieValue = void 0;
|
|
3
|
+
exports.hasTrackingConsent = exports.getCookieValue = void 0;
|
|
4
4
|
var getCookieValue = function (name, headers) {
|
|
5
|
-
var _a, _b;
|
|
6
|
-
|
|
5
|
+
var _a, _b, _c, _d;
|
|
6
|
+
if (!headers) {
|
|
7
|
+
var cookie = (_b = (_a = document === null || document === void 0 ? void 0 : document.cookie) === null || _a === void 0 ? void 0 : _a.split(';').find(function (element) { return element.includes(name); })) === null || _b === void 0 ? void 0 : _b.trim();
|
|
8
|
+
if (!cookie)
|
|
9
|
+
return {};
|
|
10
|
+
var value = cookie.split('=')[1];
|
|
11
|
+
return { name: name, value: value };
|
|
12
|
+
}
|
|
13
|
+
var cookieExists = (_c = headers === null || headers === void 0 ? void 0 : headers.cookie) === null || _c === void 0 ? void 0 : _c.includes(name);
|
|
7
14
|
if (cookieExists) {
|
|
8
15
|
var cookieValue = void 0;
|
|
9
|
-
cookieValue = (
|
|
16
|
+
cookieValue = (_d = headers === null || headers === void 0 ? void 0 : headers.cookie) === null || _d === void 0 ? void 0 : _d.split(';').find(function (element) { return element.includes(name); });
|
|
10
17
|
cookieValue = cookieValue.split('=')[1];
|
|
11
18
|
return { name: name, value: cookieValue };
|
|
12
19
|
}
|
|
@@ -15,4 +22,15 @@ var getCookieValue = function (name, headers) {
|
|
|
15
22
|
}
|
|
16
23
|
};
|
|
17
24
|
exports.getCookieValue = getCookieValue;
|
|
25
|
+
var hasTrackingConsent = function (headers) {
|
|
26
|
+
var spConsentGlobal = (0, exports.getCookieValue)('nukt_sp_consent_global', headers).value;
|
|
27
|
+
if (!spConsentGlobal)
|
|
28
|
+
return false;
|
|
29
|
+
var isGDPRUser = spConsentGlobal.includes('GDPR');
|
|
30
|
+
if (!isGDPRUser)
|
|
31
|
+
return true;
|
|
32
|
+
var consentCookie = (0, exports.getCookieValue)('nuk-consent-personalisation', headers).value;
|
|
33
|
+
return consentCookie === '1';
|
|
34
|
+
};
|
|
35
|
+
exports.hasTrackingConsent = hasTrackingConsent;
|
|
18
36
|
//# sourceMappingURL=cookiesUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAM,MAAM,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAC3B,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAtB,CAAsB,CAAC,0CACxC,IAAI,EAAE,CAAA;QAEV,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAA;QAEtB,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAChC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;IACxB,CAAC;IAED,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEpD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,WAAW,SAAA,CAAA;QACf,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CACzB,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAtB,CAAsB,CAAC,CAAA;QAE5C,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AA1BY,QAAA,cAAc,kBA0B1B;AAEM,IAAM,kBAAkB,GAAG,UAAC,OAAwB;IACzD,IAAM,eAAe,GAAG,IAAA,sBAAc,EACpC,wBAAwB,EACxB,OAAO,CACR,CAAC,KAAK,CAAA;IACP,IAAI,CAAC,eAAe;QAAE,OAAO,KAAK,CAAA;IAElC,IAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACnD,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAA;IAE5B,IAAM,aAAa,GAAG,IAAA,sBAAc,EAClC,6BAA6B,EAC7B,OAAO,CACR,CAAC,KAAK,CAAA;IACP,OAAO,aAAa,KAAK,GAAG,CAAA;AAC9B,CAAC,CAAA;AAfY,QAAA,kBAAkB,sBAe9B"}
|
|
@@ -49,6 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.trackEvent = exports.prepareOptimizelyData = exports.getUserAttributes = void 0;
|
|
51
51
|
var shared_components_1 = require("@newskit-render/shared-components");
|
|
52
|
+
var cookiesUtils_1 = require("./cookiesUtils");
|
|
52
53
|
var subscriptionsUtils_1 = require("./subscriptionsUtils");
|
|
53
54
|
var getUserAttributes = function (context, attributes) {
|
|
54
55
|
var _a, _b, _c;
|
|
@@ -71,8 +72,10 @@ var prepareOptimizelyData = function (userData, context) {
|
|
|
71
72
|
if (!userData) {
|
|
72
73
|
return {};
|
|
73
74
|
}
|
|
74
|
-
var
|
|
75
|
-
|
|
75
|
+
var hasConsent = (0, cookiesUtils_1.hasTrackingConsent)({
|
|
76
|
+
cookie: (context === null || context === void 0 ? void 0 : context.cookies) || '',
|
|
77
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
78
|
+
});
|
|
76
79
|
var subscription = (_b = (_a = userData.user) === null || _a === void 0 ? void 0 : _a.subscriptions) === null || _b === void 0 ? void 0 : _b[0];
|
|
77
80
|
var contractPhase = (subscription === null || subscription === void 0 ? void 0 : subscription.phases)
|
|
78
81
|
? (0, subscriptionsUtils_1.findActiveContractPhase)(subscription.phases)
|
|
@@ -90,22 +93,20 @@ var prepareOptimizelyData = function (userData, context) {
|
|
|
90
93
|
};
|
|
91
94
|
};
|
|
92
95
|
exports.prepareOptimizelyData = prepareOptimizelyData;
|
|
96
|
+
// Client-side tracking, only if we have consent
|
|
97
|
+
// istanbul ignore next
|
|
93
98
|
var trackEvent = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
94
|
-
var
|
|
95
|
-
var _c;
|
|
99
|
+
var hasConsent, error_1;
|
|
96
100
|
var eventName = _b.eventName, cpn = _b.cpn, mpcode = _b.mpcode, tags = _b.tags;
|
|
97
|
-
return __generator(this, function (
|
|
98
|
-
switch (
|
|
101
|
+
return __generator(this, function (_c) {
|
|
102
|
+
switch (_c.label) {
|
|
99
103
|
case 0:
|
|
100
|
-
|
|
101
|
-
.split('; ')
|
|
102
|
-
.find(function (c) { return c.startsWith('nuk-consent-personalisation='); })) === null || _c === void 0 ? void 0 : _c.split('=')[1];
|
|
103
|
-
hasConsent = consentCookie === '1';
|
|
104
|
+
hasConsent = (0, cookiesUtils_1.hasTrackingConsent)();
|
|
104
105
|
if (!hasConsent)
|
|
105
106
|
return [2 /*return*/];
|
|
106
|
-
|
|
107
|
+
_c.label = 1;
|
|
107
108
|
case 1:
|
|
108
|
-
|
|
109
|
+
_c.trys.push([1, 3, , 4]);
|
|
109
110
|
return [4 /*yield*/, fetch('/api/account/track-event', {
|
|
110
111
|
method: 'POST',
|
|
111
112
|
body: JSON.stringify({
|
|
@@ -116,10 +117,10 @@ var trackEvent = function (_a) { return __awaiter(void 0, [_a], void 0, function
|
|
|
116
117
|
}),
|
|
117
118
|
})];
|
|
118
119
|
case 2:
|
|
119
|
-
|
|
120
|
+
_c.sent();
|
|
120
121
|
return [3 /*break*/, 4];
|
|
121
122
|
case 3:
|
|
122
|
-
error_1 =
|
|
123
|
+
error_1 = _c.sent();
|
|
123
124
|
console.error('Error tracking optimizely event:', error_1);
|
|
124
125
|
return [3 /*break*/, 4];
|
|
125
126
|
case 4: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlagUtils.js","sourceRoot":"","sources":["../../../src/helpers/featureFlagUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uEAAsE;AAEtE,2DAG6B;AAStB,IAAM,iBAAiB,GAAG,UAC/B,OAA0B,EAC1B,UAA8C;;IAE9C,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,OAAO;QACL,QAAQ,EAAE;YACR,UAAU,wCACR,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,MAAM,IAAI,KAAK,EACnD,kBAAkB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,MAAK,MAAM,IAAI,KAAK,EACnE,gBAAgB,EACd,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,sCAAkB,CAAC,YAAY,CAAC,MAAK,SAAS,EAC1D,UAAU,EAAE,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,WAAW,MAAK,MAAM,IAE/C,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAC7D,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU;gBACxB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,EAAE;gBACxC,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc;gBAC5B,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC,KACP,YAAY,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,mCAAI,KAAK,EAC/C,WAAW,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,mCAAI,KAAK,GAC7C;YACD,MAAM,EAAE,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAA6B,KAAI,EAAE;SACzD;KACF,CAAA;AACH,CAAC,CAAA;AA5BY,QAAA,iBAAiB,qBA4B7B;AAEM,IAAM,qBAAqB,GAAG,UACnC,QAEC,EACD,OAA2B;;IAE3B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAuC,CAAA;IAChD,CAAC;IACD,IAAM,
|
|
1
|
+
{"version":3,"file":"featureFlagUtils.js","sourceRoot":"","sources":["../../../src/helpers/featureFlagUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { RequestHeaders } from '@newskit-render/shared-components';
|
|
2
2
|
export declare const getCookieValue: (name: string, headers?: RequestHeaders) => {
|
|
3
|
-
name: string;
|
|
4
|
-
value: any;
|
|
5
|
-
} | {
|
|
6
3
|
name?: undefined;
|
|
7
4
|
value?: undefined;
|
|
5
|
+
} | {
|
|
6
|
+
name: string;
|
|
7
|
+
value: any;
|
|
8
8
|
};
|
|
9
|
+
export declare const hasTrackingConsent: (headers?: RequestHeaders) => boolean;
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
export var getCookieValue = function (name, headers) {
|
|
2
|
-
var _a, _b;
|
|
3
|
-
|
|
2
|
+
var _a, _b, _c, _d;
|
|
3
|
+
if (!headers) {
|
|
4
|
+
var cookie = (_b = (_a = document === null || document === void 0 ? void 0 : document.cookie) === null || _a === void 0 ? void 0 : _a.split(';').find(function (element) { return element.includes(name); })) === null || _b === void 0 ? void 0 : _b.trim();
|
|
5
|
+
if (!cookie)
|
|
6
|
+
return {};
|
|
7
|
+
var value = cookie.split('=')[1];
|
|
8
|
+
return { name: name, value: value };
|
|
9
|
+
}
|
|
10
|
+
var cookieExists = (_c = headers === null || headers === void 0 ? void 0 : headers.cookie) === null || _c === void 0 ? void 0 : _c.includes(name);
|
|
4
11
|
if (cookieExists) {
|
|
5
12
|
var cookieValue = void 0;
|
|
6
|
-
cookieValue = (
|
|
13
|
+
cookieValue = (_d = headers === null || headers === void 0 ? void 0 : headers.cookie) === null || _d === void 0 ? void 0 : _d.split(';').find(function (element) { return element.includes(name); });
|
|
7
14
|
cookieValue = cookieValue.split('=')[1];
|
|
8
15
|
return { name: name, value: cookieValue };
|
|
9
16
|
}
|
|
@@ -11,4 +18,14 @@ export var getCookieValue = function (name, headers) {
|
|
|
11
18
|
return {};
|
|
12
19
|
}
|
|
13
20
|
};
|
|
21
|
+
export var hasTrackingConsent = function (headers) {
|
|
22
|
+
var spConsentGlobal = getCookieValue('nukt_sp_consent_global', headers).value;
|
|
23
|
+
if (!spConsentGlobal)
|
|
24
|
+
return false;
|
|
25
|
+
var isGDPRUser = spConsentGlobal.includes('GDPR');
|
|
26
|
+
if (!isGDPRUser)
|
|
27
|
+
return true;
|
|
28
|
+
var consentCookie = getCookieValue('nuk-consent-personalisation', headers).value;
|
|
29
|
+
return consentCookie === '1';
|
|
30
|
+
};
|
|
14
31
|
//# sourceMappingURL=cookiesUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAM,MAAM,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAC3B,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAtB,CAAsB,CAAC,0CACxC,IAAI,EAAE,CAAA;QAEV,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAA;QAEtB,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAChC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;IACxB,CAAC;IAED,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEpD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,WAAW,SAAA,CAAA;QACf,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CACzB,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAtB,CAAsB,CAAC,CAAA;QAE5C,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,OAAwB;IACzD,IAAM,eAAe,GAAG,cAAc,CACpC,wBAAwB,EACxB,OAAO,CACR,CAAC,KAAK,CAAA;IACP,IAAI,CAAC,eAAe;QAAE,OAAO,KAAK,CAAA;IAElC,IAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACnD,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAA;IAE5B,IAAM,aAAa,GAAG,cAAc,CAClC,6BAA6B,EAC7B,OAAO,CACR,CAAC,KAAK,CAAA;IACP,OAAO,aAAa,KAAK,GAAG,CAAA;AAC9B,CAAC,CAAA"}
|
|
@@ -46,6 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
48
|
import { RequestHeadersKeys } from '@newskit-render/shared-components';
|
|
49
|
+
import { hasTrackingConsent } from './cookiesUtils';
|
|
49
50
|
import { findActiveContractPhase, hasActiveOrUpcomingDiscount, } from './subscriptionsUtils';
|
|
50
51
|
export var getUserAttributes = function (context, attributes) {
|
|
51
52
|
var _a, _b, _c;
|
|
@@ -67,8 +68,10 @@ export var prepareOptimizelyData = function (userData, context) {
|
|
|
67
68
|
if (!userData) {
|
|
68
69
|
return {};
|
|
69
70
|
}
|
|
70
|
-
var
|
|
71
|
-
|
|
71
|
+
var hasConsent = hasTrackingConsent({
|
|
72
|
+
cookie: (context === null || context === void 0 ? void 0 : context.cookies) || '',
|
|
73
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
74
|
+
});
|
|
72
75
|
var subscription = (_b = (_a = userData.user) === null || _a === void 0 ? void 0 : _a.subscriptions) === null || _b === void 0 ? void 0 : _b[0];
|
|
73
76
|
var contractPhase = (subscription === null || subscription === void 0 ? void 0 : subscription.phases)
|
|
74
77
|
? findActiveContractPhase(subscription.phases)
|
|
@@ -85,22 +88,20 @@ export var prepareOptimizelyData = function (userData, context) {
|
|
|
85
88
|
hasConsent: hasConsent,
|
|
86
89
|
};
|
|
87
90
|
};
|
|
91
|
+
// Client-side tracking, only if we have consent
|
|
92
|
+
// istanbul ignore next
|
|
88
93
|
export var trackEvent = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
89
|
-
var
|
|
90
|
-
var _c;
|
|
94
|
+
var hasConsent, error_1;
|
|
91
95
|
var eventName = _b.eventName, cpn = _b.cpn, mpcode = _b.mpcode, tags = _b.tags;
|
|
92
|
-
return __generator(this, function (
|
|
93
|
-
switch (
|
|
96
|
+
return __generator(this, function (_c) {
|
|
97
|
+
switch (_c.label) {
|
|
94
98
|
case 0:
|
|
95
|
-
|
|
96
|
-
.split('; ')
|
|
97
|
-
.find(function (c) { return c.startsWith('nuk-consent-personalisation='); })) === null || _c === void 0 ? void 0 : _c.split('=')[1];
|
|
98
|
-
hasConsent = consentCookie === '1';
|
|
99
|
+
hasConsent = hasTrackingConsent();
|
|
99
100
|
if (!hasConsent)
|
|
100
101
|
return [2 /*return*/];
|
|
101
|
-
|
|
102
|
+
_c.label = 1;
|
|
102
103
|
case 1:
|
|
103
|
-
|
|
104
|
+
_c.trys.push([1, 3, , 4]);
|
|
104
105
|
return [4 /*yield*/, fetch('/api/account/track-event', {
|
|
105
106
|
method: 'POST',
|
|
106
107
|
body: JSON.stringify({
|
|
@@ -111,10 +112,10 @@ export var trackEvent = function (_a) { return __awaiter(void 0, [_a], void 0, f
|
|
|
111
112
|
}),
|
|
112
113
|
})];
|
|
113
114
|
case 2:
|
|
114
|
-
|
|
115
|
+
_c.sent();
|
|
115
116
|
return [3 /*break*/, 4];
|
|
116
117
|
case 3:
|
|
117
|
-
error_1 =
|
|
118
|
+
error_1 = _c.sent();
|
|
118
119
|
console.error('Error tracking optimizely event:', error_1);
|
|
119
120
|
return [3 /*break*/, 4];
|
|
120
121
|
case 4: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlagUtils.js","sourceRoot":"","sources":["../../../src/helpers/featureFlagUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,sBAAsB,CAAA;AAS7B,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,OAA0B,EAC1B,UAA8C;;IAE9C,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,OAAO;QACL,QAAQ,EAAE;YACR,UAAU,wCACR,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,MAAM,IAAI,KAAK,EACnD,kBAAkB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,MAAK,MAAM,IAAI,KAAK,EACnE,gBAAgB,EACd,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,kBAAkB,CAAC,YAAY,CAAC,MAAK,SAAS,EAC1D,UAAU,EAAE,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,WAAW,MAAK,MAAM,IAE/C,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAC7D,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU;gBACxB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,EAAE;gBACxC,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc;gBAC5B,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC,KACP,YAAY,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,mCAAI,KAAK,EAC/C,WAAW,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,mCAAI,KAAK,GAC7C;YACD,MAAM,EAAE,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAA6B,KAAI,EAAE;SACzD;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,qBAAqB,GAAG,UACnC,QAEC,EACD,OAA2B;;IAE3B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAuC,CAAA;IAChD,CAAC;IACD,IAAM,
|
|
1
|
+
{"version":3,"file":"featureFlagUtils.js","sourceRoot":"","sources":["../../../src/helpers/featureFlagUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,sBAAsB,CAAA;AAS7B,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,OAA0B,EAC1B,UAA8C;;IAE9C,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,IAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA;IAChC,OAAO;QACL,QAAQ,EAAE;YACR,UAAU,wCACR,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,MAAM,IAAI,KAAK,EACnD,kBAAkB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,MAAK,MAAM,IAAI,KAAK,EACnE,gBAAgB,EACd,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,kBAAkB,CAAC,YAAY,CAAC,MAAK,SAAS,EAC1D,UAAU,EAAE,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,WAAW,MAAK,MAAM,IAE/C,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAC7D,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU;gBACxB,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,EAAE;gBACxC,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc;gBAC5B,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC,KACP,YAAY,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,mCAAI,KAAK,EAC/C,WAAW,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,mCAAI,KAAK,GAC7C;YACD,MAAM,EAAE,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAA6B,KAAI,EAAE;SACzD;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,qBAAqB,GAAG,UACnC,QAEC,EACD,OAA2B;;IAE3B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAuC,CAAA;IAChD,CAAC;IACD,IAAM,UAAU,GAAG,kBAAkB,CAAC;QACpC,MAAM,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE;QAC9B,8DAA8D;KACxD,CAAC,CAAA;IACT,IAAM,YAAY,GAAG,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,aAAa,0CAAG,CAAC,CAAC,CAAA;IAEtD,IAAM,aAAa,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM;QACxC,CAAC,CAAC,uBAAuB,CAAC,YAAY,CAAC,MAAM,CAAC;QAC9C,CAAC,CAAC,IAAI,CAAA;IAER,IAAM,WAAW,GAAG,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,0CAAE,MAAM;QACzD,CAAC,CAAC,2BAA2B,CAAC,YAAY,CAAC,iBAAiB,CAAC;QAC7D,CAAC,CAAC,KAAK,CAAA;IAET,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,0CAAE,IAAI,mCAAI,EAAE;QAC9C,UAAU,EAAE,OAAO,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,CAAC;QAC5C,MAAM,EAAE,CAAC,UAAU,KAAI,MAAA,QAAQ,CAAC,IAAI,0CAAE,GAAG,CAAA,CAAC,IAAI,EAAE;QAChD,cAAc,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,mCAAI,EAAE;QACzC,YAAY,EAAE,WAAW;QACzB,UAAU,YAAA;KACX,CAAA;AACH,CAAC,CAAA;AASD,gDAAgD;AAChD,uBAAuB;AACvB,MAAM,CAAC,IAAM,UAAU,GAAG,iEAAO,EAKb;;QAJlB,SAAS,eAAA,EACT,GAAG,SAAA,EACH,MAAM,YAAA,EACN,IAAI,UAAA;;;;gBAEE,UAAU,GAAG,kBAAkB,EAAE,CAAA;gBACvC,IAAI,CAAC,UAAU;oBAAE,sBAAM;;;;gBAIrB,qBAAM,KAAK,CAAC,0BAA0B,EAAE;wBACtC,MAAM,EAAE,MAAM;wBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;4BACnB,SAAS,WAAA;4BACT,IAAI,MAAA;4BACJ,GAAG,KAAA;4BACH,MAAM,QAAA;yBACP,CAAC;qBACH,CAAC,EAAA;;gBARF,SAQE,CAAA;;;;gBAEF,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,OAAK,CAAC,CAAA;;;;;KAE3D,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/my-account",
|
|
3
|
-
"version": "7.129.1
|
|
3
|
+
"version": "7.129.1",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"@emotion/react": "11.9.3",
|
|
35
35
|
"@emotion/styled": "11.9.3",
|
|
36
36
|
"@hookform/resolvers": "2.9.10",
|
|
37
|
-
"@newskit-render/api": "^1.16.60
|
|
38
|
-
"@newskit-render/feature-flags": "^1.11.76
|
|
39
|
-
"@newskit-render/shared-components": "^4.53.25
|
|
40
|
-
"@newskit-render/validation": "^1.20.20
|
|
37
|
+
"@newskit-render/api": "^1.16.60",
|
|
38
|
+
"@newskit-render/feature-flags": "^1.11.76",
|
|
39
|
+
"@newskit-render/shared-components": "^4.53.25",
|
|
40
|
+
"@newskit-render/validation": "^1.20.20",
|
|
41
41
|
"@stripe/react-stripe-js": "2.1.1",
|
|
42
42
|
"@stripe/stripe-js": "1.54.1",
|
|
43
43
|
"cross-fetch": "3.1.5",
|