@newskit-render/my-account 0.0.0-caeaa514b → 0.0.0-cd7dda9a6

package/dist/cjs/getProviderProps.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -58,16 +58,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProviderProps = void 0;
 var api_1 = require("@newskit-render/api");
-var cookie_1 = require("cookie");
 var lodash_1 = require("lodash");
 var providers_1 = require("./providers");
 var config_1 = require("./config");
 var helpers_1 = require("./helpers");
 var getProviderProps = function (context, props, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var provider, providerPropsMapper, areFamilyAccountsEnabled, mfaError, handleMfaError, redirectToLogin, apolloClient, _a, stepUpMfaToken, stepUpProvider, err_1, promises, responseAll, successResponse, rejectedResponse, providerProps, paymentUser, userUnauthenticated, fullUser, env, isEligible;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var provider, providerPropsMapper, areFamilyAccountsEnabled, isBroadcasting, mfaGenericError, shouldLogout, handleMfaError, cookie, apolloClient, promises, responseAll, successResponse, rejectedResponse, stepUpMfaToken, stepUpProvider, err_1, providerProps, paymentUser, userUnauthenticated, fullUser, env, isEligible;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 provider = context.provider;
                 providerPropsMapper = {
@@ -85,66 +84,80 @@ var getProviderProps = function (context, props, options) { return __awaiter(voi
                     GroupAccounts: providers_1.groupAccountsProvider,
                 };
                 areFamilyAccountsEnabled = config_1.publisher === 'TIMES';
-                mfaError = false;
-                handleMfaError = function () {
-                    context.res.setHeader('Set-Cookie', "stepup_access_token=; path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT");
-                    mfaError = true;
-                };
-                redirectToLogin = {
-                    redirect: {
-                        permanent: true,
-                        destination: '/',
-                    },
+                isBroadcasting = config_1.publisher === 'BROADCASTING';
+                mfaGenericError = false;
+                shouldLogout = false;
+                handleMfaError = function (errorCode) {
+                    if (errorCode === 'MFA-AUTH-10402') {
+                        shouldLogout = true;
+                    }
+                    else {
+                        context.res.setHeader('Set-Cookie', "stepup_access_token=; path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT");
+                        mfaGenericError = true;
+                    }
                 };
-                return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.main, ((_b = context.req.headers) === null || _b === void 0 ? void 0 : _b.cookie) || '', undefined, undefined, undefined, !config_1.enableStepUpMfa ? undefined : handleMfaError)];
+                cookie = config_1.enableStepUpMfa && ((_a = context.req.headers) === null || _a === void 0 ? void 0 : _a.cookie)
+                    ? "".concat(context.req.headers.cookie, ";stepup_access_token=").concat(context.req.headers.stepup_access_token)
+                    : ((_b = context.req.headers) === null || _b === void 0 ? void 0 : _b.cookie) || '';
+                return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.main, cookie, undefined, undefined, undefined, config_1.enableStepUpMfa ? handleMfaError : undefined)];
             case 1:
-                apolloClient = _f.sent();
-                if (!config_1.enableStepUpMfa) return [3 /*break*/, 5];
-                _a = ((0, cookie_1.parse)(((_d = (_c = context.req) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d.cookie) || '') || {}).stepup_access_token, stepUpMfaToken = _a === void 0 ? '' : _a;
-                if (!!stepUpMfaToken) return [3 /*break*/, 5];
-                _f.label = 2;
-            case 2:
-                _f.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, (0, providers_1.stepUpMfaProvider)({ apolloClient: apolloClient })];
-            case 3:
-                stepUpProvider = _f.sent();
-                if (stepUpProvider.data.authorizeUri.mfaUri) {
-                    return [2 /*return*/, {
-                            redirect: {
-                                destination: stepUpProvider.data.authorizeUri.mfaUri,
-                                permanent: true,
-                            },
-                        }];
-                }
-                return [3 /*break*/, 5];
-            case 4:
-                err_1 = _f.sent();
-                console.error('Error setting up stepup mfa');
-                handleMfaError();
-                return [2 /*return*/, redirectToLogin];
-            case 5:
+                apolloClient = _d.sent();
                 promises = [
-                    (0, providers_1.userPaymentInfoProvider)(apolloClient, areFamilyAccountsEnabled),
+                    (0, providers_1.userPaymentInfoProvider)(apolloClient, areFamilyAccountsEnabled, isBroadcasting),
                 ];
                 if (provider !== undefined && providerPropsMapper[provider]) {
                     promises.push(providerPropsMapper[provider]({
                         apolloClient: apolloClient,
                         context: context,
-                        options: options,
+                        options: __assign(__assign({}, options), props),
                     }));
                 }
                 return [4 /*yield*/, Promise.allSettled(promises)];
-            case 6:
-                responseAll = _f.sent();
+            case 2:
+                responseAll = _d.sent();
                 successResponse = responseAll.filter(function (data) { return data.status === 'fulfilled'; }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 );
                 rejectedResponse = responseAll.filter(function (res) { return res.status === 'rejected'; });
                 rejectedResponse.forEach(function (err) { var _a; return console.error((_a = err.reason) === null || _a === void 0 ? void 0 : _a.message); });
