@newskit-render/api 1.2.1 → 1.2.2-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.
Files changed (39) hide show
  1. package/dist/cjs/apolloClient/createApolloClient.d.ts +1 -1
  2. package/dist/cjs/apolloClient/createApolloClient.js +2 -2
  3. package/dist/cjs/apolloClient/createApolloClient.js.map +1 -1
  4. package/dist/cjs/config/index.d.ts +1 -1
  5. package/dist/cjs/config/index.js +3 -4
  6. package/dist/cjs/config/index.js.map +1 -1
  7. package/dist/cjs/fetchSessionCookie/fetchSessionCookie.d.ts +5 -1
  8. package/dist/cjs/fetchSessionCookie/fetchSessionCookie.js +24 -12
  9. package/dist/cjs/fetchSessionCookie/fetchSessionCookie.js.map +1 -1
  10. package/dist/cjs/fetchSessionCookie/index.d.ts +1 -0
  11. package/dist/cjs/fetchSessionCookie/index.js +1 -0
  12. package/dist/cjs/fetchSessionCookie/index.js.map +1 -1
  13. package/dist/cjs/fetchSessionCookie/types.d.ts +4 -0
  14. package/dist/cjs/fetchSessionCookie/types.js +9 -0
  15. package/dist/cjs/fetchSessionCookie/types.js.map +1 -0
  16. package/dist/cjs/helpers/externalLinks/index.js +3 -2
  17. package/dist/cjs/helpers/externalLinks/index.js.map +1 -1
  18. package/dist/cjs/helpers/session/index.js +2 -2
  19. package/dist/cjs/helpers/session/index.js.map +1 -1
  20. package/dist/esm/apolloClient/createApolloClient.d.ts +1 -1
  21. package/dist/esm/apolloClient/createApolloClient.js +2 -2
  22. package/dist/esm/apolloClient/createApolloClient.js.map +1 -1
  23. package/dist/esm/config/index.d.ts +1 -1
  24. package/dist/esm/config/index.js +2 -3
  25. package/dist/esm/config/index.js.map +1 -1
  26. package/dist/esm/fetchSessionCookie/fetchSessionCookie.d.ts +5 -1
  27. package/dist/esm/fetchSessionCookie/fetchSessionCookie.js +23 -12
  28. package/dist/esm/fetchSessionCookie/fetchSessionCookie.js.map +1 -1
  29. package/dist/esm/fetchSessionCookie/index.d.ts +1 -0
  30. package/dist/esm/fetchSessionCookie/index.js +1 -0
  31. package/dist/esm/fetchSessionCookie/index.js.map +1 -1
  32. package/dist/esm/fetchSessionCookie/types.d.ts +4 -0
  33. package/dist/esm/fetchSessionCookie/types.js +6 -0
  34. package/dist/esm/fetchSessionCookie/types.js.map +1 -0
  35. package/dist/esm/helpers/externalLinks/index.js +4 -3
  36. package/dist/esm/helpers/externalLinks/index.js.map +1 -1
  37. package/dist/esm/helpers/session/index.js +2 -2
  38. package/dist/esm/helpers/session/index.js.map +1 -1
  39. package/package.json +1 -1
@@ -1,2 +1,2 @@
1
1
  import { ApolloHttpClient, Client } from './types';
