@newskit-render/my-account 7.151.1 → 7.151.2
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/getProviderPropsTimes.js +23 -24
- package/dist/cjs/getProviderPropsTimes.js.map +1 -1
- package/dist/cjs/helpers/subscriptionsUtils.d.ts +2 -1
- package/dist/cjs/helpers/subscriptionsUtils.js +5 -4
- package/dist/cjs/helpers/subscriptionsUtils.js.map +1 -1
- package/dist/esm/getProviderPropsTimes.js +23 -24
- package/dist/esm/getProviderPropsTimes.js.map +1 -1
- package/dist/esm/helpers/subscriptionsUtils.d.ts +2 -1
- package/dist/esm/helpers/subscriptionsUtils.js +5 -4
- package/dist/esm/helpers/subscriptionsUtils.js.map +1 -1
- package/package.json +2 -2
|
@@ -65,20 +65,20 @@ var pageProvidersMapper = {
|
|
|
65
65
|
};
|
|
66
66
|
var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
67
67
|
var provider, apolloClient, providerResponse, pageProvider, err_1, userData, featureFlags, optimizelyData, err_2, subscriptions, isEligible, handleMfaError, isStepUpMfaEnabled, cookie, stepUpMfaToken, isTNLMobileApp, apolloMfaClient, stepUpProvider, err_3;
|
|
68
|
-
var _c, _d, _e, _f
|
|
69
|
-
var context = _b.context, props = _b.props, options = _b.options,
|
|
70
|
-
return __generator(this, function (
|
|
71
|
-
switch (
|
|
68
|
+
var _c, _d, _e, _f;
|
|
69
|
+
var context = _b.context, props = _b.props, options = _b.options, _g = _b.enableStepUpMfa, enableStepUpMfa = _g === void 0 ? false : _g;
|
|
70
|
+
return __generator(this, function (_h) {
|
|
71
|
+
switch (_h.label) {
|
|
72
72
|
case 0:
|
|
73
73
|
provider = context.provider;
|
|
74
74
|
return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.main, ((_c = context.req.headers) === null || _c === void 0 ? void 0 : _c.cookie) || '', undefined, undefined, undefined, { enableStepUpMfa: false })];
|
|
75
75
|
case 1:
|
|
76
|
-
apolloClient =
|
|
76
|
+
apolloClient = _h.sent();
|
|
77
77
|
providerResponse = {};
|
|
78
78
|
pageProvider = pageProvidersMapper[provider] || providersTimes_1.genericPageProvider;
|
|
79
|
-
|
|
79
|
+
_h.label = 2;
|
|
80
80
|
case 2:
|
|
81
|
-
|
|
81
|
+
_h.trys.push([2, 4, , 5]);
|
|
82
82
|
return [4 /*yield*/, pageProvider({
|
|
83
83
|
apolloClient: apolloClient,
|
|
84
84
|
context: context,
|
|
@@ -86,10 +86,10 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
86
86
|
provider: provider || types_1.ProviderTypes.PersonalDetails,
|
|
87
87
|
})];
|
|
88
88
|
case 3:
|
|
89
|
-
providerResponse =
|
|
89
|
+
providerResponse = _h.sent();
|
|
90
90
|
return [3 /*break*/, 5];
|
|
91
91
|
case 4:
|
|
92
|
-
err_1 =
|
|
92
|
+
err_1 = _h.sent();
|
|
93
93
|
(0, helpers_1.handleNewRelicErrorLog)({
|
|
94
94
|
requestName: "getProviderPropsTimes - ".concat(provider),
|
|
95
95
|
reqError: err_1,
|
|
@@ -98,9 +98,9 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
98
98
|
case 5:
|
|
99
99
|
userData = (0, providerUtilsTimes_1.handleProviderPropsUserDataResponse)(providerResponse, context, options);
|
|
100
100
|
featureFlags = {};
|
|
101
|
-
|
|
101
|
+
_h.label = 6;
|
|
102
102
|
case 6:
|
|
103
|
-
|
|
103
|
+
_h.trys.push([6, 8, , 9]);
|
|
104
104
|
optimizelyData = (0, featureFlagUtils_1.prepareOptimizelyData)(userData, {
|
|
105
105
|
cookies: context.req.cookies,
|
|
106
106
|
});
|
|
@@ -110,20 +110,19 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
110
110
|
query: context.query,
|
|
111
111
|
}, optimizelyData))];
|
|
112
112
|
case 7:
|
|
113
|
-
featureFlags = (
|
|
113
|
+
featureFlags = (_h.sent());
|
|
114
114
|
return [3 /*break*/, 9];
|
|
115
115
|
case 8:
|
|
116
|
-
err_2 =
|
|
116
|
+
err_2 = _h.sent();
|
|
117
117
|
(0, helpers_1.handleNewRelicErrorLog)({
|
|
118
118
|
requestName: 'getProviderPropsTimes - getAllFeatureFlags',
|
|
119
119
|
reqError: err_2,
|
|
120
120
|
});
|
|
121
121
|
return [2 /*return*/, (0, providerUtilsTimes_1.handleProviderPropsError)(err_2, context, props)];
|
|
122
122
|
case 9:
|
|
123
|
-
if (
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
isEligible = (0, helpers_1.isUserPaymentTypeEligibleForZuoraPage)(subscriptions[0]);
|
|
123
|
+
if (props === null || props === void 0 ? void 0 : props.notEligibleForPaymentPagesRedirectUrl) {
|
|
124
|
+
subscriptions = ((_d = userData.user) === null || _d === void 0 ? void 0 : _d.subscriptions) || [];
|
|
125
|
+
isEligible = (0, helpers_1.isUserPaymentTypeEligibleForZuoraPage)(subscriptions[0], featureFlags);
|
|
127
126
|
if (!isEligible) {
|
|
128
127
|
return [2 /*return*/, {
|
|
129
128
|
redirect: {
|
|
@@ -136,9 +135,9 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
136
135
|
handleMfaError = function (errorCode) {
|
|
137
136
|
context.res.setHeader('Set-Cookie', "stepup_access_token=; path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT");
|
|
138
137
|
};
|
|
139
|
-
isStepUpMfaEnabled = enableStepUpMfa && featureFlags.enable_mfa.enabled && ((
|
|
138
|
+
isStepUpMfaEnabled = enableStepUpMfa && featureFlags.enable_mfa.enabled && ((_e = userData === null || userData === void 0 ? void 0 : userData.user) === null || _e === void 0 ? void 0 : _e.email);
|
|
140
139
|
if (!isStepUpMfaEnabled) return [3 /*break*/, 14];
|
|
141
|
-
cookie = ((
|
|
140
|
+
cookie = ((_f = context.req.headers) === null || _f === void 0 ? void 0 : _f.cookie)
|
|
142
141
|
? "".concat(context.req.headers.cookie, ";stepup_access_token=").concat(context.req.headers.stepup_access_token || '')
|
|
143
142
|
: '';
|
|
144
143
|
stepUpMfaToken = (0, helpers_1.getStepUpMfaToken)(context.req.headers);
|
|
@@ -152,21 +151,21 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
152
151
|
},
|
|
153
152
|
}];
|
|
154
153
|
}
|
|
155
|
-
|
|
154
|
+
_h.label = 10;
|
|
156
155
|
case 10:
|
|
157
|
-
|
|
156
|
+
_h.trys.push([10, 13, , 14]);
|
|
158
157
|
return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.main, cookie, undefined, undefined, undefined, {
|
|
159
158
|
enableStepUpMfa: true,
|
|
160
159
|
handleMfaError: handleMfaError,
|
|
161
160
|
})];
|
|
162
161
|
case 11:
|
|
163
|
-
apolloMfaClient =
|
|
162
|
+
apolloMfaClient = _h.sent();
|
|
164
163
|
return [4 /*yield*/, (0, providers_1.stepUpMfaProvider)({
|
|
165
164
|
apolloClient: apolloMfaClient,
|
|
166
165
|
options: options,
|
|
167
166
|
})];
|
|
168
167
|
case 12:
|
|
169
|
-
stepUpProvider =
|
|
168
|
+
stepUpProvider = _h.sent();
|
|
170
169
|
if (stepUpProvider.data.authorizeUri.mfaUri) {
|
|
171
170
|
return [2 /*return*/, {
|
|
172
171
|
redirect: {
|
|
@@ -177,7 +176,7 @@ var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void
|
|
|
177
176
|
}
|
|
178
177
|
return [3 /*break*/, 14];
|
|
179
178
|
case 13:
|
|
180
|
-
err_3 =
|
|
179
|
+
err_3 = _h.sent();
|
|
181
180
|
console.error('Error setting up stepup mfa');
|
|
182
181
|
handleMfaError();
|
|
183
182
|
return [2 /*return*/, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AAGrE,mDAMyB;AACzB,gDAO+B;AAE/B,qCAKkB;AAElB,mEAIqC;AACrC,yCAA+C;AAC/C,+DAGsC;AACtC,+DAGmC;AAEnC,uEAG0C;AAE1C,IAAM,mBAAmB,GAAG;IAC1B,QAAQ,EAAE,iCAAgB;IAC1B,SAAS,EAAE,kCAAiB;IAC5B,oBAAoB,EAAE,6CAA4B;IAClD,OAAO,EAAE,gCAAe;CACzB,CAAA;AASM,IAAM,qBAAqB,GAAG,iEAEnC,EAK2B;;;QAJ3B,OAAO,aAAA,EACP,KAAK,WAAA,EACL,OAAO,aAAA,EACP,uBAAuB,EAAvB,eAAe,mBAAG,KAAK,KAAA;;;;gBAIf,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,EACT,EAAE,eAAe,EAAE,KAAK,EAAE,CAC3B,EAAA;;gBAPK,YAAY,GAAG,SAOpB;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,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;gBAEG,YAAY,GAAkB,EAAE,CAAA;;;;gBAG5B,cAAc,GAAG,IAAA,wCAAqB,EAAC,QAAQ,EAAE;oBACrD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;iBAC7B,CAAC,CAAA;gBAEc,qBAAM,IAAA,kCAAkB,EACtC,IAAA,oCAAiB,EACf;wBACE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;wBAC5B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;wBAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;qBACrB,EACD,cAAc,CACf,CACF,EAAA;;gBATD,YAAY,GAAG,CAAC,SASf,CAAkB,CAAA;;;;gBAEnB,IAAA,gCAAsB,EAAC;oBACrB,WAAW,EAAE,4CAA4C;oBACzD,QAAQ,EAAE,KAAG;iBACd,CAAC,CAAA;gBACF,sBAAO,IAAA,6CAAwB,EAAC,KAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAA;;gBAGtD,
|
|
1
|
+
{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Subscriptions } from '../pages/types';
|
|
2
2
|
import { ContractPhase, GrantedIncentives } from '../pages/types';
|
|
3
|
+
import { DetailedFlags } from '@newskit-render/feature-flags';
|
|
3
4
|
type SubscriptionTypes = Subscriptions[] | null | undefined;
|
|
4
5
|
export declare const sortSubscriptionsByActive: (userSubscriptions: SubscriptionTypes) => Subscriptions[];
|
|
5
6
|
export declare const getFamilyAccountTypes: (userSubscriptions: SubscriptionTypes) => {
|
|
@@ -7,7 +8,7 @@ export declare const getFamilyAccountTypes: (userSubscriptions: SubscriptionType
|
|
|
7
8
|
isUserFamilyAccountPrimaryActive: boolean;
|
|
8
9
|
isUserFamilyAccountSecondary: boolean;
|
|
9
10
|
} | null;
|
|
10
|
-
export declare const isUserPaymentTypeEligibleForZuoraPage: (activeSubscription: Subscriptions) => boolean;
|
|
11
|
+
export declare const isUserPaymentTypeEligibleForZuoraPage: (activeSubscription: Subscriptions, featureFlags?: DetailedFlags) => boolean;
|
|
11
12
|
export declare const findActiveContractPhase: (contractPhases: ContractPhase[]) => ContractPhase | undefined;
|
|
12
13
|
export declare const hasActiveOrUpcomingDiscount: (grantedIncentives: GrantedIncentives[]) => boolean;
|
|
13
14
|
export declare const findLatestIncentiveStartDate: (grantedIncentives: GrantedIncentives[]) => GrantedIncentives | null;
|
|
@@ -50,16 +50,17 @@ var getFamilyAccountTypes = function (userSubscriptions) {
|
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
exports.getFamilyAccountTypes = getFamilyAccountTypes;
|
|
53
|
-
var isUserPaymentTypeEligibleForZuoraPage = function (activeSubscription) {
|
|
54
|
-
var _a, _b;
|
|
53
|
+
var isUserPaymentTypeEligibleForZuoraPage = function (activeSubscription, featureFlags) {
|
|
54
|
+
var _a, _b, _c;
|
|
55
55
|
var paymentType = ((_b = (_a = activeSubscription === null || activeSubscription === void 0 ? void 0 : activeSubscription.billingDetails) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.type) || '';
|
|
56
56
|
if (!paymentType)
|
|
57
57
|
return false;
|
|
58
58
|
var paymentTypeToLowerCase = paymentType.toLowerCase();
|
|
59
59
|
// Payment type BankTransfer - Direct debit in the UI
|
|
60
60
|
// Payment type CreditCard - Credit/Debit Card in the UI
|
|
61
|
-
if (
|
|
62
|
-
paymentTypeToLowerCase === types_1.PaymentTypes.
|
|
61
|
+
if (!((_c = featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.enable_payment_method_edit) === null || _c === void 0 ? void 0 : _c.enabled) &&
|
|
62
|
+
(paymentTypeToLowerCase === types_1.PaymentTypes.creditcard ||
|
|
63
|
+
paymentTypeToLowerCase === types_1.PaymentTypes.banktransfer)) {
|
|
63
64
|
return true;
|
|
64
65
|
}
|
|
65
66
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptionsUtils.js","sourceRoot":"","sources":["../../../src/helpers/subscriptionsUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mEAAwE;AAExE,4CAA0C;AAC1C,8DAA4D;AAC5D,8CAA4C;AAC5C,qCAAuC;
|
|
1
|
+
{"version":3,"file":"subscriptionsUtils.js","sourceRoot":"","sources":["../../../src/helpers/subscriptionsUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,20 +62,20 @@ var pageProvidersMapper = {
|
|
|
62
62
|
};
|
|
63
63
|
export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
64
64
|
var provider, apolloClient, providerResponse, pageProvider, err_1, userData, featureFlags, optimizelyData, err_2, subscriptions, isEligible, handleMfaError, isStepUpMfaEnabled, cookie, stepUpMfaToken, isTNLMobileApp, apolloMfaClient, stepUpProvider, err_3;
|
|
65
|
-
var _c, _d, _e, _f
|
|
66
|
-
var context = _b.context, props = _b.props, options = _b.options,
|
|
67
|
-
return __generator(this, function (
|
|
68
|
-
switch (
|
|
65
|
+
var _c, _d, _e, _f;
|
|
66
|
+
var context = _b.context, props = _b.props, options = _b.options, _g = _b.enableStepUpMfa, enableStepUpMfa = _g === void 0 ? false : _g;
|
|
67
|
+
return __generator(this, function (_h) {
|
|
68
|
+
switch (_h.label) {
|
|
69
69
|
case 0:
|
|
70
70
|
provider = context.provider;
|
|
71
71
|
return [4 /*yield*/, createApolloClient(ClientTypes.main, ((_c = context.req.headers) === null || _c === void 0 ? void 0 : _c.cookie) || '', undefined, undefined, undefined, { enableStepUpMfa: false })];
|
|
72
72
|
case 1:
|
|
73
|
-
apolloClient =
|
|
73
|
+
apolloClient = _h.sent();
|
|
74
74
|
providerResponse = {};
|
|
75
75
|
pageProvider = pageProvidersMapper[provider] || genericPageProvider;
|
|
76
|
-
|
|
76
|
+
_h.label = 2;
|
|
77
77
|
case 2:
|
|
78
|
-
|
|
78
|
+
_h.trys.push([2, 4, , 5]);
|
|
79
79
|
return [4 /*yield*/, pageProvider({
|
|
80
80
|
apolloClient: apolloClient,
|
|
81
81
|
context: context,
|
|
@@ -83,10 +83,10 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
83
83
|
provider: provider || ProviderTypes.PersonalDetails,
|
|
84
84
|
})];
|
|
85
85
|
case 3:
|
|
86
|
-
providerResponse =
|
|
86
|
+
providerResponse = _h.sent();
|
|
87
87
|
return [3 /*break*/, 5];
|
|
88
88
|
case 4:
|
|
89
|
-
err_1 =
|
|
89
|
+
err_1 = _h.sent();
|
|
90
90
|
handleNewRelicErrorLog({
|
|
91
91
|
requestName: "getProviderPropsTimes - ".concat(provider),
|
|
92
92
|
reqError: err_1,
|
|
@@ -95,9 +95,9 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
95
95
|
case 5:
|
|
96
96
|
userData = handleProviderPropsUserDataResponse(providerResponse, context, options);
|
|
97
97
|
featureFlags = {};
|
|
98
|
-
|
|
98
|
+
_h.label = 6;
|
|
99
99
|
case 6:
|
|
100
|
-
|
|
100
|
+
_h.trys.push([6, 8, , 9]);
|
|
101
101
|
optimizelyData = prepareOptimizelyData(userData, {
|
|
102
102
|
cookies: context.req.cookies,
|
|
103
103
|
});
|
|
@@ -107,20 +107,19 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
107
107
|
query: context.query,
|
|
108
108
|
}, optimizelyData))];
|
|
109
109
|
case 7:
|
|
110
|
-
featureFlags = (
|
|
110
|
+
featureFlags = (_h.sent());
|
|
111
111
|
return [3 /*break*/, 9];
|
|
112
112
|
case 8:
|
|
113
|
-
err_2 =
|
|
113
|
+
err_2 = _h.sent();
|
|
114
114
|
handleNewRelicErrorLog({
|
|
115
115
|
requestName: 'getProviderPropsTimes - getAllFeatureFlags',
|
|
116
116
|
reqError: err_2,
|
|
117
117
|
});
|
|
118
118
|
return [2 /*return*/, handleProviderPropsError(err_2, context, props)];
|
|
119
119
|
case 9:
|
|
120
|
-
if (
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
isEligible = isUserPaymentTypeEligibleForZuoraPage(subscriptions[0]);
|
|
120
|
+
if (props === null || props === void 0 ? void 0 : props.notEligibleForPaymentPagesRedirectUrl) {
|
|
121
|
+
subscriptions = ((_d = userData.user) === null || _d === void 0 ? void 0 : _d.subscriptions) || [];
|
|
122
|
+
isEligible = isUserPaymentTypeEligibleForZuoraPage(subscriptions[0], featureFlags);
|
|
124
123
|
if (!isEligible) {
|
|
125
124
|
return [2 /*return*/, {
|
|
126
125
|
redirect: {
|
|
@@ -133,9 +132,9 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
133
132
|
handleMfaError = function (errorCode) {
|
|
134
133
|
context.res.setHeader('Set-Cookie', "stepup_access_token=; path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT");
|
|
135
134
|
};
|
|
136
|
-
isStepUpMfaEnabled = enableStepUpMfa && featureFlags.enable_mfa.enabled && ((
|
|
135
|
+
isStepUpMfaEnabled = enableStepUpMfa && featureFlags.enable_mfa.enabled && ((_e = userData === null || userData === void 0 ? void 0 : userData.user) === null || _e === void 0 ? void 0 : _e.email);
|
|
137
136
|
if (!isStepUpMfaEnabled) return [3 /*break*/, 14];
|
|
138
|
-
cookie = ((
|
|
137
|
+
cookie = ((_f = context.req.headers) === null || _f === void 0 ? void 0 : _f.cookie)
|
|
139
138
|
? "".concat(context.req.headers.cookie, ";stepup_access_token=").concat(context.req.headers.stepup_access_token || '')
|
|
140
139
|
: '';
|
|
141
140
|
stepUpMfaToken = getStepUpMfaToken(context.req.headers);
|
|
@@ -149,21 +148,21 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
149
148
|
},
|
|
150
149
|
}];
|
|
151
150
|
}
|
|
152
|
-
|
|
151
|
+
_h.label = 10;
|
|
153
152
|
case 10:
|
|
154
|
-
|
|
153
|
+
_h.trys.push([10, 13, , 14]);
|
|
155
154
|
return [4 /*yield*/, createApolloClient(ClientTypes.main, cookie, undefined, undefined, undefined, {
|
|
156
155
|
enableStepUpMfa: true,
|
|
157
156
|
handleMfaError: handleMfaError,
|
|
158
157
|
})];
|
|
159
158
|
case 11:
|
|
160
|
-
apolloMfaClient =
|
|
159
|
+
apolloMfaClient = _h.sent();
|
|
161
160
|
return [4 /*yield*/, stepUpMfaProvider({
|
|
162
161
|
apolloClient: apolloMfaClient,
|
|
163
162
|
options: options,
|
|
164
163
|
})];
|
|
165
164
|
case 12:
|
|
166
|
-
stepUpProvider =
|
|
165
|
+
stepUpProvider = _h.sent();
|
|
167
166
|
if (stepUpProvider.data.authorizeUri.mfaUri) {
|
|
168
167
|
return [2 /*return*/, {
|
|
169
168
|
redirect: {
|
|
@@ -174,7 +173,7 @@ export var getProviderPropsTimes = function (_a) { return __awaiter(void 0, [_a]
|
|
|
174
173
|
}
|
|
175
174
|
return [3 /*break*/, 14];
|
|
176
175
|
case 13:
|
|
177
|
-
err_3 =
|
|
176
|
+
err_3 = _h.sent();
|
|
178
177
|
console.error('Error setting up stepup mfa');
|
|
179
178
|
handleMfaError();
|
|
180
179
|
return [2 /*return*/, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getProviderPropsTimes.js","sourceRoot":"","sources":["../../src/getProviderPropsTimes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Subscriptions } from '../pages/types';
|
|
2
2
|
import { ContractPhase, GrantedIncentives } from '../pages/types';
|
|
3
|
+
import { DetailedFlags } from '@newskit-render/feature-flags';
|
|
3
4
|
type SubscriptionTypes = Subscriptions[] | null | undefined;
|
|
4
5
|
export declare const sortSubscriptionsByActive: (userSubscriptions: SubscriptionTypes) => Subscriptions[];
|
|
5
6
|
export declare const getFamilyAccountTypes: (userSubscriptions: SubscriptionTypes) => {
|
|
@@ -7,7 +8,7 @@ export declare const getFamilyAccountTypes: (userSubscriptions: SubscriptionType
|
|
|
7
8
|
isUserFamilyAccountPrimaryActive: boolean;
|
|
8
9
|
isUserFamilyAccountSecondary: boolean;
|
|
9
10
|
} | null;
|
|
10
|
-
export declare const isUserPaymentTypeEligibleForZuoraPage: (activeSubscription: Subscriptions) => boolean;
|
|
11
|
+
export declare const isUserPaymentTypeEligibleForZuoraPage: (activeSubscription: Subscriptions, featureFlags?: DetailedFlags) => boolean;
|
|
11
12
|
export declare const findActiveContractPhase: (contractPhases: ContractPhase[]) => ContractPhase | undefined;
|
|
12
13
|
export declare const hasActiveOrUpcomingDiscount: (grantedIncentives: GrantedIncentives[]) => boolean;
|
|
13
14
|
export declare const findLatestIncentiveStartDate: (grantedIncentives: GrantedIncentives[]) => GrantedIncentives | null;
|
|
@@ -45,16 +45,17 @@ export var getFamilyAccountTypes = function (userSubscriptions) {
|
|
|
45
45
|
isUserFamilyAccountSecondary: groupAccountTypeToLowerCase === 'secondary',
|
|
46
46
|
};
|
|
47
47
|
};
|
|
48
|
-
export var isUserPaymentTypeEligibleForZuoraPage = function (activeSubscription) {
|
|
49
|
-
var _a, _b;
|
|
48
|
+
export var isUserPaymentTypeEligibleForZuoraPage = function (activeSubscription, featureFlags) {
|
|
49
|
+
var _a, _b, _c;
|
|
50
50
|
var paymentType = ((_b = (_a = activeSubscription === null || activeSubscription === void 0 ? void 0 : activeSubscription.billingDetails) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.type) || '';
|
|
51
51
|
if (!paymentType)
|
|
52
52
|
return false;
|
|
53
53
|
var paymentTypeToLowerCase = paymentType.toLowerCase();
|
|
54
54
|
// Payment type BankTransfer - Direct debit in the UI
|
|
55
55
|
// Payment type CreditCard - Credit/Debit Card in the UI
|
|
56
|
-
if (
|
|
57
|
-
paymentTypeToLowerCase === PaymentTypes.
|
|
56
|
+
if (!((_c = featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.enable_payment_method_edit) === null || _c === void 0 ? void 0 : _c.enabled) &&
|
|
57
|
+
(paymentTypeToLowerCase === PaymentTypes.creditcard ||
|
|
58
|
+
paymentTypeToLowerCase === PaymentTypes.banktransfer)) {
|
|
58
59
|
return true;
|
|
59
60
|
}
|
|
60
61
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptionsUtils.js","sourceRoot":"","sources":["../../../src/helpers/subscriptionsUtils.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAA;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"subscriptionsUtils.js","sourceRoot":"","sources":["../../../src/helpers/subscriptionsUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/my-account",
|
|
3
|
-
"version": "7.151.
|
|
3
|
+
"version": "7.151.2",
|
|
4
4
|
"description": "Newskit Render",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"publishConfig": {
|
|
119
119
|
"access": "public"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "73c6a90233c447be48666b7b5892a3ff49cbfd7f"
|
|
122
122
|
}
|