@newskit-render/api 1.5.6 → 1.6.0-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/dist/cjs/apolloClient/createApolloClient.d.ts +1 -1
- package/dist/cjs/apolloClient/createApolloClient.js +3 -3
- package/dist/cjs/apolloClient/createApolloClient.js.map +1 -1
- package/dist/cjs/config/index.d.ts +1 -1
- package/dist/cjs/config/index.js +3 -2
- package/dist/cjs/config/index.js.map +1 -1
- package/dist/cjs/fetchSessionCookie/fetchSessionCookie.d.ts +1 -1
- package/dist/cjs/fetchSessionCookie/fetchSessionCookie.js +4 -4
- package/dist/cjs/fetchSessionCookie/fetchSessionCookie.js.map +1 -1
- package/dist/cjs/helpers/externalLinks/index.js +2 -2
- package/dist/cjs/helpers/externalLinks/index.js.map +1 -1
- package/dist/esm/apolloClient/createApolloClient.d.ts +1 -1
- package/dist/esm/apolloClient/createApolloClient.js +4 -4
- package/dist/esm/apolloClient/createApolloClient.js.map +1 -1
- package/dist/esm/config/index.d.ts +1 -1
- package/dist/esm/config/index.js +2 -1
- package/dist/esm/config/index.js.map +1 -1
- package/dist/esm/fetchSessionCookie/fetchSessionCookie.d.ts +1 -1
- package/dist/esm/fetchSessionCookie/fetchSessionCookie.js +4 -4
- package/dist/esm/fetchSessionCookie/fetchSessionCookie.js.map +1 -1
- package/dist/esm/helpers/externalLinks/index.js +2 -2
- package/dist/esm/helpers/externalLinks/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ApolloHttpClient, Client, Config } from './types';
|
|
2
|
-
export declare const createApolloClient: (client: Client, cookie?: string, token?: string,
|
|
2
|
+
export declare const createApolloClient: (client: Client, cookie?: string, token?: string, accountProviderCookieName?: string, config?: Config) => Promise<ApolloHttpClient>;
|
|
@@ -41,7 +41,7 @@ var createClient_1 = require("./createClient");
|
|
|
41
41
|
var helpers_1 = require("../helpers");
|
|
42
42
|
var types_1 = require("./types");
|
|
43
43
|
var config_1 = require("../config");
|
|
44
|
-
var createApolloClient = function (client, cookie, token,
|
|
44
|
+
var createApolloClient = function (client, cookie, token, accountProviderCookieName, config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
45
|
var headers, apiXApiKey, apiEnvUrl;
|
|
46
46
|
return __generator(this, function (_a) {
|
|
47
47
|
switch (_a.label) {
|
|
@@ -51,10 +51,10 @@ var createApolloClient = function (client, cookie, token, mainCookieName, config
|
|
|
51
51
|
case 1:
|
|
52
52
|
headers = _a.sent();
|
|
53
53
|
if (!headers && config_1.acsSessionUrl) {
|
|
54
|
-
headers = { Cookie: "".concat(
|
|
54
|
+
headers = { Cookie: "".concat(accountProviderCookieName, "=").concat(token) };
|
|
55
55
|
}
|
|
56
56
|
return [2 /*return*/, (0, createClient_1.createClient)({
|
|
57
|
-
uri: config_1.mainGraphqlUrl,
|
|
57
|
+
uri: config_1.accountProviderGraphqlUrl || config_1.mainGraphqlUrl,
|
|
58
58
|
links: [helpers_1.retryLink, helpers_1.errorLink],
|
|
59
59
|
headers: headers,
|
|
60
60
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6C;AAC7C,sCAA+D;AAE/D,iCAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6C;AAC7C,sCAA+D;AAE/D,iCAAuE;AACvE,oCAMkB;AACX,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc,EACd,yBAAkC,EAClC,MAAe;;;;;qBAEX,CAAA,MAAM,KAAK,mBAAW,CAAC,IAAI,CAAA,EAA3B,wBAA2B;gBACf,qBAAM,IAAA,sBAAY,EAAC,mBAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;gBAAtD,OAAO,GAAG,SAA4C;gBAE1D,IAAI,CAAC,OAAO,IAAI,sBAAa,EAAE;oBAC7B,OAAO,GAAG,EAAE,MAAM,EAAE,UAAG,yBAAyB,cAAI,KAAK,CAAE,EAAE,CAAA;iBAC9D;gBAED,sBAAO,IAAA,2BAAY,EAAC;wBAClB,GAAG,EAAE,kCAAyB,IAAI,uBAAc;wBAChD,KAAK,EAAE,CAAC,mBAAS,EAAE,mBAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,mBAAW,CAAC,KAAK,EAAE;oBAC1B,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,0BAAiB,CAAA;oBAClE,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,yBAAgB,CAAA;oBAErE,sBAAO,IAAA,2BAAY,EAAC;4BAClB,GAAG,EAAE,SAAS;4BACd,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,UAAU;oCACvB,mBAAmB,EAAE,IAAA,sBAAY,EAAC,mBAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,UAAU;oCACvB,eAAe,EAAE,SAAS;iCAC3B;yBACN,CAAC,EAAA;iBACH;gBACD,sBAAO,IAAA,2BAAY,EAAC,MAAM,CAAC,EAAA;;;KAC5B,CAAA;AAvCY,QAAA,kBAAkB,sBAuC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const acsTestPassword: string, acsTestAccount: string, newskitApiXApiKey: string, newskitApiEnvUrl: string, mainGraphqlUrl: string, acsSessionUrl: string;
|
|
1
|
+
export declare const acsTestPassword: string, acsTestAccount: string, newskitApiXApiKey: string, newskitApiEnvUrl: string, mainGraphqlUrl: string, accountProviderGraphqlUrl: string, acsSessionUrl: string;
|
package/dist/cjs/config/index.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.acsSessionUrl = exports.mainGraphqlUrl = exports.newskitApiEnvUrl = exports.newskitApiXApiKey = exports.acsTestAccount = exports.acsTestPassword = void 0;
|
|
3
|
+
exports.acsSessionUrl = exports.accountProviderGraphqlUrl = exports.mainGraphqlUrl = exports.newskitApiEnvUrl = exports.newskitApiXApiKey = exports.acsTestAccount = exports.acsTestPassword = void 0;
|
|
4
4
|
var config = {
|
|
5
5
|
acsTestPassword: process.env.ACS_TEST_PASSWORD,
|
|
6
6
|
acsTestAccount: process.env.ACS_TEST_ACCOUNT,
|
|
7
7
|
newskitApiXApiKey: process.env.NEWSKIT_API_X_API_KEY,
|
|
8
8
|
newskitApiEnvUrl: process.env.NEWSKIT_API_ENV_URL,
|
|
9
9
|
mainGraphqlUrl: process.env.MAIN_GRAPHQL_URL,
|
|
10
|
+
accountProviderGraphqlUrl: process.env.ACCOUNT_PROVIDER_GRAPHQL_URL,
|
|
10
11
|
acsSessionUrl: process.env.ACS_SESSION_URL,
|
|
11
12
|
};
|
|
12
|
-
exports.acsTestPassword = config.acsTestPassword, exports.acsTestAccount = config.acsTestAccount, exports.newskitApiXApiKey = config.newskitApiXApiKey, exports.newskitApiEnvUrl = config.newskitApiEnvUrl, exports.mainGraphqlUrl = config.mainGraphqlUrl, exports.acsSessionUrl = config.acsSessionUrl;
|
|
13
|
+
exports.acsTestPassword = config.acsTestPassword, exports.acsTestAccount = config.acsTestAccount, exports.newskitApiXApiKey = config.newskitApiXApiKey, exports.newskitApiEnvUrl = config.newskitApiEnvUrl, exports.mainGraphqlUrl = config.mainGraphqlUrl, exports.accountProviderGraphqlUrl = config.accountProviderGraphqlUrl, exports.acsSessionUrl = config.acsSessionUrl;
|
|
13
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAA,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAA2B;IACxD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;IAC9D,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;CACrD,CAAA;AAGC,QAAA,eAAe,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAA,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAA2B;IACxD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;IAC9D,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,4BAAsC;IAC7E,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;CACrD,CAAA;AAGC,QAAA,eAAe,GAOb,MAAM,kBANR,QAAA,cAAc,GAMZ,MAAM,iBALR,QAAA,iBAAiB,GAKf,MAAM,oBAJR,QAAA,gBAAgB,GAId,MAAM,mBAHR,QAAA,cAAc,GAGZ,MAAM,iBAFR,QAAA,yBAAyB,GAEvB,MAAM,4BADR,QAAA,aAAa,GACX,MAAM,eAAA"}
|
|
@@ -44,7 +44,7 @@ var cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
|
44
44
|
var config_1 = require("../config");
|
|
45
45
|
var types_1 = require("./types");
|
|
46
46
|
var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
-
var response, acsToken, _a, value,
|
|
47
|
+
var response, acsToken, _a, value, accountProviderCookieName, e_1;
|
|
48
48
|
return __generator(this, function (_b) {
|
|
49
49
|
switch (_b.label) {
|
|
50
50
|
case 0: return [4 /*yield*/, (0, cross_fetch_1.default)(config_1.acsSessionUrl, {
|
|
@@ -70,15 +70,15 @@ var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
70
70
|
case 3:
|
|
71
71
|
acsToken = _b.sent();
|
|
72
72
|
if (acsToken) {
|
|
73
|
-
_a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in types_1.CookieName; }), value = _a.value,
|
|
74
|
-
return [2 /*return*/, { value: value,
|
|
73
|
+
_a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in types_1.CookieName; }), value = _a.value, accountProviderCookieName = _a.name;
|
|
74
|
+
return [2 /*return*/, { value: value, accountProviderCookieName: accountProviderCookieName }];
|
|
75
75
|
}
|
|
76
76
|
return [3 /*break*/, 5];
|
|
77
77
|
case 4:
|
|
78
78
|
e_1 = _b.sent();
|
|
79
79
|
/* istanbul ignore next */ console.error(e_1);
|
|
80
80
|
return [3 /*break*/, 5];
|
|
81
|
-
case 5: return [2 /*return*/, {
|
|
81
|
+
case 5: return [2 /*return*/, { accountProviderCookieName: types_1.CookieName.acs_ngn }];
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchSessionCookie.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/fetchSessionCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,oCAA0E;AAC1E,iCAAoC;AAC7B,IAAM,kBAAkB,GAAG;;;;oBAIf,qBAAM,IAAA,qBAAK,EAAC,sBAAuB,EAAE;oBACpD,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,UAAU,EAAE,IAAI;wBAChB,GAAG,EAAE,KAAK;wBACV,eAAe,EAAE;4BACf,QAAQ,EAAE,uBAAc;4BACxB,QAAQ,EAAE,wBAAe;yBAC1B;qBACF,CAAC;oBACF,OAAO,EAAE;wBACP,cAAc,EAAE,kDAAkD;qBACnE;iBACF,CAAC,EAAA;;gBAbI,QAAQ,GAAG,SAaf;;;;gBAGiB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;gBAAhC,QAAQ,GAAG,SAAqB;gBACtC,IAAI,QAAQ,EAAE;oBACN,
|
|
1
|
+
{"version":3,"file":"fetchSessionCookie.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/fetchSessionCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,oCAA0E;AAC1E,iCAAoC;AAC7B,IAAM,kBAAkB,GAAG;;;;oBAIf,qBAAM,IAAA,qBAAK,EAAC,sBAAuB,EAAE;oBACpD,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,UAAU,EAAE,IAAI;wBAChB,GAAG,EAAE,KAAK;wBACV,eAAe,EAAE;4BACf,QAAQ,EAAE,uBAAc;4BACxB,QAAQ,EAAE,wBAAe;yBAC1B;qBACF,CAAC;oBACF,OAAO,EAAE;wBACP,cAAc,EAAE,kDAAkD;qBACnE;iBACF,CAAC,EAAA;;gBAbI,QAAQ,GAAG,SAaf;;;;gBAGiB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;gBAAhC,QAAQ,GAAG,SAAqB;gBACtC,IAAI,QAAQ,EAAE;oBACN,KACJ,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,IAAI,IAAI,kBAAU,EAAzB,CAAyB,CAAC,EADjE,KAAK,WAAA,EAAQ,yBAAyB,UAAA,CAC2B;oBACzE,sBAAO,EAAE,KAAK,OAAA,EAAE,yBAAyB,2BAAA,EAAE,EAAA;iBAC5C;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAO,EAAE,yBAAyB,EAAE,kBAAU,CAAC,OAAO,EAAE,EAAA;;;KACzD,CAAA;AA/BY,QAAA,kBAAkB,sBA+B9B;AAEM,IAAM,cAAc,GAAG,UAC5B,MAAuC;IAEvC,IAAI,MAAM,EAAE;QACV,KAAK,IAAM,MAAI,IAAI,MAAM,EAAE;YACzB,IAAI,MAAI,IAAI,kBAAU,EAAE;gBACtB,OAAO,MAAI,CAAA;aACZ;SACF;KACF;IACD,OAAM;AACR,CAAC,CAAA;AAXY,QAAA,cAAc,kBAW1B"}
|
|
@@ -31,10 +31,10 @@ exports.errorLink = (0, error_1.onError)(function (_a) {
|
|
|
31
31
|
return new client_1.Observable(function (observer) {
|
|
32
32
|
(0, fetchSessionCookie_1.fetchSessionCookie)()
|
|
33
33
|
.then(function (_a) {
|
|
34
|
-
var value = _a.value,
|
|
34
|
+
var value = _a.value, accountProviderCookieName = _a.accountProviderCookieName;
|
|
35
35
|
operation.setContext(function () { return ({
|
|
36
36
|
headers: {
|
|
37
|
-
Cookie: "".concat(
|
|
37
|
+
Cookie: "".concat(accountProviderCookieName, "=").concat(value),
|
|
38
38
|
},
|
|
39
39
|
}); });
|
|
40
40
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/externalLinks/index.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AACrD,mDAAmD;AACnD,yCAAuD;AACvD,+DAA6D;AAC7D,uCAA4C;AAC5C,2DAA2D;AAC9C,QAAA,SAAS,GAAG,IAAI,iBAAS,CAAC;IACrC,KAAK,EAAE;QACL,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,IAAI;KACb;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,CAAC;KACP;CACF,CAAC,CAAA;AAEW,QAAA,SAAS,GAAe,IAAA,eAAO,EAC1C,UAAC,EAAmD;QAAjD,YAAY,kBAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAa,mBAAA;IAChD,IAAI,aAAa,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;KAC7B;IACD,+CAA+C;IAC/C,IACE,aAAa;QACb,aAAa,CAAC,CAAC,CAAC;QAChB,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO;YACtB,8DAA8D;QAChE,sBAAa,EACb;QACA,OAAO,IAAI,mBAAU,CAAC,UAAC,QAAQ;YAC7B,IAAA,uCAAkB,GAAE;iBACjB,IAAI,CAAC,UAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/externalLinks/index.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AACrD,mDAAmD;AACnD,yCAAuD;AACvD,+DAA6D;AAC7D,uCAA4C;AAC5C,2DAA2D;AAC9C,QAAA,SAAS,GAAG,IAAI,iBAAS,CAAC;IACrC,KAAK,EAAE;QACL,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,IAAI;KACb;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,CAAC;KACP;CACF,CAAC,CAAA;AAEW,QAAA,SAAS,GAAe,IAAA,eAAO,EAC1C,UAAC,EAAmD;QAAjD,YAAY,kBAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAa,mBAAA;IAChD,IAAI,aAAa,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;KAC7B;IACD,+CAA+C;IAC/C,IACE,aAAa;QACb,aAAa,CAAC,CAAC,CAAC;QAChB,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO;YACtB,8DAA8D;QAChE,sBAAa,EACb;QACA,OAAO,IAAI,mBAAU,CAAC,UAAC,QAAQ;YAC7B,IAAA,uCAAkB,GAAE;iBACjB,IAAI,CAAC,UAAC,EAAoC;oBAAlC,KAAK,WAAA,EAAE,yBAAyB,+BAAA;gBACvC,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,yBAAyB,cAAI,KAAK,CAAE;qBAChD;iBACF,CAAC,EAJyB,CAIzB,CAAC,CAAA;YACL,CAAC,CAAC;iBACD,IAAI,CAAC;gBACJ,IAAM,UAAU,GAAG;oBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACpC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC3C,CAAA;gBAED,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;YAC1C,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,KAAK;gBACX,+DAA+D;gBAC/D,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACvB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;KACH;IACD,OAAM;AACR,CAAC,CACF,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ApolloHttpClient, Client, Config } from './types';
|
|
2
|
-
export declare const createApolloClient: (client: Client, cookie?: string, token?: string,
|
|
2
|
+
export declare const createApolloClient: (client: Client, cookie?: string, token?: string, accountProviderCookieName?: string, config?: Config) => Promise<ApolloHttpClient>;
|
|
@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
import { createClient } from './createClient';
|
|
38
38
|
import { getAcsCookie, retryLink, errorLink } from '../helpers';
|
|
39
39
|
import { ClientTypes } from './types';
|
|
40
|
-
import { acsSessionUrl, mainGraphqlUrl, newskitApiEnvUrl, newskitApiXApiKey, } from '../config';
|
|
41
|
-
export var createApolloClient = function (client, cookie, token,
|
|
40
|
+
import { acsSessionUrl, mainGraphqlUrl, accountProviderGraphqlUrl, newskitApiEnvUrl, newskitApiXApiKey, } from '../config';
|
|
41
|
+
export var createApolloClient = function (client, cookie, token, accountProviderCookieName, config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
42
|
var headers, apiXApiKey, apiEnvUrl;
|
|
43
43
|
return __generator(this, function (_a) {
|
|
44
44
|
switch (_a.label) {
|
|
@@ -48,10 +48,10 @@ export var createApolloClient = function (client, cookie, token, mainCookieName,
|
|
|
48
48
|
case 1:
|
|
49
49
|
headers = _a.sent();
|
|
50
50
|
if (!headers && acsSessionUrl) {
|
|
51
|
-
headers = { Cookie: "".concat(
|
|
51
|
+
headers = { Cookie: "".concat(accountProviderCookieName, "=").concat(token) };
|
|
52
52
|
}
|
|
53
53
|
return [2 /*return*/, createClient({
|
|
54
|
-
uri: mainGraphqlUrl,
|
|
54
|
+
uri: accountProviderGraphqlUrl || mainGraphqlUrl,
|
|
55
55
|
links: [retryLink, errorLink],
|
|
56
56
|
headers: headers,
|
|
57
57
|
})];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,EAA4B,WAAW,EAAU,MAAM,SAAS,CAAA;AACvE,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,WAAW,CAAA;AAClB,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc,EACd,
|
|
1
|
+
{"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,EAA4B,WAAW,EAAU,MAAM,SAAS,CAAA;AACvE,OAAO,EACL,aAAa,EACb,cAAc,EACd,yBAAyB,EACzB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,WAAW,CAAA;AAClB,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc,EACd,yBAAkC,EAClC,MAAe;;;;;qBAEX,CAAA,MAAM,KAAK,WAAW,CAAC,IAAI,CAAA,EAA3B,wBAA2B;gBACf,qBAAM,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;gBAAtD,OAAO,GAAG,SAA4C;gBAE1D,IAAI,CAAC,OAAO,IAAI,aAAa,EAAE;oBAC7B,OAAO,GAAG,EAAE,MAAM,EAAE,UAAG,yBAAyB,cAAI,KAAK,CAAE,EAAE,CAAA;iBAC9D;gBAED,sBAAO,YAAY,CAAC;wBAClB,GAAG,EAAE,yBAAyB,IAAI,cAAc;wBAChD,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,WAAW,CAAC,KAAK,EAAE;oBAC1B,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAA;oBAClE,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAA;oBAErE,sBAAO,YAAY,CAAC;4BAClB,GAAG,EAAE,SAAS;4BACd,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,UAAU;oCACvB,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,UAAU;oCACvB,eAAe,EAAE,SAAS;iCAC3B;yBACN,CAAC,EAAA;iBACH;gBACD,sBAAO,YAAY,CAAC,MAAM,CAAC,EAAA;;;KAC5B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const acsTestPassword: string, acsTestAccount: string, newskitApiXApiKey: string, newskitApiEnvUrl: string, mainGraphqlUrl: string, acsSessionUrl: string;
|
|
1
|
+
export declare const acsTestPassword: string, acsTestAccount: string, newskitApiXApiKey: string, newskitApiEnvUrl: string, mainGraphqlUrl: string, accountProviderGraphqlUrl: string, acsSessionUrl: string;
|
package/dist/esm/config/index.js
CHANGED
|
@@ -4,7 +4,8 @@ var config = {
|
|
|
4
4
|
newskitApiXApiKey: process.env.NEWSKIT_API_X_API_KEY,
|
|
5
5
|
newskitApiEnvUrl: process.env.NEWSKIT_API_ENV_URL,
|
|
6
6
|
mainGraphqlUrl: process.env.MAIN_GRAPHQL_URL,
|
|
7
|
+
accountProviderGraphqlUrl: process.env.ACCOUNT_PROVIDER_GRAPHQL_URL,
|
|
7
8
|
acsSessionUrl: process.env.ACS_SESSION_URL,
|
|
8
9
|
};
|
|
9
|
-
export var acsTestPassword = config.acsTestPassword, acsTestAccount = config.acsTestAccount, newskitApiXApiKey = config.newskitApiXApiKey, newskitApiEnvUrl = config.newskitApiEnvUrl, mainGraphqlUrl = config.mainGraphqlUrl, acsSessionUrl = config.acsSessionUrl;
|
|
10
|
+
export var acsTestPassword = config.acsTestPassword, acsTestAccount = config.acsTestAccount, newskitApiXApiKey = config.newskitApiXApiKey, newskitApiEnvUrl = config.newskitApiEnvUrl, mainGraphqlUrl = config.mainGraphqlUrl, accountProviderGraphqlUrl = config.accountProviderGraphqlUrl, acsSessionUrl = config.acsSessionUrl;
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAA2B;IACxD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;IAC9D,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;CACrD,CAAA;AAED,MAAM,CACJ,IAAA,eAAe,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAA2B;IACxD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;IAC9D,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAA0B;IACtD,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,4BAAsC;IAC7E,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAyB;CACrD,CAAA;AAED,MAAM,CACJ,IAAA,eAAe,GAOb,MAAM,gBAPO,EACf,cAAc,GAMZ,MAAM,eANM,EACd,iBAAiB,GAKf,MAAM,kBALS,EACjB,gBAAgB,GAId,MAAM,iBAJQ,EAChB,cAAc,GAGZ,MAAM,eAHM,EACd,yBAAyB,GAEvB,MAAM,0BAFiB,EACzB,aAAa,GACX,MAAM,cADK,CACL"}
|
|
@@ -38,7 +38,7 @@ import fetch from 'cross-fetch';
|
|
|
38
38
|
import { acsSessionUrl, acsTestAccount, acsTestPassword } from '../config';
|
|
39
39
|
import { CookieName } from './types';
|
|
40
40
|
export var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
41
|
-
var response, acsToken, _a, value,
|
|
41
|
+
var response, acsToken, _a, value, accountProviderCookieName, e_1;
|
|
42
42
|
return __generator(this, function (_b) {
|
|
43
43
|
switch (_b.label) {
|
|
44
44
|
case 0: return [4 /*yield*/, fetch(acsSessionUrl, {
|
|
@@ -64,15 +64,15 @@ export var fetchSessionCookie = function () { return __awaiter(void 0, void 0, v
|
|
|
64
64
|
case 3:
|
|
65
65
|
acsToken = _b.sent();
|
|
66
66
|
if (acsToken) {
|
|
67
|
-
_a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in CookieName; }), value = _a.value,
|
|
68
|
-
return [2 /*return*/, { value: value,
|
|
67
|
+
_a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in CookieName; }), value = _a.value, accountProviderCookieName = _a.name;
|
|
68
|
+
return [2 /*return*/, { value: value, accountProviderCookieName: accountProviderCookieName }];
|
|
69
69
|
}
|
|
70
70
|
return [3 /*break*/, 5];
|
|
71
71
|
case 4:
|
|
72
72
|
e_1 = _b.sent();
|
|
73
73
|
/* istanbul ignore next */ console.error(e_1);
|
|
74
74
|
return [3 /*break*/, 5];
|
|
75
|
-
case 5: return [2 /*return*/, {
|
|
75
|
+
case 5: return [2 /*return*/, { accountProviderCookieName: CookieName.acs_ngn }];
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
78
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchSessionCookie.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/fetchSessionCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,MAAM,CAAC,IAAM,kBAAkB,GAAG;;;;oBAIf,qBAAM,KAAK,CAAC,aAAuB,EAAE;oBACpD,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,UAAU,EAAE,IAAI;wBAChB,GAAG,EAAE,KAAK;wBACV,eAAe,EAAE;4BACf,QAAQ,EAAE,cAAc;4BACxB,QAAQ,EAAE,eAAe;yBAC1B;qBACF,CAAC;oBACF,OAAO,EAAE;wBACP,cAAc,EAAE,kDAAkD;qBACnE;iBACF,CAAC,EAAA;;gBAbI,QAAQ,GAAG,SAaf;;;;gBAGiB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;gBAAhC,QAAQ,GAAG,SAAqB;gBACtC,IAAI,QAAQ,EAAE;oBACN,
|
|
1
|
+
{"version":3,"file":"fetchSessionCookie.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/fetchSessionCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,MAAM,CAAC,IAAM,kBAAkB,GAAG;;;;oBAIf,qBAAM,KAAK,CAAC,aAAuB,EAAE;oBACpD,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACnB,UAAU,EAAE,IAAI;wBAChB,GAAG,EAAE,KAAK;wBACV,eAAe,EAAE;4BACf,QAAQ,EAAE,cAAc;4BACxB,QAAQ,EAAE,eAAe;yBAC1B;qBACF,CAAC;oBACF,OAAO,EAAE;wBACP,cAAc,EAAE,kDAAkD;qBACnE;iBACF,CAAC,EAAA;;gBAbI,QAAQ,GAAG,SAaf;;;;gBAGiB,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;gBAAhC,QAAQ,GAAG,SAAqB;gBACtC,IAAI,QAAQ,EAAE;oBACN,KACJ,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,IAAI,IAAI,UAAU,EAAzB,CAAyB,CAAC,EADjE,KAAK,WAAA,EAAQ,yBAAyB,UAAA,CAC2B;oBACzE,sBAAO,EAAE,KAAK,OAAA,EAAE,yBAAyB,2BAAA,EAAE,EAAA;iBAC5C;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAO,EAAE,yBAAyB,EAAE,UAAU,CAAC,OAAO,EAAE,EAAA;;;KACzD,CAAA;AAED,MAAM,CAAC,IAAM,cAAc,GAAG,UAC5B,MAAuC;IAEvC,IAAI,MAAM,EAAE;QACV,KAAK,IAAM,MAAI,IAAI,MAAM,EAAE;YACzB,IAAI,MAAI,IAAI,UAAU,EAAE;gBACtB,OAAO,MAAI,CAAA;aACZ;SACF;KACF;IACD,OAAM;AACR,CAAC,CAAA"}
|
|
@@ -28,10 +28,10 @@ export var errorLink = onError(function (_a) {
|
|
|
28
28
|
return new Observable(function (observer) {
|
|
29
29
|
fetchSessionCookie()
|
|
30
30
|
.then(function (_a) {
|
|
31
|
-
var value = _a.value,
|
|
31
|
+
var value = _a.value, accountProviderCookieName = _a.accountProviderCookieName;
|
|
32
32
|
operation.setContext(function () { return ({
|
|
33
33
|
headers: {
|
|
34
|
-
Cookie: "".concat(
|
|
34
|
+
Cookie: "".concat(accountProviderCookieName, "=").concat(value),
|
|
35
35
|
},
|
|
36
36
|
}); });
|
|
37
37
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/externalLinks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAc,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,2DAA2D;AAC3D,MAAM,CAAC,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;IACrC,KAAK,EAAE;QACL,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,IAAI;KACb;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,CAAC;KACP;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,IAAM,SAAS,GAAe,OAAO,CAC1C,UAAC,EAAmD;QAAjD,YAAY,kBAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAa,mBAAA;IAChD,IAAI,aAAa,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;KAC7B;IACD,+CAA+C;IAC/C,IACE,aAAa;QACb,aAAa,CAAC,CAAC,CAAC;QAChB,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO;YACtB,8DAA8D;QAChE,aAAa,EACb;QACA,OAAO,IAAI,UAAU,CAAC,UAAC,QAAQ;YAC7B,kBAAkB,EAAE;iBACjB,IAAI,CAAC,UAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/externalLinks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAc,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,2DAA2D;AAC3D,MAAM,CAAC,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;IACrC,KAAK,EAAE;QACL,OAAO,EAAE,GAAG;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,IAAI;KACb;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,CAAC;KACP;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,IAAM,SAAS,GAAe,OAAO,CAC1C,UAAC,EAAmD;QAAjD,YAAY,kBAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAa,mBAAA;IAChD,IAAI,aAAa,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;KAC7B;IACD,+CAA+C;IAC/C,IACE,aAAa;QACb,aAAa,CAAC,CAAC,CAAC;QAChB,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO;YACtB,8DAA8D;QAChE,aAAa,EACb;QACA,OAAO,IAAI,UAAU,CAAC,UAAC,QAAQ;YAC7B,kBAAkB,EAAE;iBACjB,IAAI,CAAC,UAAC,EAAoC;oBAAlC,KAAK,WAAA,EAAE,yBAAyB,+BAAA;gBACvC,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,yBAAyB,cAAI,KAAK,CAAE;qBAChD;iBACF,CAAC,EAJyB,CAIzB,CAAC,CAAA;YACL,CAAC,CAAC;iBACD,IAAI,CAAC;gBACJ,IAAM,UAAU,GAAG;oBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAClC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACpC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC3C,CAAA;gBAED,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;YAC1C,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,KAAK;gBACX,+DAA+D;gBAC/D,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACvB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;KACH;IACD,OAAM;AACR,CAAC,CACF,CAAA"}
|