2
- export declare const createApolloClient: (client: Client, cookie?: string, token?: string) => Promise<ApolloHttpClient>;
2
+ export declare const createApolloClient: (client: Client, cookie?: string, token?: string, mainCookieName?: string) => 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) { return __awaiter(void 0, void 0, void 0, function () {
44
+ var createApolloClient = function (client, cookie, token, mainCookieName) { return __awaiter(void 0, void 0, void 0, function () {
45
45
  var headers;
46
46
  return __generator(this, function (_a) {
47
47
  switch (_a.label) {
@@ -51,7 +51,7 @@ var createApolloClient = function (client, cookie, token) { return __awaiter(voi
51
51
  case 1:
52
52
  headers = _a.sent();
53
53
  if (!headers && config_1.acsSessionUrl) {
54
- headers = { Cookie: "".concat(config_1.mainCookieName, "=").concat(token) };
54
+ headers = { Cookie: "".concat(mainCookieName, "=").concat(token) };
55
55
  }
56
56
  return [2 /*return*/, (0, createClient_1.createClient)({
57
57
  uri: config_1.mainGraphqlUrl,
@@ -1 +1 @@
1
- {"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6C;AAC7C,sCAA+D;AAE/D,iCAA+D;AAC/D,oCAMkB;AACX,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc;;;;;qBAEV,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,uBAAc,cAAI,KAAK,CAAE,EAAE,CAAA;iBACnD;gBAED,sBAAO,IAAA,2BAAY,EAAC;wBAClB,GAAG,EAAE,uBAAc;wBACnB,KAAK,EAAE,CAAC,mBAAS,EAAE,mBAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,mBAAW,CAAC,KAAK,EAAE;oBAChC,sBAAO,IAAA,2BAAY,EAAC;4BAClB,GAAG,EAAE,yBAAgB;4BACrB,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,0BAAiB;oCAC9B,mBAAmB,EAAE,IAAA,sBAAY,EAAC,mBAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,0BAAiB;oCAC9B,eAAe,EAAE,SAAS;iCAC3B;yBACN,CAAC,EAAA;iBACH;gBACD,sBAAO,IAAA,2BAAY,EAAC,MAAM,CAAC,EAAA;;;KAC5B,CAAA;AAlCY,QAAA,kBAAkB,sBAkC9B"}
1
+ {"version":3,"file":"createApolloClient.js","sourceRoot":"","sources":["../../../src/apolloClient/createApolloClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6C;AAC7C,sCAA+D;AAE/D,iCAA+D;AAC/D,oCAKkB;AACX,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc,EACd,cAAuB;;;;;qBAEnB,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,cAAc,cAAI,KAAK,CAAE,EAAE,CAAA;iBACnD;gBAED,sBAAO,IAAA,2BAAY,EAAC;wBAClB,GAAG,EAAE,uBAAc;wBACnB,KAAK,EAAE,CAAC,mBAAS,EAAE,mBAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,mBAAW,CAAC,KAAK,EAAE;oBAChC,sBAAO,IAAA,2BAAY,EAAC;4BAClB,GAAG,EAAE,yBAAgB;4BACrB,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,0BAAiB;oCAC9B,mBAAmB,EAAE,IAAA,sBAAY,EAAC,mBAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,0BAAiB;oCAC9B,eAAe,EAAE,SAAS;iCAC3B;yBACN,CAAC,EAAA;iBACH;gBACD,sBAAO,IAAA,2BAAY,EAAC,MAAM,CAAC,EAAA;;;KAC5B,CAAA;AAnCY,QAAA,kBAAkB,sBAmC9B"}
@@ -1 +1 @@
1
- export declare const acsTestPassword: string | undefined, acsTestAccount: string | undefined, newskitApiXApiKey: string | undefined, newskitApiEnvUrl: string | undefined, mainGraphqlUrl: string | undefined, mainCookieName: string | undefined, acsSessionUrl: string | undefined;
1
+ export declare const acsTestPassword: string | undefined, acsTestAccount: string | undefined, newskitApiXApiKey: string | undefined, newskitApiEnvUrl: string | undefined, mainGraphqlUrl: string | undefined, acsSessionUrl: string | undefined;
@@ -1,15 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.acsSessionUrl = exports.mainCookieName = exports.mainGraphqlUrl = exports.newskitApiEnvUrl = exports.newskitApiXApiKey = exports.acsTestAccount = exports.acsTestPassword = void 0;
4
- var _a = process === null || process === void 0 ? void 0 : process.env, ACS_SESSION_URL = _a.ACS_SESSION_URL, MAIN_COOKIE_NAME = _a.MAIN_COOKIE_NAME, MAIN_GRAPHQL_URL = _a.MAIN_GRAPHQL_URL, NEWSKIT_API_ENV_URL = _a.NEWSKIT_API_ENV_URL, NEWSKIT_API_X_API_KEY = _a.NEWSKIT_API_X_API_KEY, ACS_TEST_ACCOUNT = _a.ACS_TEST_ACCOUNT, ACS_TEST_PASSWORD = _a.ACS_TEST_PASSWORD;
3
+ exports.acsSessionUrl = exports.mainGraphqlUrl = exports.newskitApiEnvUrl = exports.newskitApiXApiKey = exports.acsTestAccount = exports.acsTestPassword = void 0;
4
+ var _a = process === null || process === void 0 ? void 0 : process.env, ACS_SESSION_URL = _a.ACS_SESSION_URL, MAIN_GRAPHQL_URL = _a.MAIN_GRAPHQL_URL, NEWSKIT_API_ENV_URL = _a.NEWSKIT_API_ENV_URL, NEWSKIT_API_X_API_KEY = _a.NEWSKIT_API_X_API_KEY, ACS_TEST_ACCOUNT = _a.ACS_TEST_ACCOUNT, ACS_TEST_PASSWORD = _a.ACS_TEST_PASSWORD;
5
5
  var config = {
6
6
  acsTestPassword: ACS_TEST_PASSWORD,
7
7
  acsTestAccount: ACS_TEST_ACCOUNT,
8
8
  newskitApiXApiKey: NEWSKIT_API_X_API_KEY,
9
9
  newskitApiEnvUrl: NEWSKIT_API_ENV_URL,
10
10
  mainGraphqlUrl: MAIN_GRAPHQL_URL,
11
- mainCookieName: MAIN_COOKIE_NAME,
12
11
  acsSessionUrl: ACS_SESSION_URL,
13
12
  };
14
- exports.acsTestPassword = config.acsTestPassword, exports.acsTestAccount = config.acsTestAccount, exports.newskitApiXApiKey = config.newskitApiXApiKey, exports.newskitApiEnvUrl = config.newskitApiEnvUrl, exports.mainGraphqlUrl = config.mainGraphqlUrl, exports.mainCookieName = config.mainCookieName, 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.acsSessionUrl = config.acsSessionUrl;
15
14
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAM,IAAA,KAQF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAPd,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,gBAAgB,sBAAA,EAChB,mBAAmB,yBAAA,EACnB,qBAAqB,2BAAA,EACrB,gBAAgB,sBAAA,EAChB,iBAAiB,uBACH,CAAA;AAEhB,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,qBAAqB;IACxC,gBAAgB,EAAE,mBAAmB;IACrC,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,aAAa,EAAE,eAAe;CAC/B,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,cAAc,GAEZ,MAAM,iBADR,QAAA,aAAa,GACX,MAAM,eAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":";;;AAAM,IAAA,KAOF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EANd,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,mBAAmB,yBAAA,EACnB,qBAAqB,2BAAA,EACrB,gBAAgB,sBAAA,EAChB,iBAAiB,uBACH,CAAA;AAEhB,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,qBAAqB;IACxC,gBAAgB,EAAE,mBAAmB;IACrC,cAAc,EAAE,gBAAgB;IAChC,aAAa,EAAE,eAAe;CAC/B,CAAA;AAGC,QAAA,eAAe,GAMb,MAAM,kBALR,QAAA,cAAc,GAKZ,MAAM,iBAJR,QAAA,iBAAiB,GAIf,MAAM,oBAHR,QAAA,gBAAgB,GAGd,MAAM,mBAFR,QAAA,cAAc,GAEZ,MAAM,iBADR,QAAA,aAAa,GACX,MAAM,eAAA"}
@@ -1 +1,5 @@
1
- export declare const fetchSessionCookie: () => Promise<string | undefined>;
1
+ export declare const fetchSessionCookie: () => Promise<{
2
+ value?: string;
3
+ mainCookieName: string;
4
+ }>;
5
+ export declare const findCookieName: (cookie: Record<string, any> | undefined) => string | undefined;
@@ -39,13 +39,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.fetchSessionCookie = void 0;
42
+ exports.findCookieName = exports.fetchSessionCookie = void 0;
43
43
  var cross_fetch_1 = __importDefault(require("cross-fetch"));
44
44
  var config_1 = require("../config");
45
+ var types_1 = require("./types");
45
46
  var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0, function () {
46
- var response, acsToken, e_1;
47
- return __generator(this, function (_a) {
48
- switch (_a.label) {
47
+ var response, acsToken, _a, value, mainCookieName, e_1;
48
+ return __generator(this, function (_b) {
49
+ switch (_b.label) {
49
50
  case 0: return [4 /*yield*/, (0, cross_fetch_1.default)(config_1.acsSessionUrl, {
50
51
  method: 'POST',
51
52
  body: JSON.stringify({
@@ -61,25 +62,36 @@ var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0,
61
62
  },
62
63
  })];
63
64
  case 1:
64
- response = _a.sent();
65
- _a.label = 2;
65
+ response = _b.sent();
66
+ _b.label = 2;
66
67
  case 2:
67
- _a.trys.push([2, 4, , 5]);
68
+ _b.trys.push([2, 4, , 5]);
68
69
  return [4 /*yield*/, response.json()];
69
70
  case 3:
70
- acsToken = _a.sent();
71
+ acsToken = _b.sent();
71
72
  if (acsToken) {
72
- return [2 /*return*/, acsToken.acsCookies.cookies.find(function (ck) { return ck.name == config_1.mainCookieName; })
73
- .value];
73
+ _a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in types_1.CookieName; }), value = _a.value, mainCookieName = _a.name;
74
+ return [2 /*return*/, { value: value, mainCookieName: mainCookieName }];
74
75
  }
75
76
  return [3 /*break*/, 5];
76
77
  case 4:
77
- e_1 = _a.sent();
78
+ e_1 = _b.sent();
78
79
  /* istanbul ignore next */ console.error(e_1);
79
80
  return [3 /*break*/, 5];
80
- case 5: return [2 /*return*/];
81
+ case 5: return [2 /*return*/, { mainCookieName: types_1.CookieName.acs_ngn }];
81
82
  }
82
83
  });
83
84
  }); };
84
85
  exports.fetchSessionCookie = fetchSessionCookie;
86
+ var findCookieName = function (cookie) {
87
+ if (cookie) {
88
+ for (var name_1 in cookie) {
89
+ if (name_1 in types_1.CookieName) {
90
+ return name_1;
91
+ }
92
+ }
93
+ }
94
+ return;
95
+ };
96
+ exports.findCookieName = findCookieName;
85
97
  //# sourceMappingURL=fetchSessionCookie.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fetchSessionCookie.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/fetchSessionCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,oCAKkB;AACX,IAAM,kBAAkB,GAAG;;;;oBACf,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;gBAEtC,IAAI,QAAQ,EAAE;oBACZ,sBAAO,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,IAAI,uBAAc,EAAzB,CAAyB,CAAC;6BACvE,KAAK,EAAA;iBACT;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAM;;;KACP,CAAA;AA5BY,QAAA,kBAAkB,sBA4B9B"}
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,KAAkC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CACtE,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,IAAI,IAAI,kBAAU,EAAzB,CAAyB,CACtC,EAFO,KAAK,WAAA,EAAQ,cAAc,UAAA,CAElC;oBACD,sBAAO,EAAE,KAAK,OAAA,EAAE,cAAc,gBAAA,EAAE,EAAA;iBACjC;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAO,EAAE,cAAc,EAAE,kBAAU,CAAC,OAAO,EAAE,EAAA;;;KAC9C,CAAA;AAhCY,QAAA,kBAAkB,sBAgC9B;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"}
@@ -1 +1,2 @@
1
1
  export * from './fetchSessionCookie';
2
+ export * from './types';
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./fetchSessionCookie"), exports);
18
+ __exportStar(require("./types"), exports);
18
19
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC;AACpC,0CAAuB"}
@@ -0,0 +1,4 @@
1
+ export declare enum CookieName {
2
+ acs_tnl = "acs_tnl",
3
+ acs_ngn = "acs_ngn"
4
+ }
@@ -0,0 +1,9 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CookieName = void 0;
4
+ var CookieName;
5
+ (function (CookieName) {
6
+ CookieName["acs_tnl"] = "acs_tnl";
7
+ CookieName["acs_ngn"] = "acs_ngn";
8
+ })(CookieName = exports.CookieName || (exports.CookieName = {}));
9
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,iCAAmB,CAAA;AACrB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}
@@ -30,10 +30,11 @@ exports.errorLink = (0, error_1.onError)(function (_a) {
30
30
  config_1.acsSessionUrl) {
31
31
  return new client_1.Observable(function (observer) {
32
32
  (0, fetchSessionCookie_1.fetchSessionCookie)()
33
- .then(function (token) {
33
+ .then(function (_a) {
34
+ var value = _a.value, mainCookieName = _a.mainCookieName;
34
35
  operation.setContext(function () { return ({
35
36
  headers: {
36
- Cookie: "".concat(config_1.mainCookieName, "=").concat(token),
37
+ Cookie: "".concat(mainCookieName, "=").concat(value),
37
38
  },
38
39
  }); });
39
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,uCAA4D;AAC5D,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,KAAK;gBACV,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,uBAAc,cAAI,KAAK,CAAE;qBACrC;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
+ {"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,EAAyB;oBAAvB,KAAK,WAAA,EAAE,cAAc,oBAAA;gBAC5B,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,cAAc,cAAI,KAAK,CAAE;qBACrC;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"}
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getAcsCookie = void 0;
7
7
  var types_1 = require("./../../apolloClient/types");
8
8
  var cookie_1 = __importDefault(require("cookie"));
9
- var config_1 = require("../../config");
9
+ var fetchSessionCookie_1 = require("../../fetchSessionCookie");
10
10
  var getAcsCookie = function (client, cookieSession) {
11
- var cookieName = config_1.mainCookieName;
12
11
  if (cookieSession) {
13
12
  var cookies = cookie_1.default.parse(cookieSession);
13
+ var cookieName = (0, fetchSessionCookie_1.findCookieName)(cookies);
14
14
  var mainSessionCookie = cookies[cookieName];
15
15
  if (mainSessionCookie) {
16
16
  if (client === types_1.ClientTypes.main) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/session/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAwD;AACxD,kDAA2B;AAC3B,uCAA6C;AAOtC,IAAM,YAAY,GAAG,UAC1B,MAAmB,EACnB,aAAsB;IAEtB,IAAM,UAAU,GAAG,uBAAc,CAAA;IACjC,IAAI,aAAa,EAAE;QACjB,IAAM,OAAO,GAAG,gBAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3C,IAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,iBAAiB,EAAE;YACrB,IAAI,MAAM,KAAK,mBAAW,CAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,MAAM,EAAE,UAAG,UAAU,cAAI,iBAAiB,CAAE,EAAE,CAAA;aACxD;YAED,uCAAuC;YACvC,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;SAC7C;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAlBY,QAAA,YAAY,gBAkBxB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/session/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAwD;AACxD,kDAA2B;AAC3B,+DAAyD;AAOlD,IAAM,YAAY,GAAG,UAC1B,MAAmB,EACnB,aAAsB;IAEtB,IAAI,aAAa,EAAE;QACjB,IAAM,OAAO,GAAG,gBAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3C,IAAM,UAAU,GAAG,IAAA,mCAAc,EAAC,OAAO,CAAC,CAAA;QAC1C,IAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,iBAAiB,EAAE;YACrB,IAAI,MAAM,KAAK,mBAAW,CAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,MAAM,EAAE,UAAG,UAAU,cAAI,iBAAiB,CAAE,EAAE,CAAA;aACxD;YAED,uCAAuC;YACvC,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;SAC7C;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAlBY,QAAA,YAAY,gBAkBxB"}
@@ -1,2 +1,2 @@
1
1
  import { ApolloHttpClient, Client } from './types';
2
- export declare const createApolloClient: (client: Client, cookie?: string, token?: string) => Promise<ApolloHttpClient>;
2
+ export declare const createApolloClient: (client: Client, cookie?: string, token?: string, mainCookieName?: string) => 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, mainCookieName, mainGraphqlUrl, newskitApiEnvUrl, newskitApiXApiKey, } from '../config';
41
- export var createApolloClient = function (client, cookie, token) { return __awaiter(void 0, void 0, void 0, function () {
40
+ import { acsSessionUrl, mainGraphqlUrl, newskitApiEnvUrl, newskitApiXApiKey, } from '../config';
41
+ export var createApolloClient = function (client, cookie, token, mainCookieName) { return __awaiter(void 0, void 0, void 0, function () {
42
42
  var headers;
43
43
  return __generator(this, function (_a) {
44
44
  switch (_a.label) {
@@ -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,EAAE,MAAM,SAAS,CAAA;AAC/D,OAAO,EACL,aAAa,EACb,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,WAAW,CAAA;AAClB,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,MAAc,EACd,MAAe,EACf,KAAc;;;;;qBAEV,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,cAAc,cAAI,KAAK,CAAE,EAAE,CAAA;iBACnD;gBAED,sBAAO,YAAY,CAAC;wBAClB,GAAG,EAAE,cAAc;wBACnB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,WAAW,CAAC,KAAK,EAAE;oBAChC,sBAAO,YAAY,CAAC;4BAClB,GAAG,EAAE,gBAAgB;4BACrB,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,iBAAiB;oCAC9B,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,iBAAiB;oCAC9B,eAAe,EAAE,SAAS;iCAC3B;yBACN,CAAC,EAAA;iBACH;gBACD,sBAAO,YAAY,CAAC,MAAM,CAAC,EAAA;;;KAC5B,CAAA"}
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,EAAE,MAAM,SAAS,CAAA;AAC/D,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,cAAuB;;;;;qBAEnB,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,cAAc,cAAI,KAAK,CAAE,EAAE,CAAA;iBACnD;gBAED,sBAAO,YAAY,CAAC;wBAClB,GAAG,EAAE,cAAc;wBACnB,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;wBAC7B,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAEJ,IAAI,MAAM,KAAK,WAAW,CAAC,KAAK,EAAE;oBAChC,sBAAO,YAAY,CAAC;4BAClB,GAAG,EAAE,gBAAgB;4BACrB,OAAO,EAAE,MAAM;gCACb,CAAC,CAAC;oCACE,WAAW,EAAE,iBAAiB;oCAC9B,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC;oCAC5D,eAAe,EAAE,SAAS;iCAC3B;gCACH,CAAC,CAAC;oCACE,WAAW,EAAE,iBAAiB;oCAC9B,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 | undefined, acsTestAccount: string | undefined, newskitApiXApiKey: string | undefined, newskitApiEnvUrl: string | undefined, mainGraphqlUrl: string | undefined, mainCookieName: string | undefined, acsSessionUrl: string | undefined;
1
+ export declare const acsTestPassword: string | undefined, acsTestAccount: string | undefined, newskitApiXApiKey: string | undefined, newskitApiEnvUrl: string | undefined, mainGraphqlUrl: string | undefined, acsSessionUrl: string | undefined;
@@ -1,12 +1,11 @@
1
- var _a = process === null || process === void 0 ? void 0 : process.env, ACS_SESSION_URL = _a.ACS_SESSION_URL, MAIN_COOKIE_NAME = _a.MAIN_COOKIE_NAME, MAIN_GRAPHQL_URL = _a.MAIN_GRAPHQL_URL, NEWSKIT_API_ENV_URL = _a.NEWSKIT_API_ENV_URL, NEWSKIT_API_X_API_KEY = _a.NEWSKIT_API_X_API_KEY, ACS_TEST_ACCOUNT = _a.ACS_TEST_ACCOUNT, ACS_TEST_PASSWORD = _a.ACS_TEST_PASSWORD;
1
+ var _a = process === null || process === void 0 ? void 0 : process.env, ACS_SESSION_URL = _a.ACS_SESSION_URL, MAIN_GRAPHQL_URL = _a.MAIN_GRAPHQL_URL, NEWSKIT_API_ENV_URL = _a.NEWSKIT_API_ENV_URL, NEWSKIT_API_X_API_KEY = _a.NEWSKIT_API_X_API_KEY, ACS_TEST_ACCOUNT = _a.ACS_TEST_ACCOUNT, ACS_TEST_PASSWORD = _a.ACS_TEST_PASSWORD;
2
2
  var config = {
3
3
  acsTestPassword: ACS_TEST_PASSWORD,
4
4
  acsTestAccount: ACS_TEST_ACCOUNT,
5
5
  newskitApiXApiKey: NEWSKIT_API_X_API_KEY,
6
6
  newskitApiEnvUrl: NEWSKIT_API_ENV_URL,
7
7
  mainGraphqlUrl: MAIN_GRAPHQL_URL,
8
- mainCookieName: MAIN_COOKIE_NAME,
9
8
  acsSessionUrl: ACS_SESSION_URL,
10
9
  };
11
- export var acsTestPassword = config.acsTestPassword, acsTestAccount = config.acsTestAccount, newskitApiXApiKey = config.newskitApiXApiKey, newskitApiEnvUrl = config.newskitApiEnvUrl, mainGraphqlUrl = config.mainGraphqlUrl, mainCookieName = config.mainCookieName, acsSessionUrl = config.acsSessionUrl;
10
+ export var acsTestPassword = config.acsTestPassword, acsTestAccount = config.acsTestAccount, newskitApiXApiKey = config.newskitApiXApiKey, newskitApiEnvUrl = config.newskitApiEnvUrl, mainGraphqlUrl = config.mainGraphqlUrl, acsSessionUrl = config.acsSessionUrl;
12
11
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAM,IAAA,KAQF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAPd,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,gBAAgB,sBAAA,EAChB,mBAAmB,yBAAA,EACnB,qBAAqB,2BAAA,EACrB,gBAAgB,sBAAA,EAChB,iBAAiB,uBACH,CAAA;AAEhB,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,qBAAqB;IACxC,gBAAgB,EAAE,mBAAmB;IACrC,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,aAAa,EAAE,eAAe;CAC/B,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,cAAc,GAEZ,MAAM,eAFM,EACd,aAAa,GACX,MAAM,cADK,CACL"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAM,IAAA,KAOF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EANd,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,mBAAmB,yBAAA,EACnB,qBAAqB,2BAAA,EACrB,gBAAgB,sBAAA,EAChB,iBAAiB,uBACH,CAAA;AAEhB,IAAM,MAAM,GAAG;IACb,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,qBAAqB;IACxC,gBAAgB,EAAE,mBAAmB;IACrC,cAAc,EAAE,gBAAgB;IAChC,aAAa,EAAE,eAAe;CAC/B,CAAA;AAED,MAAM,CACJ,IAAA,eAAe,GAMb,MAAM,gBANO,EACf,cAAc,GAKZ,MAAM,eALM,EACd,iBAAiB,GAIf,MAAM,kBAJS,EACjB,gBAAgB,GAGd,MAAM,iBAHQ,EAChB,cAAc,GAEZ,MAAM,eAFM,EACd,aAAa,GACX,MAAM,cADK,CACL"}
@@ -1 +1,5 @@
1
- export declare const fetchSessionCookie: () => Promise<string | undefined>;
1
+ export declare const fetchSessionCookie: () => Promise<{
2
+ value?: string;
3
+ mainCookieName: string;
4
+ }>;
5
+ export declare const findCookieName: (cookie: Record<string, any> | undefined) => string | undefined;
@@ -35,11 +35,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  }
36
36
  };
37
37
  import fetch from 'cross-fetch';
38
- import { acsSessionUrl, acsTestAccount, acsTestPassword, mainCookieName, } from '../config';
38
+ import { acsSessionUrl, acsTestAccount, acsTestPassword } from '../config';
39
+ import { CookieName } from './types';
39
40
  export var fetchSessionCookie = function () { return __awaiter(void 0, void 0, void 0, function () {
40
- var response, acsToken, e_1;
41
- return __generator(this, function (_a) {
42
- switch (_a.label) {
41
+ var response, acsToken, _a, value, mainCookieName, e_1;
42
+ return __generator(this, function (_b) {
43
+ switch (_b.label) {
43
44
  case 0: return [4 /*yield*/, fetch(acsSessionUrl, {
44
45
  method: 'POST',
45
46
  body: JSON.stringify({
@@ -55,24 +56,34 @@ export var fetchSessionCookie = function () { return __awaiter(void 0, void 0, v
55
56
  },
56
57
  })];
57
58
  case 1:
58
- response = _a.sent();
59
- _a.label = 2;
59
+ response = _b.sent();
60
+ _b.label = 2;
60
61
  case 2:
61
- _a.trys.push([2, 4, , 5]);
62
+ _b.trys.push([2, 4, , 5]);
62
63
  return [4 /*yield*/, response.json()];
63
64
  case 3:
64
- acsToken = _a.sent();
65
+ acsToken = _b.sent();
65
66
  if (acsToken) {
66
- return [2 /*return*/, acsToken.acsCookies.cookies.find(function (ck) { return ck.name == mainCookieName; })
67
- .value];
67
+ _a = acsToken.acsCookies.cookies.find(function (cookie) { return cookie.name in CookieName; }), value = _a.value, mainCookieName = _a.name;
68
+ return [2 /*return*/, { value: value, mainCookieName: mainCookieName }];
68
69
  }
69
70
  return [3 /*break*/, 5];
70
71
  case 4:
71
- e_1 = _a.sent();
72
+ e_1 = _b.sent();
72
73
  /* istanbul ignore next */ console.error(e_1);
73
74
  return [3 /*break*/, 5];
74
- case 5: return [2 /*return*/];
75
+ case 5: return [2 /*return*/, { mainCookieName: CookieName.acs_ngn }];
75
76
  }
76
77
  });
77
78
  }); };
79
+ export var findCookieName = function (cookie) {
80
+ if (cookie) {
81
+ for (var name_1 in cookie) {
82
+ if (name_1 in CookieName) {
83
+ return name_1;
84
+ }
85
+ }
86
+ }
87
+ return;
88
+ };
78
89
  //# sourceMappingURL=fetchSessionCookie.js.map
@@ -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,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,WAAW,CAAA;AAClB,MAAM,CAAC,IAAM,kBAAkB,GAAG;;;;oBACf,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;gBAEtC,IAAI,QAAQ,EAAE;oBACZ,sBAAO,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,IAAI,IAAI,cAAc,EAAzB,CAAyB,CAAC;6BACvE,KAAK,EAAA;iBACT;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAM;;;KACP,CAAA"}
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,KAAkC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CACtE,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,IAAI,IAAI,UAAU,EAAzB,CAAyB,CACtC,EAFO,KAAK,WAAA,EAAQ,cAAc,UAAA,CAElC;oBACD,sBAAO,EAAE,KAAK,OAAA,EAAE,cAAc,gBAAA,EAAE,EAAA;iBACjC;;;;gBAED,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAA;;oBAG7C,sBAAO,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,EAAE,EAAA;;;KAC9C,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"}
@@ -1 +1,2 @@
1
1
  export * from './fetchSessionCookie';
2
+ export * from './types';
@@ -1,2 +1,3 @@
1
1
  export * from './fetchSessionCookie';
2
+ export * from './types';
2
3
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,SAAS,CAAA"}
@@ -0,0 +1,4 @@
1
+ export declare enum CookieName {
2
+ acs_tnl = "acs_tnl",
3
+ acs_ngn = "acs_ngn"
4
+ }
@@ -0,0 +1,6 @@
1
+ export var CookieName;
2
+ (function (CookieName) {
3
+ CookieName["acs_tnl"] = "acs_tnl";
4
+ CookieName["acs_ngn"] = "acs_ngn";
5
+ })(CookieName || (CookieName = {}));
6
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/fetchSessionCookie/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,iCAAmB,CAAA;AACrB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}
@@ -2,7 +2,7 @@ import { RetryLink } from '@apollo/client/link/retry';
2
2
  import { onError } from '@apollo/client/link/error';
3
3
  import { Observable } from '@apollo/client';
4
4
  import { fetchSessionCookie } from '../../fetchSessionCookie';
5
- import { mainCookieName, acsSessionUrl } from '../../config';
5
+ import { acsSessionUrl } from '../../config';
6
6
  //Error handling for getting a new access token for GraphQL
7
7
  export var retryLink = new RetryLink({
8
8
  delay: {
@@ -27,10 +27,11 @@ export var errorLink = onError(function (_a) {
27
27
  acsSessionUrl) {
28
28
  return new Observable(function (observer) {
29
29
  fetchSessionCookie()
30
- .then(function (token) {
30
+ .then(function (_a) {
31
+ var value = _a.value, mainCookieName = _a.mainCookieName;
31
32
  operation.setContext(function () { return ({
32
33
  headers: {
33
- Cookie: "".concat(mainCookieName, "=").concat(token),
34
+ Cookie: "".concat(mainCookieName, "=").concat(value),
34
35
  },
35
36
  }); });
36
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,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5D,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,KAAK;gBACV,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,cAAc,cAAI,KAAK,CAAE;qBACrC;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
+ {"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,EAAyB;oBAAvB,KAAK,WAAA,EAAE,cAAc,oBAAA;gBAC5B,SAAS,CAAC,UAAU,CAAC,cAAM,OAAA,CAAC;oBAC1B,OAAO,EAAE;wBACP,MAAM,EAAE,UAAG,cAAc,cAAI,KAAK,CAAE;qBACrC;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,10 +1,10 @@
1
1
  import { ClientTypes } from './../../apolloClient/types';
2
2
  import cookie from 'cookie';
3
- import { mainCookieName } from '../../config';
3
+ import { findCookieName } from '../../fetchSessionCookie';
4
4
  export var getAcsCookie = function (client, cookieSession) {
5
- var cookieName = mainCookieName;
6
5
  if (cookieSession) {
7
6
  var cookies = cookie.parse(cookieSession);
7
+ var cookieName = findCookieName(cookies);
8
8
  var mainSessionCookie = cookies[cookieName];
9
9
  if (mainSessionCookie) {
10
10
  if (client === ClientTypes.main) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAO7C,MAAM,CAAC,IAAM,YAAY,GAAG,UAC1B,MAAmB,EACnB,aAAsB;IAEtB,IAAM,UAAU,GAAG,cAAc,CAAA;IACjC,IAAI,aAAa,EAAE;QACjB,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3C,IAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,iBAAiB,EAAE;YACrB,IAAI,MAAM,KAAK,WAAW,CAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,MAAM,EAAE,UAAG,UAAU,cAAI,iBAAiB,CAAE,EAAE,CAAA;aACxD;YAED,uCAAuC;YACvC,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;SAC7C;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/session/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAOzD,MAAM,CAAC,IAAM,YAAY,GAAG,UAC1B,MAAmB,EACnB,aAAsB;IAEtB,IAAI,aAAa,EAAE;QACjB,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC3C,IAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,iBAAiB,EAAE;YACrB,IAAI,MAAM,KAAK,WAAW,CAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,MAAM,EAAE,UAAG,UAAU,cAAI,iBAAiB,CAAE,EAAE,CAAA;aACxD;YAED,uCAAuC;YACvC,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;SAC7C;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@newskit-render/api",
3
- "version": "1.2.1",
3
+ "version": "1.2.2-alpha.0",
4
4
  "description": "helper package for accessing MAIN and NK API data",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",