@newskit-render/my-account 3.18.0-alpha.0 → 3.18.1-alpha.0
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/README.md +0 -3
- package/dist/cjs/Components/Sections/Form/onFormSubmit.js +5 -4
- package/dist/cjs/Components/Sections/Form/onFormSubmit.js.map +1 -1
- package/dist/cjs/config/index.d.ts +1 -2
- package/dist/cjs/config/index.js +3 -8
- package/dist/cjs/config/index.js.map +1 -1
- package/dist/cjs/getProviderProps.js +16 -25
- package/dist/cjs/getProviderProps.js.map +1 -1
- package/dist/cjs/helpers/getAcsCookie.d.ts +2 -1
- package/dist/cjs/helpers/getAcsCookie.js +15 -4
- package/dist/cjs/helpers/getAcsCookie.js.map +1 -1
- package/dist/esm/Components/Sections/Form/onFormSubmit.js +3 -2
- package/dist/esm/Components/Sections/Form/onFormSubmit.js.map +1 -1
- package/dist/esm/config/index.d.ts +1 -2
- package/dist/esm/config/index.js +2 -7
- package/dist/esm/config/index.js.map +1 -1
- package/dist/esm/getProviderProps.js +18 -24
- package/dist/esm/getProviderProps.js.map +1 -1
- package/dist/esm/helpers/getAcsCookie.d.ts +2 -1
- package/dist/esm/helpers/getAcsCookie.js +10 -3
- package/dist/esm/helpers/getAcsCookie.js.map +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -26,11 +26,9 @@ We assume that you already have created CPS (formerly MAIN) tenant for your titl
|
|
|
26
26
|
|
|
27
27
|
```
|
|
28
28
|
MAIN_GRAPHQL_URL=""
|
|
29
|
-
MAIN_COOKIE_NAME=""
|
|
30
29
|
```
|
|
31
30
|
|
|
32
31
|
MAIN_GRAPHQL_URL: This is the main graphql endpoint for your tenant. You can ask someone from your team, or a member from main to provide it for you.
|
|
33
|
-
MAIN_COOKIE_NAME: The prefix of the cookie that MAIN returns to you e.g acs_ngn.
|
|
34
32
|
You can see examples of the other environment variables [here](https://
|
|
35
33
|
|
|
36
34
|
If you are interested in my-account - main integration and you want some in-depth info about it, you can have a look at our space in [confluence](https://nidigitalsolutions.jira.com/wiki/spaces/NPP/pages/3004694700/PP+My+Account+-+MAIN)
|
|
@@ -41,7 +39,6 @@ In order to run the application,we need the following required environment varia
|
|
|
41
39
|
|
|
42
40
|
```
|
|
43
41
|
PUBLISHER=""
|
|
44
|
-
MAIN_COOKIE_NAME=""
|
|
45
42
|
MAIN_GRAPHQL_URL=""
|
|
46
43
|
```
|
|
47
44
|
|
|
@@ -53,16 +53,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
53
53
|
var cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
54
54
|
var localStorage_1 = require("../../../helpers/localStorage");
|
|
55
55
|
var cookie_1 = __importDefault(require("cookie"));
|
|
56
|
-
var
|
|
56
|
+
var api_1 = require("@newskit-render/api");
|
|
57
57
|
var types_1 = require("../../../context/types");
|
|
58
58
|
var onSubmit = function (e, validationSchemaKey, router, handleError, handleSuccess, redirectUrl, setShowModal, subscriptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
59
|
-
var body, cookies, type, postcode, response, parsedText, result_1, result, parsedText;
|
|
59
|
+
var body, cookies, mainCookieName, type, postcode, response, parsedText, result_1, result, parsedText;
|
|
60
60
|
var _a, _b;
|
|
61
61
|
return __generator(this, function (_c) {
|
|
62
62
|
switch (_c.label) {
|
|
63
63
|
case 0:
|
|
64
64
|
body = JSON.stringify(__assign(__assign({}, e), { validationSchemaKey: validationSchemaKey }));
|
|
65
65
|
cookies = cookie_1.default.parse(document.cookie);
|
|
66
|
+
mainCookieName = (0, api_1.findCookieName)(cookie_1.default);
|
|
66
67
|
type = (_a = subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions[0]) === null || _a === void 0 ? void 0 : _a.type;
|
|
67
68
|
if (!(e &&
|
|
68
69
|
e.postcode &&
|
|
@@ -75,7 +76,7 @@ var onSubmit = function (e, validationSchemaKey, router, handleError, handleSucc
|
|
|
75
76
|
redirect: 'follow',
|
|
76
77
|
headers: {
|
|
77
78
|
'Content-Type': 'application/json',
|
|
78
|
-
acs: cookie_1.default.serialize(
|
|
79
|
+
acs: cookie_1.default.serialize(mainCookieName, cookies[mainCookieName]),
|
|
79
80
|
},
|
|
80
81
|
body: JSON.stringify({ postcode: postcode, validationSchemaKey: 'postcode' }),
|
|
81
82
|
})];
|
|
@@ -103,7 +104,7 @@ var onSubmit = function (e, validationSchemaKey, router, handleError, handleSucc
|
|
|
103
104
|
redirect: 'follow',
|
|
104
105
|
headers: {
|
|
105
106
|
'Content-Type': 'application/json',
|
|
106
|
-
acs: cookie_1.default.serialize(
|
|
107
|
+
acs: cookie_1.default.serialize(mainCookieName, cookies[mainCookieName]),
|
|
107
108
|
},
|
|
108
109
|
body: body,
|
|
109
110
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA+B;AAE/B,8DAAgE;AAChE,kDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export declare const getSanitizedConfig: () => {
|
|
2
|
-
mainCookieName: string;
|
|
3
2
|
acsSessionUrl: string;
|
|
4
3
|
loqaccountKey: string;
|
|
5
4
|
publisher: string;
|
|
@@ -15,4 +14,4 @@ export declare const getSanitizedConfig: () => {
|
|
|
15
14
|
mainGraphqlUrl: string;
|
|
16
15
|
zuoraPageId: string;
|
|
17
16
|
};
|
|
18
|
-
export declare const
|
|
17
|
+
export declare const acsSessionUrl: string, loqaccountKey: string, publisher: string, mainInternalAuthODomain: string, mainInternalClientId: string, mainInternalConnection: string, passwоrdUrlLifetime: string, stripeKey: string, sailthruDomain: string, sailthruApiSecret: string, title: string, zuoraRsaSignatureUri: string, mainGraphqlUrl: string, zuoraPageId: string;
|
package/dist/cjs/config/index.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.zuoraPageId = exports.mainGraphqlUrl = exports.zuoraRsaSignatureUri = exports.title = exports.sailthruApiSecret = exports.sailthruDomain = exports.stripeKey = exports.passwоrdUrlLifetime = exports.mainInternalConnection = exports.mainInternalClientId = exports.mainInternalAuthODomain = exports.publisher = exports.loqaccountKey = exports.acsSessionUrl = exports.
|
|
4
|
-
var requiredConfigFields = [
|
|
5
|
-
'PUBLISHER',
|
|
6
|
-
'MAIN_COOKIE_NAME',
|
|
7
|
-
'MAIN_GRAPHQL_URL',
|
|
8
|
-
];
|
|
3
|
+
exports.zuoraPageId = exports.mainGraphqlUrl = exports.zuoraRsaSignatureUri = exports.title = exports.sailthruApiSecret = exports.sailthruDomain = exports.stripeKey = exports.passwоrdUrlLifetime = exports.mainInternalConnection = exports.mainInternalClientId = exports.mainInternalAuthODomain = exports.publisher = exports.loqaccountKey = exports.acsSessionUrl = exports.getSanitizedConfig = void 0;
|
|
4
|
+
var requiredConfigFields = ['PUBLISHER', 'MAIN_GRAPHQL_URL'];
|
|
9
5
|
var getSanitizedConfig = function () {
|
|
10
6
|
for (var _i = 0, requiredConfigFields_1 = requiredConfigFields; _i < requiredConfigFields_1.length; _i++) {
|
|
11
7
|
var key = requiredConfigFields_1[_i];
|
|
@@ -16,7 +12,6 @@ var getSanitizedConfig = function () {
|
|
|
16
12
|
}
|
|
17
13
|
}
|
|
18
14
|
return {
|
|
19
|
-
mainCookieName: process.env.MAIN_COOKIE_NAME,
|
|
20
15
|
acsSessionUrl: process.env.ACS_SESSION_URL,
|
|
21
16
|
loqaccountKey: process.env.LOQACCOUNT_KEY,
|
|
22
17
|
publisher: process.env.PUBLISHER,
|
|
@@ -35,5 +30,5 @@ var getSanitizedConfig = function () {
|
|
|
35
30
|
};
|
|
36
31
|
exports.getSanitizedConfig = getSanitizedConfig;
|
|
37
32
|
var sanitizedConfig = (0, exports.getSanitizedConfig)();
|
|
38
|
-
exports.
|
|
33
|
+
exports.acsSessionUrl = sanitizedConfig.acsSessionUrl, exports.loqaccountKey = sanitizedConfig.loqaccountKey, exports.publisher = sanitizedConfig.publisher, exports.mainInternalAuthODomain = sanitizedConfig.mainInternalAuthODomain, exports.mainInternalClientId = sanitizedConfig.mainInternalClientId, exports.mainInternalConnection = sanitizedConfig.mainInternalConnection, exports.passwоrdUrlLifetime = sanitizedConfig.passwоrdUrlLifetime, exports.stripeKey = sanitizedConfig.stripeKey, exports.sailthruDomain = sanitizedConfig.sailthruDomain, exports.sailthruApiSecret = sanitizedConfig.sailthruApiSecret, exports.title = sanitizedConfig.title, exports.zuoraRsaSignatureUri = sanitizedConfig.zuoraRsaSignatureUri, exports.mainGraphqlUrl = sanitizedConfig.mainGraphqlUrl, exports.zuoraPageId = sanitizedConfig.zuoraPageId;
|
|
39
34
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAA,IAAM,oBAAoB,GAAa
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAA,IAAM,oBAAoB,GAAa,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;AACjE,IAAM,kBAAkB,GAAG;IAChC,KAAkB,UAAoB,EAApB,6CAAoB,EAApB,kCAAoB,EAApB,IAAoB,EAAE;QAAnC,IAAM,GAAG,6BAAA;QACZ,IAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC9B,IACE,OAAO,MAAM,IAAI,WAAW;YAC5B,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,EAC1C;YACA,MAAM,IAAI,KAAK,CAAC,sBAAe,GAAG,YAAS,CAAC,CAAA;SAC7C;KACF;IACD,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;QACpD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAwB;QACnD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAmB;QAC1C,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAAoC;QACzE,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAiC;QACnE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAkC;QACtE,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;QAChE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC3C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;QACrD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;QAC5D,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAe;QAClC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAiC;QACnE,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;QACtD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,aAAuB;KACjD,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,kBAAkB,sBA0B9B;AACD,IAAM,eAAe,GAAG,IAAA,0BAAkB,GAAE,CAAA;AAE1C,QAAA,aAAa,GAcX,eAAe,gBAbjB,QAAA,aAAa,GAaX,eAAe,gBAZjB,QAAA,SAAS,GAYP,eAAe,YAXjB,QAAA,uBAAuB,GAWrB,eAAe,0BAVjB,QAAA,oBAAoB,GAUlB,eAAe,uBATjB,QAAA,sBAAsB,GASpB,eAAe,yBARjB,QAAA,mBAAmB,GAQjB,eAAe,sBAPjB,QAAA,SAAS,GAOP,eAAe,YANjB,QAAA,cAAc,GAMZ,eAAe,iBALjB,QAAA,iBAAiB,GAKf,eAAe,oBAJjB,QAAA,KAAK,GAIH,eAAe,QAHjB,QAAA,oBAAoB,GAGlB,eAAe,uBAFjB,QAAA,cAAc,GAEZ,eAAe,iBADjB,QAAA,WAAW,GACT,eAAe,aAAA"}
|
|
@@ -46,20 +46,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
-
};
|
|
52
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
50
|
exports.getProviderProps = void 0;
|
|
54
51
|
var api_1 = require("@newskit-render/api");
|
|
55
52
|
var providers_1 = require("./providers");
|
|
56
|
-
var cookie_1 = __importDefault(require("cookie"));
|
|
57
53
|
var config_1 = require("./config");
|
|
58
54
|
var helpers_1 = require("./helpers");
|
|
59
55
|
var getProviderProps = function (context, props) { return __awaiter(void 0, void 0, void 0, function () {
|
|
60
|
-
var provider, providerPropsMapper, newAcsToken,
|
|
61
|
-
return __generator(this, function (
|
|
62
|
-
switch (
|
|
56
|
+
var provider, providerPropsMapper, newAcsToken, cookieName, _a, value, mainCookieName, _b, mainApolloClient, nkApiApolloClient, responseAll, successResponse, rejectedResponse, providerProps, paymentUser, fullUser;
|
|
57
|
+
return __generator(this, function (_c) {
|
|
58
|
+
switch (_c.label) {
|
|
63
59
|
case 0:
|
|
64
60
|
provider = context.provider;
|
|
65
61
|
providerPropsMapper = {
|
|
@@ -71,26 +67,21 @@ var getProviderProps = function (context, props) { return __awaiter(void 0, void
|
|
|
71
67
|
Cancellation: providers_1.subscriptionAndBillingProvider,
|
|
72
68
|
Payment: providers_1.paymentProvider,
|
|
73
69
|
};
|
|
74
|
-
if (!context.req.headers.cookie
|
|
75
|
-
|
|
76
|
-
if (!(!requestCookies[config_1.mainCookieName] && config_1.acsSessionUrl)) return [3 /*break*/, 2];
|
|
70
|
+
if (!((!context.req.headers.cookie && config_1.acsSessionUrl) ||
|
|
71
|
+
((0, helpers_1.checkCookie)(context) && config_1.acsSessionUrl))) return [3 /*break*/, 2];
|
|
77
72
|
return [4 /*yield*/, (0, api_1.fetchSessionCookie)()];
|
|
78
73
|
case 1:
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
case 4
|
|
85
|
-
|
|
86
|
-
(0, helpers_1.setAcsCookie)(context, newAcsToken);
|
|
87
|
-
_b.label = 5;
|
|
88
|
-
case 5: return [4 /*yield*/, Promise.all([
|
|
89
|
-
(0, api_1.createApolloClient)(api_1.ClientTypes.main, context.req.headers.cookie, newAcsToken),
|
|
74
|
+
_a = _c.sent(), value = _a.value, mainCookieName = _a.mainCookieName;
|
|
75
|
+
newAcsToken = value;
|
|
76
|
+
cookieName = mainCookieName;
|
|
77
|
+
(0, helpers_1.setAcsCookie)(context, mainCookieName, value);
|
|
78
|
+
_c.label = 2;
|
|
79
|
+
case 2: return [4 /*yield*/, Promise.all([
|
|
80
|
+
(0, api_1.createApolloClient)(api_1.ClientTypes.main, context.req.headers.cookie, newAcsToken, cookieName),
|
|
90
81
|
(0, api_1.createApolloClient)(api_1.ClientTypes.nkapi, context.req.headers.cookie, newAcsToken),
|
|
91
82
|
])];
|
|
92
|
-
case
|
|
93
|
-
|
|
83
|
+
case 3:
|
|
84
|
+
_b = _c.sent(), mainApolloClient = _b[0], nkApiApolloClient = _b[1];
|
|
94
85
|
return [4 /*yield*/, Promise.allSettled([
|
|
95
86
|
providerPropsMapper[provider]({
|
|
96
87
|
mainApolloClient: mainApolloClient,
|
|
@@ -99,8 +90,8 @@ var getProviderProps = function (context, props) { return __awaiter(void 0, void
|
|
|
99
90
|
}),
|
|
100
91
|
(0, providers_1.userPaymentInfoProvider)(mainApolloClient),
|
|
101
92
|
])];
|
|
102
|
-
case
|
|
103
|
-
responseAll =
|
|
93
|
+
case 4:
|
|
94
|
+
responseAll = _c.sent();
|
|
104
95
|
successResponse = responseAll.filter(function (data) { return data.status === 'fulfilled'; });
|
|
105
96
|
rejectedResponse = responseAll.filter(function (res) { return res.status === 'rejected'; });
|
|
106
97
|
rejectedResponse.forEach(function (err) { return console.error(err.reason.message); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { ServerSidePropsContext } from 'providers';
|
|
2
|
-
export declare const setAcsCookie: (context: ServerSidePropsContext,
|
|
2
|
+
export declare const setAcsCookie: (context: ServerSidePropsContext, mainCookieName: string, acsToken?: string) => void;
|
|
3
|
+
export declare const checkCookie: (context: ServerSidePropsContext) => boolean;
|
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setAcsCookie = void 0;
|
|
4
|
-
var
|
|
5
|
-
var
|
|
6
|
-
|
|
6
|
+
exports.checkCookie = exports.setAcsCookie = void 0;
|
|
7
|
+
var cookie_1 = __importDefault(require("cookie"));
|
|
8
|
+
var api_1 = require("@newskit-render/api");
|
|
9
|
+
var setAcsCookie = function (context, mainCookieName, acsToken) {
|
|
10
|
+
if (mainCookieName in api_1.CookieName) {
|
|
11
|
+
context.res.setHeader('Set-Cookie', "".concat(mainCookieName, "=").concat(acsToken, ";expires=").concat(new Date(Date.now() + 86400 * 1000).toUTCString() + 86400, "; path=/;"));
|
|
12
|
+
}
|
|
7
13
|
};
|
|
8
14
|
exports.setAcsCookie = setAcsCookie;
|
|
15
|
+
var checkCookie = function (context) {
|
|
16
|
+
var requestCookies = cookie_1.default.parse(context.req.headers.cookie);
|
|
17
|
+
return !requestCookies[(0, api_1.findCookieName)(requestCookies)];
|
|
18
|
+
};
|
|
19
|
+
exports.checkCookie = checkCookie;
|
|
9
20
|
//# sourceMappingURL=getAcsCookie.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAcsCookie.js","sourceRoot":"","sources":["../../../src/helpers/getAcsCookie.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getAcsCookie.js","sourceRoot":"","sources":["../../../src/helpers/getAcsCookie.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA2B;AAE3B,2CAAgE;AACzD,IAAM,YAAY,GAAG,UAC1B,OAA+B,EAC/B,cAAsB,EACtB,QAAiB;IAEjB,IAAI,cAAc,IAAI,gBAAU,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,SAAS,CACnB,YAAY,EACZ,UAAG,cAAc,cAAI,QAAQ,sBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,cAChD,CACZ,CAAA;KACF;AACH,CAAC,CAAA;AAbY,QAAA,YAAY,gBAaxB;AAEM,IAAM,WAAW,GAAG,UAAC,OAA+B;IACzD,IAAM,cAAc,GAAG,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,OAAO,CAAC,cAAc,CAAC,IAAA,oBAAc,EAAC,cAAc,CAAC,CAAC,CAAA;AACxD,CAAC,CAAA;AAHY,QAAA,WAAW,eAGvB"}
|
|
@@ -48,16 +48,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
48
48
|
import fetch from 'cross-fetch';
|
|
49
49
|
import { saveLocalStorage } from '../../../helpers/localStorage';
|
|
50
50
|
import cookie from 'cookie';
|
|
51
|
-
import {
|
|
51
|
+
import { findCookieName } from '@newskit-render/api';
|
|
52
52
|
import { SubscriptionType } from '../../../context/types';
|
|
53
53
|
var onSubmit = function (e, validationSchemaKey, router, handleError, handleSuccess, redirectUrl, setShowModal, subscriptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
54
|
-
var body, cookies, type, postcode, response, parsedText, result_1, result, parsedText;
|
|
54
|
+
var body, cookies, mainCookieName, type, postcode, response, parsedText, result_1, result, parsedText;
|
|
55
55
|
var _a, _b;
|
|
56
56
|
return __generator(this, function (_c) {
|
|
57
57
|
switch (_c.label) {
|
|
58
58
|
case 0:
|
|
59
59
|
body = JSON.stringify(__assign(__assign({}, e), { validationSchemaKey: validationSchemaKey }));
|
|
60
60
|
cookies = cookie.parse(document.cookie);
|
|
61
|
+
mainCookieName = findCookieName(cookie);
|
|
61
62
|
type = (_a = subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions[0]) === null || _a === void 0 ? void 0 : _a.type;
|
|
62
63
|
if (!(e &&
|
|
63
64
|
e.postcode &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,KAAK,MAAM,aAAa,CAAA;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"onFormSubmit.js","sourceRoot":"","sources":["../../../../../src/Components/Sections/Form/onFormSubmit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export declare const getSanitizedConfig: () => {
|
|
2
|
-
mainCookieName: string;
|
|
3
2
|
acsSessionUrl: string;
|
|
4
3
|
loqaccountKey: string;
|
|
5
4
|
publisher: string;
|
|
@@ -15,4 +14,4 @@ export declare const getSanitizedConfig: () => {
|
|
|
15
14
|
mainGraphqlUrl: string;
|
|
16
15
|
zuoraPageId: string;
|
|
17
16
|
};
|
|
18
|
-
export declare const
|
|
17
|
+
export declare const acsSessionUrl: string, loqaccountKey: string, publisher: string, mainInternalAuthODomain: string, mainInternalClientId: string, mainInternalConnection: string, passwоrdUrlLifetime: string, stripeKey: string, sailthruDomain: string, sailthruApiSecret: string, title: string, zuoraRsaSignatureUri: string, mainGraphqlUrl: string, zuoraPageId: string;
|
package/dist/esm/config/index.js
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
var requiredConfigFields = [
|
|
2
|
-
'PUBLISHER',
|
|
3
|
-
'MAIN_COOKIE_NAME',
|
|
4
|
-
'MAIN_GRAPHQL_URL',
|
|
5
|
-
];
|
|
1
|
+
var requiredConfigFields = ['PUBLISHER', 'MAIN_GRAPHQL_URL'];
|
|
6
2
|
export var getSanitizedConfig = function () {
|
|
7
3
|
for (var _i = 0, requiredConfigFields_1 = requiredConfigFields; _i < requiredConfigFields_1.length; _i++) {
|
|
8
4
|
var key = requiredConfigFields_1[_i];
|
|
@@ -13,7 +9,6 @@ export var getSanitizedConfig = function () {
|
|
|
13
9
|
}
|
|
14
10
|
}
|
|
15
11
|
return {
|
|
16
|
-
mainCookieName: process.env.MAIN_COOKIE_NAME,
|
|
17
12
|
acsSessionUrl: process.env.ACS_SESSION_URL,
|
|
18
13
|
loqaccountKey: process.env.LOQACCOUNT_KEY,
|
|
19
14
|
publisher: process.env.PUBLISHER,
|
|
@@ -31,5 +26,5 @@ export var getSanitizedConfig = function () {
|
|
|
31
26
|
};
|
|
32
27
|
};
|
|
33
28
|
var sanitizedConfig = getSanitizedConfig();
|
|
34
|
-
export var
|
|
29
|
+
export var acsSessionUrl = sanitizedConfig.acsSessionUrl, loqaccountKey = sanitizedConfig.loqaccountKey, publisher = sanitizedConfig.publisher, mainInternalAuthODomain = sanitizedConfig.mainInternalAuthODomain, mainInternalClientId = sanitizedConfig.mainInternalClientId, mainInternalConnection = sanitizedConfig.mainInternalConnection, passwоrdUrlLifetime = sanitizedConfig.passwоrdUrlLifetime, stripeKey = sanitizedConfig.stripeKey, sailthruDomain = sanitizedConfig.sailthruDomain, sailthruApiSecret = sanitizedConfig.sailthruApiSecret, title = sanitizedConfig.title, zuoraRsaSignatureUri = sanitizedConfig.zuoraRsaSignatureUri, mainGraphqlUrl = sanitizedConfig.mainGraphqlUrl, zuoraPageId = sanitizedConfig.zuoraPageId;
|
|
35
30
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,IAAM,oBAAoB,GAAa
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,IAAM,oBAAoB,GAAa,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;AACxE,MAAM,CAAC,IAAM,kBAAkB,GAAG;IAChC,KAAkB,UAAoB,EAApB,6CAAoB,EAApB,kCAAoB,EAApB,IAAoB,EAAE;QAAnC,IAAM,GAAG,6BAAA;QACZ,IAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC9B,IACE,OAAO,MAAM,IAAI,WAAW;YAC5B,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,EAC1C;YACA,MAAM,IAAI,KAAK,CAAC,sBAAe,GAAG,YAAS,CAAC,CAAA;SAC7C;KACF;IACD,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;QACpD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAwB;QACnD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAmB;QAC1C,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,0BAAoC;QACzE,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAiC;QACnE,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAkC;QACtE,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;QAChE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QAC3C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;QACrD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;QAC5D,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAe;QAClC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAiC;QACnE,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;QACtD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,aAAuB;KACjD,CAAA;AACH,CAAC,CAAA;AACD,IAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;AAC5C,MAAM,CACJ,IAAA,aAAa,GAcX,eAAe,cAdJ,EACb,aAAa,GAaX,eAAe,cAbJ,EACb,SAAS,GAYP,eAAe,UAZR,EACT,uBAAuB,GAWrB,eAAe,wBAXM,EACvB,oBAAoB,GAUlB,eAAe,qBAVG,EACpB,sBAAsB,GASpB,eAAe,uBATK,EACtB,mBAAmB,GAQjB,eAAe,oBARE,EACnB,SAAS,GAOP,eAAe,UAPR,EACT,cAAc,GAMZ,eAAe,eANH,EACd,iBAAiB,GAKf,eAAe,kBALA,EACjB,KAAK,GAIH,eAAe,MAJZ,EACL,oBAAoB,GAGlB,eAAe,qBAHG,EACpB,cAAc,GAEZ,eAAe,eAFH,EACd,WAAW,GACT,eAAe,YADN,CACM"}
|
|
@@ -47,13 +47,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
47
|
};
|
|
48
48
|
import { createApolloClient, ClientTypes, fetchSessionCookie, } from '@newskit-render/api';
|
|
49
49
|
import { editFieldProvider, newslettersAndAlertsProvider, personalDetailsProvider, subscriptionAndBillingProvider, paymentProvider, userPaymentInfoProvider, holidayStopProvider, } from './providers';
|
|
50
|
-
import
|
|
51
|
-
import {
|
|
52
|
-
import { setAcsCookie } from './helpers';
|
|
50
|
+
import { acsSessionUrl, loqaccountKey } from './config';
|
|
51
|
+
import { setAcsCookie, checkCookie } from './helpers';
|
|
53
52
|
export var getProviderProps = function (context, props) { return __awaiter(void 0, void 0, void 0, function () {
|
|
54
|
-
var provider, providerPropsMapper, newAcsToken,
|
|
55
|
-
return __generator(this, function (
|
|
56
|
-
switch (
|
|
53
|
+
var provider, providerPropsMapper, newAcsToken, cookieName, _a, value, mainCookieName, _b, mainApolloClient, nkApiApolloClient, responseAll, successResponse, rejectedResponse, providerProps, paymentUser, fullUser;
|
|
54
|
+
return __generator(this, function (_c) {
|
|
55
|
+
switch (_c.label) {
|
|
57
56
|
case 0:
|
|
58
57
|
provider = context.provider;
|
|
59
58
|
providerPropsMapper = {
|
|
@@ -65,26 +64,21 @@ export var getProviderProps = function (context, props) { return __awaiter(void
|
|
|
65
64
|
Cancellation: subscriptionAndBillingProvider,
|
|
66
65
|
Payment: paymentProvider,
|
|
67
66
|
};
|
|
68
|
-
if (!context.req.headers.cookie
|
|
69
|
-
|
|
70
|
-
if (!(!requestCookies[mainCookieName] && acsSessionUrl)) return [3 /*break*/, 2];
|
|
67
|
+
if (!((!context.req.headers.cookie && acsSessionUrl) ||
|
|
68
|
+
(checkCookie(context) && acsSessionUrl))) return [3 /*break*/, 2];
|
|
71
69
|
return [4 /*yield*/, fetchSessionCookie()];
|
|
72
70
|
case 1:
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
case 4
|
|
79
|
-
|
|
80
|
-
setAcsCookie(context, newAcsToken);
|
|
81
|
-
_b.label = 5;
|
|
82
|
-
case 5: return [4 /*yield*/, Promise.all([
|
|
83
|
-
createApolloClient(ClientTypes.main, context.req.headers.cookie, newAcsToken),
|
|
71
|
+
_a = _c.sent(), value = _a.value, mainCookieName = _a.mainCookieName;
|
|
72
|
+
newAcsToken = value;
|
|
73
|
+
cookieName = mainCookieName;
|
|
74
|
+
setAcsCookie(context, mainCookieName, value);
|
|
75
|
+
_c.label = 2;
|
|
76
|
+
case 2: return [4 /*yield*/, Promise.all([
|
|
77
|
+
createApolloClient(ClientTypes.main, context.req.headers.cookie, newAcsToken, cookieName),
|
|
84
78
|
createApolloClient(ClientTypes.nkapi, context.req.headers.cookie, newAcsToken),
|
|
85
79
|
])];
|
|
86
|
-
case
|
|
87
|
-
|
|
80
|
+
case 3:
|
|
81
|
+
_b = _c.sent(), mainApolloClient = _b[0], nkApiApolloClient = _b[1];
|
|
88
82
|
return [4 /*yield*/, Promise.allSettled([
|
|
89
83
|
providerPropsMapper[provider]({
|
|
90
84
|
mainApolloClient: mainApolloClient,
|
|
@@ -93,8 +87,8 @@ export var getProviderProps = function (context, props) { return __awaiter(void
|
|
|
93
87
|
}),
|
|
94
88
|
userPaymentInfoProvider(mainApolloClient),
|
|
95
89
|
])];
|
|
96
|
-
case
|
|
97
|
-
responseAll =
|
|
90
|
+
case 4:
|
|
91
|
+
responseAll = _c.sent();
|
|
98
92
|
successResponse = responseAll.filter(function (data) { return data.status === 'fulfilled'; });
|
|
99
93
|
rejectedResponse = responseAll.filter(function (res) { return res.status === 'rejected'; });
|
|
100
94
|
rejectedResponse.forEach(function (err) { return console.error(err.reason.message); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,GACnB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACL,iBAAiB,EACjB,4BAA4B,EAC5B,uBAAuB,EAEvB,8BAA8B,EAC9B,eAAe,EACf,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { ServerSidePropsContext } from 'providers';
|
|
2
|
-
export declare const setAcsCookie: (context: ServerSidePropsContext,
|
|
2
|
+
export declare const setAcsCookie: (context: ServerSidePropsContext, mainCookieName: string, acsToken?: string) => void;
|
|
3
|
+
export declare const checkCookie: (context: ServerSidePropsContext) => boolean;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import cookie from 'cookie';
|
|
2
|
+
import { CookieName, findCookieName } from '@newskit-render/api';
|
|
3
|
+
export var setAcsCookie = function (context, mainCookieName, acsToken) {
|
|
4
|
+
if (mainCookieName in CookieName) {
|
|
5
|
+
context.res.setHeader('Set-Cookie', "".concat(mainCookieName, "=").concat(acsToken, ";expires=").concat(new Date(Date.now() + 86400 * 1000).toUTCString() + 86400, "; path=/;"));
|
|
6
|
+
}
|
|
7
|
+
};
|
|
8
|
+
export var checkCookie = function (context) {
|
|
9
|
+
var requestCookies = cookie.parse(context.req.headers.cookie);
|
|
10
|
+
return !requestCookies[findCookieName(requestCookies)];
|
|
4
11
|
};
|
|
5
12
|
//# sourceMappingURL=getAcsCookie.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAcsCookie.js","sourceRoot":"","sources":["../../../src/helpers/getAcsCookie.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getAcsCookie.js","sourceRoot":"","sources":["../../../src/helpers/getAcsCookie.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAChE,MAAM,CAAC,IAAM,YAAY,GAAG,UAC1B,OAA+B,EAC/B,cAAsB,EACtB,QAAiB;IAEjB,IAAI,cAAc,IAAI,UAAU,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,SAAS,CACnB,YAAY,EACZ,UAAG,cAAc,cAAI,QAAQ,sBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,cAChD,CACZ,CAAA;KACF;AACH,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,OAA+B;IACzD,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAA;AACxD,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/my-account",
|
|
3
|
-
"version": "3.18.
|
|
3
|
+
"version": "3.18.1-alpha.0",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"@emotion/react": "11.9.3",
|
|
39
39
|
"@emotion/styled": "11.9.3",
|
|
40
40
|
"@hookform/resolvers": "2.5.2",
|
|
41
|
-
"@newskit-render/api": "^1.2.
|
|
42
|
-
"@newskit-render/shared-components": "^1.18.0
|
|
41
|
+
"@newskit-render/api": "^1.2.2-alpha.0",
|
|
42
|
+
"@newskit-render/shared-components": "^1.18.0",
|
|
43
43
|
"@newskit-render/validation": "^1.3.1",
|
|
44
44
|
"@stripe/react-stripe-js": "1.4.1",
|
|
45
45
|
"@stripe/stripe-js": "1.17.0",
|