-                if (config_1.enableStepUpMfa && mfaError) {
-                    /* istanbul ignore next */
-                    return [2 /*return*/, redirectToLogin];
+                /* istanbul ignore next */
+                if (shouldLogout) {
+                    return [2 /*return*/, {
+                            redirect: {
+                                destination: config_1.signOutLink,
+                                permanent: true,
+                            },
+                        }];
                 }
+                if (!config_1.enableStepUpMfa) return [3 /*break*/, 6];
+                stepUpMfaToken = (0, helpers_1.getStepUpMfaToken)(context.req.headers);
+                if (!(!stepUpMfaToken || mfaGenericError)) return [3 /*break*/, 6];
+                _d.label = 3;
+            case 3:
+                _d.trys.push([3, 5, , 6]);
+                return [4 /*yield*/, (0, providers_1.stepUpMfaProvider)({ apolloClient: apolloClient })];
+            case 4:
+                stepUpProvider = _d.sent();
+                if (stepUpProvider.data.authorizeUri.mfaUri) {
+                    return [2 /*return*/, {
+                            redirect: {
+                                destination: stepUpProvider.data.authorizeUri.mfaUri,
+                                permanent: true,
+                            },
+                        }];
+                }
+                return [3 /*break*/, 6];
+            case 5:
+                err_1 = _d.sent();
+                console.error('Error setting up stepup mfa');
+                handleMfaError();
+                return [2 /*return*/, {
+                        redirect: {
+                            permanent: true,
+                            destination: '/',
+                        },
+                    }];
+            case 6:
                 userUnauthenticated = false;
                 successResponse.map(function (response) {
                     var value = response.value;
@@ -185,7 +198,7 @@ var getProviderProps = function (context, props, options) { return __awaiter(voi
                     PUBLISHER: config_1.publisher || '',
                 };
                 if (props === null || props === void 0 ? void 0 : props.notEligibleForPaymentPagesRedirectUrl) {
-                    isEligible = (0, helpers_1.isUserPaymentTypeEligibleForZuoraPage)((_e = fullUser === null || fullUser === void 0 ? void 0 : fullUser.subscriptions) === null || _e === void 0 ? void 0 : _e[0]);
+                    isEligible = (0, helpers_1.isUserPaymentTypeEligibleForZuoraPage)((_c = fullUser === null || fullUser === void 0 ? void 0 : fullUser.subscriptions) === null || _c === void 0 ? void 0 : _c[0]);
                     if (!isEligible) {
                         return [2 /*return*/, {
                                 redirect: {

package/dist/cjs/getProviderProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getProviderProps.js","sourceRoot":"","sources":["../../src/getProviderProps.ts"],"names":[],"mappings":"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"}

package/dist/cjs/getProviderPropsTimes.d.ts

@@ -1,5 +1,3 @@
 import { GetServerSidePropsResult } from 'next';
-import { ServerSidePropsContext, ProviderServerResponseDataMap, ProviderProps } from './providersTimes/types';
-export declare const getProviderPropsTimes: <T extends keyof ProviderServerResponseDataMap>(context: ServerSidePropsContext, props?: ProviderProps, options?: Record<string, unknown>) => Promise<GetServerSidePropsResult<{
-    field: string;
-}>>;
+import { ServerSidePropsContext, ProviderServerResponseDataMap, ProviderProps, GetProviderPropsTimesResponse } from './providersTimes/types';
+export declare const getProviderPropsTimes: <T extends keyof ProviderServerResponseDataMap>(context: ServerSidePropsContext, props?: ProviderProps, options?: Record<string, unknown>) => Promise<GetServerSidePropsResult<GetProviderPropsTimesResponse<T>>>;

package/dist/cjs/getProviderPropsTimes.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -77,7 +77,7 @@ var getProviderPropsTimes = function (context, props, options) { return __awaite
                 return [4 /*yield*/, pageProvider({
                         apolloClient: apolloClient,
                         context: context,
-                        options: options,
+                        options: __assign(__assign({}, options), { featureFlags: (props === null || props === void 0 ? void 0 : props.featureFlags) || {} }),
                         provider: provider || types_1.ProviderTypes.PersonalDetails,
                     })];
             case 3:
@@ -85,9 +85,10 @@ var getProviderPropsTimes = function (context, props, options) { return __awaite
                 return [3 /*break*/, 5];
             case 4:
                 err_1 = _c.sent();
-                console.error(err_1);
-                // Add New Relic error log here with TMR-1561
-                // @ts-ignore
+                (0, helpers_1.handleNewRelicErrorLog)({
+                    requestName: "getProviderPropsTimes - ".concat(provider),
+                    reqError: err_1,
+                });
                 return [2 /*return*/, (0, providerUtilsTimes_1.handleProviderPropsError)(err_1, context, props)];
             case 5:
                 userData = (0, providerUtilsTimes_1.handleProviderPropsUserDataResponse)(providerResponse, context, options);
@@ -104,9 +105,7 @@ var getProviderPropsTimes = function (context, props, options) { return __awaite
                     }
                 }
                 return [2 /*return*/, {
-                        props: __assign(__assign(__assign({}, props), userData), { 
-                            // @ts-ignore
-                            requestHeaders: context.req.headers, env: providerUtilsTimes_1.providerEnvVariables }),
+                        props: __assign(__assign(__assign({}, props), userData), { requestHeaders: context.req.headers, env: providerUtilsTimes_1.providerEnvVariables }),
                     }];
         }
     });

package/dist/cjs/getProviderPropsTimes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AAGrE,mDAMyB;AACzB,gDAM+B;AAE/B,qCAAiE;AAEjE,mEAIqC;AAErC,IAAM,mBAAmB,GAAG;IAC1B,QAAQ,EAAE,iCAAgB;IAC1B,SAAS,EAAE,kCAAiB;IAC5B,oBAAoB,EAAE,6CAA4B;IAClD,OAAO,EAAE,gCAAe;CACzB,CAAA;AAEM,IAAM,qBAAqB,GAAG,UAGnC,OAA+B,EAC/B,KAAqB,EACrB,OAAiC;;;;;;gBAEzB,QAAQ,GAAK,OAAO,SAAZ,CAAY;gBAEP,qBAAM,IAAA,wBAAkB,EAC3C,iBAAW,CAAC,IAAI,EAChB,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,OAAO,0CAAE,MAAM,KAAI,EAAE,EACjC,SAAS,EACT,SAAS,EACT,SAAS,CACV,EAAA;;gBANK,YAAY,GAAG,SAMpB;gBAEG,gBAAgB,GAAkC,EAAE,CAAA;gBAClD,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,oCAAmB,CAAA;;;;gBAGpD,qBAAM,YAAY,CAAC;wBACpC,YAAY,cAAA;wBACZ,OAAO,SAAA;wBACP,OAAO,SAAA;wBACP,QAAQ,EAAE,QAAQ,IAAI,qBAAa,CAAC,eAAe;qBACpD,CAAC,EAAA;;gBALF,gBAAgB,GAAG,SAKjB,CAAA;;;;gBAEF,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;gBAClB,6CAA6C;gBAC7C,aAAa;gBACb,sBAAO,IAAA,6CAAwB,EAAC,KAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAA;;gBAGhD,QAAQ,GAAG,IAAA,wDAAmC,EAClD,gBAAgB,EAChB,OAAO,EACP,OAAO,CACR,CAAA;gBAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,qCAAqC,EAAE;oBAE1C,aAAa,GAAG,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAA;oBAClD,UAAU,GAAG,IAAA,+CAAqC,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;oBAE1E,IAAI,CAAC,UAAU,EAAE;wBACf,sBAAO;gCACL,QAAQ,EAAE;oCACR,SAAS,EAAE,KAAK;oCAChB,WAAW,EAAE,KAAK,CAAC,qCAAqC;iCACzD;6BACF,EAAA;qBACF;iBACF;gBAED,sBAAO;wBACL,KAAK,iCACA,KAAK,GACL,QAAQ;4BACX,aAAa;4BACb,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EACnC,GAAG,EAAE,yCAAoB,GAC1B;qBACF,EAAA;;;KACF,CAAA;AAhEY,QAAA,qBAAqB,yBAgEjC"}
+{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AAGrE,mDAMyB;AACzB,gDAO+B;AAE/B,qCAGkB;AAElB,mEAIqC;AAErC,IAAM,mBAAmB,GAAG;IAC1B,QAAQ,EAAE,iCAAgB;IAC1B,SAAS,EAAE,kCAAiB;IAC5B,oBAAoB,EAAE,6CAA4B;IAClD,OAAO,EAAE,gCAAe;CACzB,CAAA;AAEM,IAAM,qBAAqB,GAAG,UAGnC,OAA+B,EAC/B,KAAqB,EACrB,OAAiC;;;;;;gBAEzB,QAAQ,GAAK,OAAO,SAAZ,CAAY;gBAEP,qBAAM,IAAA,wBAAkB,EAC3C,iBAAW,CAAC,IAAI,EAChB,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,OAAO,0CAAE,MAAM,KAAI,EAAE,EACjC,SAAS,EACT,SAAS,EACT,SAAS,CACV,EAAA;;gBANK,YAAY,GAAG,SAMpB;gBAEG,gBAAgB,GAAkC,EAAE,CAAA;gBAClD,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,oCAAmB,CAAA;;;;gBAGpD,qBAAM,YAAY,CAAC;wBACpC,YAAY,cAAA;wBACZ,OAAO,SAAA;wBACP,OAAO,wBAAO,OAAO,KAAE,YAAY,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,KAAI,EAAE,GAAE;wBAChE,QAAQ,EAAE,QAAQ,IAAI,qBAAa,CAAC,eAAe;qBACpD,CAAC,EAAA;;gBALF,gBAAgB,GAAG,SAKjB,CAAA;;;;gBAEF,IAAA,gCAAsB,EAAC;oBACrB,WAAW,EAAE,kCAA2B,QAAQ,CAAE;oBAClD,QAAQ,EAAE,KAAG;iBACd,CAAC,CAAA;gBACF,sBAAO,IAAA,6CAAwB,EAAC,KAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAA;;gBAGhD,QAAQ,GAAG,IAAA,wDAAmC,EAClD,gBAAgB,EAChB,OAAO,EACP,OAAO,CACR,CAAA;gBAED,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,qCAAqC,EAAE,CAAC;oBAC3C,aAAa,GAAG,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAA;oBAClD,UAAU,GAAG,IAAA,+CAAqC,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;oBAE1E,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,sBAAO;gCACL,QAAQ,EAAE;oCACR,SAAS,EAAE,KAAK;oCAChB,WAAW,EAAE,KAAK,CAAC,qCAAqC;iCACzD;6BACF,EAAA;oBACH,CAAC;gBACH,CAAC;gBAED,sBAAO;wBACL,KAAK,iCACA,KAAK,GACL,QAAQ,KACX,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EACnC,GAAG,EAAE,yCAAoB,GAC1B;qBACF,EAAA;;;KACF,CAAA;AA/DY,QAAA,qBAAqB,yBA+DjC"}

package/dist/cjs/helpers/RenderScriptList.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,13 +9,9 @@ var script_1 = __importDefault(require("next/script"));
 var RenderScriptList = function (_a) {
     var scriptList = _a.scriptList;
     return (react_1.default.createElement(react_1.default.Fragment, null, scriptList.map(function (scriptData) {
-        var scriptProps = {
-            key: (0, newskit_1.getSSRId)(),
-            dangerouslySetInnerHTML: {
+        return (react_1.default.createElement(script_1.default, { type: "text/javascript", key: (0, newskit_1.getSSRId)(), dangerouslySetInnerHTML: {
                 __html: scriptData.content,
-            },
-        };
-        return (react_1.default.createElement(script_1.default, __assign({ type: "text/javascript" }, scriptProps, { strategy: "lazyOnload" })));
+            }, strategy: "lazyOnload" }));
     })));
 };
 exports.default = RenderScriptList;

package/dist/cjs/helpers/RenderScriptList.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderScriptList.js","sourceRoot":"","sources":["../../../src/helpers/RenderScriptList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAAyB;AACzB,mCAAkC;AAClC,uDAAgC;AAKhC,IAAM,gBAAgB,GAAoC,UAAC,EAAc;QAAZ,UAAU,gBAAA;IACrE,OAAO,CACL,8DACG,UAAU,CAAC,GAAG,CAAC,UAAC,UAAU;QACzB,IAAM,WAAW,GAAG;YAClB,GAAG,EAAE,IAAA,kBAAQ,GAAE;YACf,uBAAuB,EAAE;gBACvB,MAAM,EAAE,UAAU,CAAC,OAAO;aAC3B;SACF,CAAA;QACD,OAAO,CACL,8BAAC,gBAAM,aACL,IAAI,EAAC,iBAAiB,IAClB,WAAW,IACf,QAAQ,EAAC,YAAY,IACrB,CACH,CAAA;IACH,CAAC,CAAC,CACD,CACJ,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,gBAAgB,CAAA"}
+{"version":3,"file":"RenderScriptList.js","sourceRoot":"","sources":["../../../src/helpers/RenderScriptList.tsx"],"names":[],"mappings":";;;;;AAAA,gDAAyB;AACzB,mCAAkC;AAClC,uDAAgC;AAKhC,IAAM,gBAAgB,GAAoC,UAAC,EAAc;QAAZ,UAAU,gBAAA;IACrE,OAAO,CACL,8DACG,UAAU,CAAC,GAAG,CAAC,UAAC,UAAU;QACzB,OAAO,CACL,8BAAC,gBAAM,IACL,IAAI,EAAC,iBAAiB,EACtB,GAAG,EAAE,IAAA,kBAAQ,GAAE,EACf,uBAAuB,EAAE;gBACvB,MAAM,EAAE,UAAU,CAAC,OAAO;aAC3B,EACD,QAAQ,EAAC,YAAY,GACrB,CACH,CAAA;IACH,CAAC,CAAC,CACD,CACJ,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,gBAAgB,CAAA"}

package/dist/cjs/helpers/apiHandlerUtils.js

@@ -13,13 +13,15 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMutation = exports.getMutationVariables = void 0;
 var queries_1 = require("./../queries");
+var config_1 = require("../config");
+var isBroadcasting = config_1.publisher === 'BROADCASTING';
 var mutationsMap = {
-    name: queries_1.mutateUser,
+    name: isBroadcasting ? queries_1.mutateUserBroadcasting : queries_1.mutateUser,
     phoneNumber: queries_1.mutateUser,
     mobile: queries_1.mutateUser,
     paymentMethodId: queries_1.mutateStripePaymentMethod,
     zuoraPaymentMethod: queries_1.mutateZuoraPaymentMethod,
-    email: queries_1.mutateUser,
+    email: isBroadcasting ? queries_1.mutateUserBroadcasting : queries_1.mutateUser,
     address: queries_1.mutateUser,
     confirmCancellation: queries_1.mutateCancellation,
     'delivery-instructions': queries_1.mutateDeliveryInstructions,
@@ -34,9 +36,27 @@ var mutationsMap = {
     'delete-account': queries_1.mutateDeleteAccount,
     'remove-group-account-member': queries_1.mutateRemoveGroupAccountMember,
     inviteFamilyEmail: queries_1.mutateSendFamilyMemberInvite,
+    inviteFamilyEmailV2: queries_1.mutateSendFamilyMemberInviteV2,
+    dob: queries_1.mutateUserBroadcasting,
+    gender: queries_1.mutateUserBroadcasting,
 };
-var getMutationVariables = function (input, validationSchemaKey) {
-    if (validationSchemaKey === 'commenting-notifications' ||
+var getMutationVariables = function (
+/* eslint-disable  @typescript-eslint/no-explicit-any */
+// we would like the input to be any
+input, validationSchemaKey) {
+    if (isBroadcasting) {
+        var firstName = input.firstName, lastName = input.lastName, gender = input.gender, email = input.email, dateOfBirth = input.dateOfBirth;
+        return {
+            input: {
+                firstName: firstName,
+                lastName: lastName,
+                gender: gender,
+                email: email,
+                dateOfBirth: dateOfBirth,
+            },
+        };
+    }
+    else if (validationSchemaKey === 'commenting-notifications' ||
         validationSchemaKey === 'displayName') {
         var username = input.username, displayName = input.displayName, email = input.email, emailVerified = input.emailVerified, likes = input.likes, mentions = input.mentions, replies = input.replies;
         return {

package/dist/cjs/helpers/apiHandlerUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiHandlerUtils.js","sourceRoot":"","sources":["../../../src/helpers/apiHandlerUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,wCAgBqB;AAErB,IAAM,YAAY,GAAG;IACnB,IAAI,EAAE,oBAAU;IAChB,WAAW,EAAE,oBAAU;IACvB,MAAM,EAAE,oBAAU;IAClB,eAAe,EAAE,mCAAyB;IAC1C,kBAAkB,EAAE,kCAAwB;IAC5C,KAAK,EAAE,oBAAU;IACjB,OAAO,EAAE,oBAAU;IACnB,mBAAmB,EAAE,4BAAkB;IACvC,uBAAuB,EAAE,oCAA0B;IACnD,qBAAqB,EAAE,iCAAuB;IAC9C,qBAAqB,EAAE,iCAAuB;IAC9C,qBAAqB,EAAE,iCAAuB;IAC9C,QAAQ,EAAE,mCAAyB;IACnC,WAAW,EAAE,oCAA0B;IACvC,0BAA0B,EAAE,oCAA0B;IACtD,sBAAsB,EAAE,sCAA4B;IACpD,wBAAwB,EAAE,wCAA8B;IACxD,gBAAgB,EAAE,6BAAmB;IACrC,6BAA6B,EAAE,wCAA8B;IAC7D,iBAAiB,EAAE,sCAA4B;CAChD,CAAA;AAEM,IAAM,oBAAoB,GAAG,UAClC,KAAU,EACV,mBAA2B;IAE3B,IACE,mBAAmB,KAAK,0BAA0B;QAClD,mBAAmB,KAAK,aAAa,EACrC;QAEE,IAAA,QAAQ,GAON,KAAK,SAPC,EACR,WAAW,GAMT,KAAK,YANI,EACX,KAAK,GAKH,KAAK,MALF,EACL,aAAa,GAIX,KAAK,cAJM,EACb,KAAK,GAGH,KAAK,MAHF,EACL,QAAQ,GAEN,KAAK,SAFC,EACR,OAAO,GACL,KAAK,QADA,CACA;QACT,OAAO;YACL,KAAK,EAAE;gBACL,KAAK,EAAE,KAAK;gBACZ,QAAQ,UAAA;gBACR,WAAW,aAAA;gBACX,KAAK,OAAA;gBACL,aAAa,EAAE,aAAa,IAAI,KAAK;gBACrC,WAAW,EAAE;oBACX,KAAK,OAAA;oBACL,QAAQ,UAAA;oBACR,OAAO,SAAA;iBACR;aACF;SACF,CAAA;KACF;IAED,IAAI,mBAAmB,KAAK,SAAS,EAAE;QACrC,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,wBAAO,KAAK,KAAE,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,CAAC,OAAO,EAAE,GAAE;aAClE;SACF,CAAA;KACF;IAED,IAAI,mBAAmB,KAAK,qBAAqB,EAAE;QACjD,IAAM,iBAAiB,GAAG;YACxB,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,kBAAkB;aACjC;SACF,CAAA;QACD,OAAO,iBAAiB,CAAA;KACzB;IAED,IAAI,mBAAmB,KAAK,oBAAoB,EAAE;QAChD,OAAO;YACL,KAAK,wBACA,KAAK,KACR,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EACtC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,GACrC;SACF,CAAA;KACF;IACD,OAAO,EAAE,KAAK,OAAA,EAAE,CAAA;AAClB,CAAC,CAAA;AA7DY,QAAA,oBAAoB,wBA6DhC;AAEM,IAAM,WAAW,GAAG,UAAC,GAAW;IACrC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC,CAAA;AAFY,QAAA,WAAW,eAEvB"}
+{"version":3,"file":"apiHandlerUtils.js","sourceRoot":"","sources":["../../../src/helpers/apiHandlerUtils.ts"],"names":[],"mappings":"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"}

package/dist/cjs/helpers/cookiesUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,UAAG,IAAI,CAAE,CAAC,CAAA;IAEzD,IAAI,YAAY,EAAE;QAChB,IAAI,WAAW,SAAA,CAAA;QACf,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CACzB,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,UAAG,IAAI,CAAE,CAAC,EAA3B,CAA2B,CAAC,CAAA;QAEjD,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;KACpC;SAAM;QACL,OAAO,EAAE,CAAA;KACV;AACH,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B"}
+{"version":3,"file":"cookiesUtils.js","sourceRoot":"","sources":["../../../src/helpers/cookiesUtils.ts"],"names":[],"mappings":";;;AAEO,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,OAAwB;;IACnE,IAAM,YAAY,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CAAE,QAAQ,CAAC,UAAG,IAAI,CAAE,CAAC,CAAA;IAEzD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,WAAW,SAAA,CAAA;QACf,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,0CACzB,KAAK,CAAC,GAAG,EACV,IAAI,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,QAAQ,CAAC,UAAG,IAAI,CAAE,CAAC,EAA3B,CAA2B,CAAC,CAAA;QAEjD,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,OAAO,EAAE,IAAI,MAAA,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B"}

package/dist/cjs/helpers/dataUtils.d.ts

@@ -1,14 +1,21 @@
-/// <reference types="react" />
 import { Data, UserData } from '../pages/types';
 import { EditFieldType, ButtonGroupProps, ListItemType } from '@newskit-render/shared-components';
 export declare const formateDate: (date: string, options?: {}) => string;
 export declare const calculateCells: (item: ListItemType) => Record<string, number>;
-export declare const getDefaultItemValue: (data: UserData, type: string, placeholder: string | string[]) => string | string[] | JSX.Element;
-export declare const getListItemValue: (data: UserData, type: string, placeholder: string | string[], path?: string) => string | string[] | JSX.Element;
+export declare const getDefaultItemValue: (data: UserData, type: string, placeholder: string | string[], context?: {
+    publisher?: string;
+}) => string | string[] | JSX.Element;
+export declare const getListItemValue: (data: UserData, type: string, placeholder: string | string[], path?: string, context?: {
+    publisher?: string;
+}) => string | string[] | JSX.Element;
 export declare const getValueDescription: (data: Record<string, unknown> | UserData | undefined, type: string, valueDescription: string | string[]) => string | JSX.Element | null;
-export declare const getHref: (baseUrl: string, data: Partial<UserData> | undefined, href: string | undefined, publisher?: string) => string;
 export declare const replaceBaseURL: (baseUrl: string, href: string | undefined, defaultValue?: string) => string;
+export declare const getHref: (baseUrl: string, data: Partial<UserData> | undefined, href: string | undefined, options?: {
+    publisher?: string;
+    type?: string;
+}) => string;
 export declare const formateString: (field: string) => string;
+export declare const getDefaultTitle: (field: string) => string;
 export declare const getEditTitle: (field: string, type?: string) => string;
 export declare const getErrorName: (type: string) => string;
 export declare const styleToString: (style: Record<string, string>) => string;
@@ -17,13 +24,13 @@ export declare const getListItemArialLabel: (data: UserData, item: ListItemType)
 export declare const getListItemAriaDescribedby: (item: ListItemType) => {
     describedId: string;
     describedBy: {
-        'aria-describedby': string;
+        "aria-describedby": string;
     } | undefined;
 };
 export declare const mergeButtonGroupProps: (baseUrl: string, baseProps?: Partial<ButtonGroupProps>, componentProps?: Partial<ButtonGroupProps>) => ButtonGroupProps;
 export declare const getSanitizedObject: (obj: {
     [x: string]: any;
-}, returnType: 'encode' | 'decode') => {
+}, returnType: "encode" | "decode") => {
     [x: string]: any;
 };
 export declare const getInvoiceData: (data: UserData, itemType: string | undefined, pageSize: number) => any;

package/dist/cjs/helpers/dataUtils.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoiceData = exports.getSanitizedObject = exports.mergeButtonGroupProps = exports.getListItemAriaDescribedby = exports.getListItemArialLabel = exports.getEditField = exports.styleToString = exports.getErrorName = exports.getEditTitle = exports.formateString = exports.replaceBaseURL = exports.getHref = exports.getValueDescription = exports.getListItemValue = exports.getDefaultItemValue = exports.calculateCells = exports.formateDate = void 0;
+exports.getInvoiceData = exports.getSanitizedObject = exports.mergeButtonGroupProps = exports.getListItemAriaDescribedby = exports.getListItemArialLabel = exports.getEditField = exports.styleToString = exports.getErrorName = exports.getEditTitle = exports.getDefaultTitle = exports.formateString = exports.getHref = exports.replaceBaseURL = exports.getValueDescription = exports.getListItemValue = exports.getDefaultItemValue = exports.calculateCells = exports.formateDate = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 var PaymentItem_1 = __importDefault(require("../Components/Elements/PaymentItem"));
 var lodash_get_1 = __importDefault(require("lodash.get"));
@@ -28,6 +28,7 @@ var config_1 = require("../config");
 var xss_1 = __importDefault(require("xss"));
 var lodash_unescape_1 = __importDefault(require("lodash.unescape"));
 var paymentUtils_1 = require("./paymentUtils");
+var types_1 = require("../Components/Sections/Form/Payment/types");
 var listItemPaths = {
     firstName: 'firstName',
     lastName: 'lastName',
@@ -40,6 +41,7 @@ var listItemPaths = {
     mobile: 'mobile',
     landline: 'phoneNumber',
     deliveryInstructions: 'subscriptions[0].deliveryInformation',
+    gender: 'gender',
 };
 var formateDate = function (date, options) {
     if (options === void 0) { options = {}; }
@@ -63,14 +65,15 @@ var getPhoneDefaults = function (placeholder) {
         : 'Invalid';
     return { defaultMessage: defaultMessage, invalidMessage: invalidMessage };
 };
-var getDefaultItemValue = function (data, type, placeholder) {
+var getDefaultItemValue = function (data, type, placeholder, context) {
+    var _a;
     switch (type) {
         case 'name': {
-            var name_1 = "".concat((0, lodash_get_1.default)(data, listItemPaths['firstName'], ''), " ").concat((0, lodash_get_1.default)(data, listItemPaths['lastName'], ''));
+            var name_1 = "".concat((0, lodash_get_1.default)(data, listItemPaths.firstName, ''), " ").concat((0, lodash_get_1.default)(data, listItemPaths.lastName, ''));
             return name_1.length > 1 ? name_1 : placeholder;
         }
         case 'mobile': {
-            var _a = getPhoneDefaults(placeholder), defaultMessage = _a.defaultMessage, invalidMessage = _a.invalidMessage;
+            var _b = getPhoneDefaults(placeholder), defaultMessage = _b.defaultMessage, invalidMessage = _b.invalidMessage;
             if (data && (0, lodash_get_1.default)(data, listItemPaths[type])) {
                 if (!(0, react_phone_number_input_1.isValidPhoneNumber)(data.mobile)) {
                     return invalidMessage;
@@ -85,7 +88,7 @@ var getDefaultItemValue = function (data, type, placeholder) {
             return defaultMessage;
         }
         case 'landline': {
-            var _b = getPhoneDefaults(placeholder), defaultMessage = _b.defaultMessage, invalidMessage = _b.invalidMessage;
+            var _c = getPhoneDefaults(placeholder), defaultMessage = _c.defaultMessage, invalidMessage = _c.invalidMessage;
             if (data && (0, lodash_get_1.default)(data, listItemPaths[type])) {
                 var is10DigitUKNumber = data.phoneNumber.length === 12 && data.phoneNumber.startsWith('+44');
                 if (is10DigitUKNumber
@@ -148,7 +151,18 @@ var getDefaultItemValue = function (data, type, placeholder) {
         }
         case 'dob': {
             var date = (0, lodash_get_1.default)(data, listItemPaths[type]);
-            return date ? (0, exports.formateDate)(date) : placeholder;
+            return date
+                ? (0, exports.formateDate)(date, (context === null || context === void 0 ? void 0 : context.publisher) === 'BROADCASTING' ? { year: 'numeric' } : {})
+                : placeholder;
+        }
+        case 'gender': {
+            var gender = (0, lodash_get_1.default)(data, listItemPaths[type]);
+            var genderValueToLabelMap = {
+                Male: 'Male',
+                Female: 'Female',
+                NonBinary: 'Non binary',
+            };
+            return (_a = genderValueToLabelMap[gender]) !== null && _a !== void 0 ? _a : placeholder;
         }
         case 'deliveryInstructions': {
             var deliveryInformation = (0, lodash_get_1.default)(data, listItemPaths[type]);
@@ -181,14 +195,14 @@ var getDefaultItemValue = function (data, type, placeholder) {
     }
 };
 exports.getDefaultItemValue = getDefaultItemValue;
-var getPathValue = function (data, path, placeholder) {
+var getPathValue = function (data, path, placeholder, context) {
     var value = (0, lodash_get_1.default)(data, path);
     return value ? value : placeholder;
 };
-var getListItemValue = function (data, type, placeholder, path) {
+var getListItemValue = function (data, type, placeholder, path, context) {
     return path
-        ? getPathValue(data, path, placeholder)
-        : (0, exports.getDefaultItemValue)(data, type, placeholder);
+        ? getPathValue(data, path, placeholder, context)
+        : (0, exports.getDefaultItemValue)(data, type, placeholder, context);
 };
 exports.getListItemValue = getListItemValue;
 var getValueDescription = function (data, type, valueDescription) {
@@ -226,10 +240,24 @@ var getValueDescription = function (data, type, valueDescription) {
     }
 };
 exports.getValueDescription = getValueDescription;
-var getHref = function (baseUrl, data, href, publisher) {
+var replaceBaseURL = function (baseUrl, href, defaultValue) {
+    if (defaultValue === void 0) { defaultValue = ''; }
+    return (href === null || href === void 0 ? void 0 : href.replace('[baseURL]', baseUrl || '')) || defaultValue;
+};
+exports.replaceBaseURL = replaceBaseURL;
+var getHref = function (baseUrl, data, href, options) {
+    if (options === void 0) { options = {}; }
+    if ((options === null || options === void 0 ? void 0 : options.type) === 'payment') {
+        var payment = (0, lodash_get_1.default)(data, 'subscriptions[0].billingDetails.paymentMethod.type') || '';
+        var paymentType = payment.toLowerCase();
+        if (paymentType === types_1.PaymentTypes.creditcardreferencetransaction ||
+            paymentType === types_1.PaymentTypes.paypal) {
+            return '';
+        }
+    }
     switch (href) {
         case '/newsletters':
-            if (publisher === 'TIMES') {
+            if (options.publisher === 'TIMES') {
                 return (0, exports.replaceBaseURL)(baseUrl, href);
             }
             if (data === null || data === void 0 ? void 0 : data.email) {
@@ -241,49 +269,43 @@ var getHref = function (baseUrl, data, href, publisher) {
     }
 };
 exports.getHref = getHref;
-var replaceBaseURL = function (baseUrl, href, defaultValue) {
-    if (defaultValue === void 0) { defaultValue = ''; }
-    return (href === null || href === void 0 ? void 0 : href.replace('[baseURL]', baseUrl || '')) || defaultValue;
-};
-exports.replaceBaseURL = replaceBaseURL;
 var formateString = function (field) { return field.replace('-', ' '); };
 exports.formateString = formateString;
 var checkIfEmail = function (field) {
     return field === 'email' ? 'email address' : field;
 };
-var getEditTitle = function (field, type) {
+var getDefaultTitle = function (field) {
     var types = {
         password: 'Reset your',
         default: 'Edit your',
     };
-    if (field === 'mobile') {
-        return 'Edit your mobile number';
-    }
-    if (field === 'landline') {
-        return 'Edit your landline number';
-    }
-    if (field === 'payment') {
-        return 'Edit your payment method';
-    }
-    if (field === 'displayName') {
-        return 'Edit your display name';
-    }
-    if (field === 'delivery-instructions') {
-        return 'Delivery instructions';
-    }
-    if (field === 'holiday-stop' && type === 'add') {
-        return 'Add a Holiday Stop';
-    }
-    if (field === 'holiday-stop' && type === 'edit') {
-        return 'Edit a Holiday Stop';
-    }
-    if (field === 'vouchers') {
-        return 'Reorder vouchers';
-    }
-    if (field === 'family' && type === 'add') {
-        return 'Add a member';
-    }
-    return "".concat(types[field] || types.default, " ").concat(checkIfEmail((0, exports.formateString)(field)));
+    return types[field] || types.default;
+};
+exports.getDefaultTitle = getDefaultTitle;
+var getEditTitle = function (field, type) {
+    var _a, _b;
+    var titleMap = {
+        mobile: { default: 'Edit your mobile number' },
+        landline: { default: 'Edit your landline number' },
+        payment: { default: 'Edit your payment method' },
+        displayName: { default: 'Edit your display name' },
+        'delivery-instructions': { default: 'Delivery instructions' },
+        'holiday-stop': {
+            add: 'Add a Holiday Stop',
+            edit: 'Edit a Holiday Stop',
+        },
+        vouchers: { default: 'Reorder vouchers' },
+        family: {
+            add: 'Add a member',
+        },
+        'bonus-accounts': {
+            add: 'Add a member',
+        },
+    };
+    var titleForType = (type && ((_a = titleMap[field]) === null || _a === void 0 ? void 0 : _a[type])) || ((_b = titleMap[field]) === null || _b === void 0 ? void 0 : _b.default);
+    var title = titleForType ||
+        "".concat((0, exports.getDefaultTitle)(field), " ").concat(checkIfEmail((0, exports.formateString)(field)));
+    return title;
 };
 exports.getEditTitle = getEditTitle;
 var getErrorName = function (type) {