@newskit-render/my-account 0.131.0 → 0.132.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 (4) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/getProviderProps.js +18 -6
  3. package/dist/getProviderProps.js.map +1 -1
  4. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [0.132.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/my-account@0.131.0...@newskit-render/my-account@0.132.0) (2022-02-03)
7
+
8
+
9
+ ### Features
10
+
11
+ * **PPDSR-615:** Automate login ([#581](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/581)) ([58e9e3d](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/58e9e3df2d9feb659a68f7386a7c62791ff51b00))
12
+
13
+
14
+
15
+
16
+
6
17
  # [0.131.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/my-account@0.130.0...@newskit-render/my-account@0.131.0) (2022-02-03)
7
18
 
8
19
 
package/dist/getProviderProps.js CHANGED
@@ -46,12 +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
+ };
49
52
  Object.defineProperty(exports, "__esModule", { value: true });
50
53
  exports.getProviderProps = void 0;
51
54
  var api_1 = require("@newskit-render/api");
52
55
  var providers_1 = require("./providers");
56
+ var cookie_1 = __importDefault(require("cookie"));
53
57
  var getProviderProps = function (context) { return __awaiter(void 0, void 0, void 0, function () {
54
- var provider, providerPropsMapper, _a, mainApolloClient, nkApiApolloClient, providerProps, user;
58
+ var provider, providerPropsMapper, newAcsToken, requestCookies, _a, mainApolloClient, nkApiApolloClient, providerProps, user;
55
59
  return __generator(this, function (_b) {
56
60
  switch (_b.label) {
57
61
  case 0:
@@ -64,18 +68,26 @@ var getProviderProps = function (context) { return __awaiter(void 0, void 0, voi
64
68
  Cancellation: providers_1.subscriptionAndBillingProvider,
65
69
  Payment: providers_1.paymentProvider,
66
70
  };
67
- return [4 /*yield*/, Promise.all([
68
- (0, api_1.createApolloClient)(api_1.ClientTypes.main, context.req.headers.cookie),
69
- (0, api_1.createApolloClient)(api_1.ClientTypes.nkapi, context.req.headers.cookie),
70
- ])];
71
+ requestCookies = cookie_1.default.parse(context.req.headers.cookie);
72
+ if (!(!requestCookies[process.env.MAIN_COOKIE_NAME] &&
73
+ process.env.ACS_SESSION_URL)) return [3 /*break*/, 2];
74
+ return [4 /*yield*/, (0, api_1.fetchSessionCookie)()];
71
75
  case 1:
76
+ newAcsToken = _b.sent();
77
+ context.res.setHeader('Set-Cookie', process.env.MAIN_COOKIE_NAME + "=" + newAcsToken + ";expires=" + (new Date(Date.now() + 86400 * 1000).toUTCString() + 86400) + "; path=/;");
78
+ _b.label = 2;
79
+ case 2: return [4 /*yield*/, Promise.all([
80
+ (0, api_1.createApolloClient)(api_1.ClientTypes.main, context.req.headers.cookie, newAcsToken),
81
+ (0, api_1.createApolloClient)(api_1.ClientTypes.nkapi, context.req.headers.cookie, newAcsToken),
82
+ ])];
83
+ case 3:
72
84
  _a = _b.sent(), mainApolloClient = _a[0], nkApiApolloClient = _a[1];
73
85
  return [4 /*yield*/, providerPropsMapper[provider]({
74
86
  mainApolloClient: mainApolloClient,
75
87
  nkApiApolloClient: nkApiApolloClient,
76
88
  context: context,
77
89
  })];
78
- case 2:
90
+ case 4:
79
91
  providerProps = _b.sent();
80
92
  user = (providerProps === null || providerProps === void 0 ? void 0 : providerProps.user) || null;
81
93
  providerProps = __assign(__assign({}, providerProps), { user: user });
package/dist/getProviderProps.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../src/getProviderProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AAErE,yCAOoB;AAEb,IAAM,gBAAgB,GAAG,UAC9B,OAA+B;;;;;gBAEvB,QAAQ,GAAK,OAAO,SAAZ,CAAY;gBAEtB,mBAAmB,GAAG;oBAC1B,SAAS,EAAE,6BAAiB;oBAC5B,eAAe,EAAE,mCAAuB;oBACxC,sBAAsB,EAAE,0CAA8B;oBACtD,oBAAoB,EAAE,wCAA4B;oBAClD,YAAY,EAAE,0CAA8B;oBAC5C,OAAO,EAAE,2BAAe;iBACzB,CAAA;gBAE6C,qBAAM,OAAO,CAAC,GAAG,CAAC;wBAC9D,IAAA,wBAAkB,EAAC,iBAAW,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;wBAChE,IAAA,wBAAkB,EAAC,iBAAW,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;qBAClE,CAAC,EAAA;;gBAHI,KAAwC,SAG5C,EAHK,gBAAgB,QAAA,EAAE,iBAAiB,QAAA;gBAKtB,qBAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;wBACtD,gBAAgB,kBAAA;wBAChB,iBAAiB,mBAAA;wBACjB,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAJE,aAAa,GAAG,SAIlB;gBAEI,IAAI,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,IAAI,CAAA;gBAExC,aAAa,yBACR,aAAa,KAChB,IAAI,MAAA,GACL,CAAA;gBAED,sBAAO;wBACL,KAAK,wBACA,aAAa,KAChB,GAAG,EAAE;gCACH,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;6BACjD,GACF;qBACF,EAAA;;;KACF,CAAA;AAxCY,QAAA,gBAAgB,oBAwC5B"}
1
+ {"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../src/getProviderProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAI4B;AAE5B,yCAOoB;AACpB,kDAA2B;AAEpB,IAAM,gBAAgB,GAAG,UAC9B,OAA+B;;;;;gBAEvB,QAAQ,GAAK,OAAO,SAAZ,CAAY;gBAEtB,mBAAmB,GAAG;oBAC1B,SAAS,EAAE,6BAAiB;oBAC5B,eAAe,EAAE,mCAAuB;oBACxC,sBAAsB,EAAE,0CAA8B;oBACtD,oBAAoB,EAAE,wCAA4B;oBAClD,YAAY,EAAE,0CAA8B;oBAC5C,OAAO,EAAE,2BAAe;iBACzB,CAAA;gBAGK,cAAc,GAAG,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;qBAG7D,CAAA,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAA,EAD3B,wBAC2B;gBAEb,qBAAM,IAAA,wBAAkB,GAAE,EAAA;;gBAAxC,WAAW,GAAG,SAA0B,CAAA;gBAExC,OAAO,CAAC,GAAG,CAAC,SAAS,CACnB,YAAY,EACT,OAAO,CAAC,GAAG,CAAC,gBAAgB,SAAI,WAAW,kBAC5C,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,eAChD,CACZ,CAAA;;oBAG2C,qBAAM,OAAO,CAAC,GAAG,CAAC;oBAC9D,IAAA,wBAAkB,EAChB,iBAAW,CAAC,IAAI,EAChB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAC1B,WAAW,CACZ;oBACD,IAAA,wBAAkB,EAChB,iBAAW,CAAC,KAAK,EACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAC1B,WAAW,CACZ;iBACF,CAAC,EAAA;;gBAXI,KAAwC,SAW5C,EAXK,gBAAgB,QAAA,EAAE,iBAAiB,QAAA;gBAatB,qBAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;wBACtD,gBAAgB,kBAAA;wBAChB,iBAAiB,mBAAA;wBACjB,OAAO,SAAA;qBACR,CAAC,EAAA;;gBAJE,aAAa,GAAG,SAIlB;gBAEI,IAAI,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,IAAI,CAAA;gBAExC,aAAa,yBACR,aAAa,KAChB,IAAI,MAAA,GACL,CAAA;gBAED,sBAAO;wBACL,KAAK,wBACA,aAAa,KAChB,GAAG,EAAE;gCACH,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;6BACjD,GACF;qBACF,EAAA;;;KACF,CAAA;AAjEY,QAAA,gBAAgB,oBAiE5B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@newskit-render/my-account",
3
- "version": "0.131.0",
3
+ "version": "0.132.0",
4
4
  "description": "Newskit Render",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",
@@ -28,7 +28,7 @@
28
28
  "dependencies": {
29
29
  "@apollo/client": "3.4.16",
30
30
  "@hookform/resolvers": "2.5.2",
31
- "@newskit-render/api": "^0.12.0",
31
+ "@newskit-render/api": "^0.13.0",
32
32
  "@newskit-render/shared-components": "^0.30.0",
33
33
  "@newskit-render/validation": "^0.33.0",
34
34
  "@stripe/react-stripe-js": "1.4.1",
@@ -74,7 +74,7 @@
74
74
  "eslint-plugin-cypress": "2.11.3",
75
75
  "eslint-plugin-prettier": "3.2.0",
76
76
  "eslint-plugin-react": "7.22.0",
77
- "jest": "26.6.3",
77
+ "jest": "27.4.7",
78
78
  "jest-junit": "12.0.0",
79
79
  "jest-watch-typeahead": "0.6.3",
80
80
  "lint-staged": "12.1.7",
@@ -83,7 +83,7 @@
83
83
  "react": "17.0.2",
84
84
  "react-dom": "17.0.2",
85
85
  "start-server-and-test": "1.11.5",
86
- "ts-jest": "26.4.4",
86
+ "ts-jest": "27.1.3",
87
87
  "typescript": "4.4.3"
88
88
  },
89
89
  "resolutions": {