Skip to content

Commit 4495494

Browse files
committed
chore: address deprecated method logging review comments
1 parent c44f7e2 commit 4495494

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

src/consent.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import KitFilterHelper from './kitFilterHelper';
99
import Constants from './constants';
1010
import { IMParticleUser } from './identity-user-interfaces';
1111
import { IMParticleWebSDKInstance } from './mp-instance';
12-
import { logDeprecatedApiUsage } from './reporting/deprecatedApiLogger';
12+
import { logDeprecatedMethodUsage } from './reporting/deprecatedMethodLogger';
1313

1414
const { CCPAPurpose } = Constants;
1515

@@ -506,8 +506,8 @@ export default function Consent(this: IConsent, mpInstance: IMParticleWebSDKInst
506506

507507
// TODO: Can we remove this? It is deprecated.
508508
function removeCCPAState(this: ConsentState) {
509-
logDeprecatedApiUsage(mpInstance, {
510-
methodName: 'removeCCPAState',
509+
logDeprecatedMethodUsage(mpInstance, {
510+
methodName: 'Consent.removeCCPAState',
511511
warningMessage: 'removeCCPAState is deprecated and will be removed in a future release; use removeCCPAConsentState instead',
512512
});
513513
// @ts-ignore

src/identity.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from './utils';
2121
import { hasMPIDAndUserLoginChanged, hasMPIDChanged } from './user-utils';
2222
import { processReadyQueue } from './pre-init-utils';
23-
import { logDeprecatedApiUsage } from './reporting/deprecatedApiLogger';
23+
import { logDeprecatedMethodUsage } from './reporting/deprecatedMethodLogger';
2424

2525
export default function Identity(mpInstance) {
2626
const { getFeatureFlag, extend } = mpInstance._Helpers;
@@ -1253,7 +1253,7 @@ export default function Identity(mpInstance) {
12531253
* @return a cart object
12541254
*/
12551255
getCart: function() {
1256-
logDeprecatedApiUsage(mpInstance, {
1256+
logDeprecatedMethodUsage(mpInstance, {
12571257
methodName: 'Identity.getCurrentUser().getCart()',
12581258
warningMessage:
12591259
'Deprecated function Identity.getCurrentUser().getCart() will be removed in future releases',
@@ -1337,7 +1337,7 @@ export default function Identity(mpInstance) {
13371337
* @deprecated
13381338
*/
13391339
add: function() {
1340-
logDeprecatedApiUsage(mpInstance, {
1340+
logDeprecatedMethodUsage(mpInstance, {
13411341
methodName: 'Identity.getCurrentUser().getCart().add()',
13421342
warningMessage: generateDeprecationMessage(
13431343
'Identity.getCurrentUser().getCart().add()',
@@ -1353,7 +1353,7 @@ export default function Identity(mpInstance) {
13531353
* @deprecated
13541354
*/
13551355
remove: function() {
1356-
logDeprecatedApiUsage(mpInstance, {
1356+
logDeprecatedMethodUsage(mpInstance, {
13571357
methodName: 'Identity.getCurrentUser().getCart().remove()',
13581358
warningMessage: generateDeprecationMessage(
13591359
'Identity.getCurrentUser().getCart().remove()',
@@ -1369,7 +1369,7 @@ export default function Identity(mpInstance) {
13691369
* @deprecated
13701370
*/
13711371
clear: function() {
1372-
logDeprecatedApiUsage(mpInstance, {
1372+
logDeprecatedMethodUsage(mpInstance, {
13731373
methodName: 'Identity.getCurrentUser().getCart().clear()',
13741374
warningMessage: generateDeprecationMessage(
13751375
'Identity.getCurrentUser().getCart().clear()',
@@ -1386,7 +1386,7 @@ export default function Identity(mpInstance) {
13861386
* @deprecated
13871387
*/
13881388
getCartProducts: function() {
1389-
logDeprecatedApiUsage(mpInstance, {
1389+
logDeprecatedMethodUsage(mpInstance, {
13901390
methodName:
13911391
'Identity.getCurrentUser().getCart().getCartProducts()',
13921392
warningMessage: generateDeprecationMessage(
@@ -1785,7 +1785,7 @@ function tryOnUserAlias(previousUser, newUser, identityApiData, mpInstance) {
17851785
isFunction(identityApiData.onUserAlias)
17861786
) {
17871787
try {
1788-
logDeprecatedApiUsage(mpInstance, {
1788+
logDeprecatedMethodUsage(mpInstance, {
17891789
methodName: 'onUserAlias',
17901790
warningMessage: generateDeprecationMessage('onUserAlias'),
17911791
});

src/mp-instance.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import CookieConsentManager, { ICookieConsentManager } from './cookieConsentMana
5555
import { ErrorReportingDispatcher } from './reporting/errorReportingDispatcher';
5656
import { LoggingDispatcher } from './reporting/loggingDispatcher';
5757
import { IErrorReportingService, ILoggingService } from './reporting/types';
58-
import { logDeprecatedApiUsage } from './reporting/deprecatedApiLogger';
58+
import { logDeprecatedMethodUsage } from './reporting/deprecatedMethodLogger';
5959

6060
export interface IErrorLogMessage {
6161
message?: string;
@@ -773,8 +773,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
773773
* @deprecated
774774
*/
775775
add: function(product, logEventBoolean) {
776-
logDeprecatedApiUsage(self, {
777-
methodName: 'eCommerce.Cart.add()',
776+
logDeprecatedMethodUsage(self, {
777+
methodName: 'mPInstance.eCommerce.Cart.add()',
778778
warningMessage: generateDeprecationMessage(
779779
'eCommerce.Cart.add()',
780780
true,
@@ -791,8 +791,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
791791
* @deprecated
792792
*/
793793
remove: function(product, logEventBoolean) {
794-
logDeprecatedApiUsage(self, {
795-
methodName: 'eCommerce.Cart.remove()',
794+
logDeprecatedMethodUsage(self, {
795+
methodName: 'mPInstance.eCommerce.Cart.remove()',
796796
warningMessage: generateDeprecationMessage(
797797
'eCommerce.Cart.remove()',
798798
true,
@@ -807,8 +807,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
807807
* @deprecated
808808
*/
809809
clear: function() {
810-
logDeprecatedApiUsage(self, {
811-
methodName: 'eCommerce.Cart.clear()',
810+
logDeprecatedMethodUsage(self, {
811+
methodName: 'mPInstance.eCommerce.Cart.clear()',
812812
warningMessage: generateDeprecationMessage(
813813
'eCommerce.Cart.clear()',
814814
true,
@@ -944,7 +944,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
944944
* @deprecated
945945
*/
946946
logCheckout: function(step, option, attrs, customFlags) {
947-
logDeprecatedApiUsage(self, {
947+
logDeprecatedMethodUsage(self, {
948948
methodName: 'mParticle.logCheckout',
949949
warningMessage: 'mParticle.logCheckout is deprecated, please use mParticle.logProductAction instead',
950950
});
@@ -1025,7 +1025,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
10251025
attrs,
10261026
customFlags
10271027
) {
1028-
logDeprecatedApiUsage(self, {
1028+
logDeprecatedMethodUsage(self, {
10291029
methodName: 'mParticle.logPurchase',
10301030
warningMessage: 'mParticle.logPurchase is deprecated, please use mParticle.logProductAction instead',
10311031
});
@@ -1138,7 +1138,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
11381138
attrs,
11391139
customFlags
11401140
) {
1141-
logDeprecatedApiUsage(self, {
1141+
logDeprecatedMethodUsage(self, {
11421142
methodName: 'mParticle.logRefund',
11431143
warningMessage: 'mParticle.logRefund is deprecated, please use mParticle.logProductAction instead',
11441144
});
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import { ErrorCodes, ILoggingService } from './types';
22

3-
interface DeprecatedApiLoggerInstance {
3+
interface DeprecatedMethodLoggerInstance {
44
Logger?: {
55
warning(message: string): void;
66
};
77
_LoggingDispatcher?: ILoggingService;
88
}
99

10-
interface DeprecatedApiUsage {
10+
interface DeprecatedMethodUsage {
1111
methodName: string;
1212
warningMessage: string;
1313
}
1414

15-
export function logDeprecatedApiUsage(
16-
mpInstance: DeprecatedApiLoggerInstance,
17-
usage: DeprecatedApiUsage
15+
export function logDeprecatedMethodUsage(
16+
mpInstance: DeprecatedMethodLoggerInstance,
17+
usage: DeprecatedMethodUsage
1818
): void {
1919
mpInstance.Logger?.warning(usage.warningMessage);
2020
mpInstance._LoggingDispatcher?.log({

src/sessionManager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { generateDeprecationMessage } from './utils';
66
import { IMParticleUser } from './identity-user-interfaces';
77
import { IMParticleWebSDKInstance } from './mp-instance';
88
import { hasIdentityRequestChanged, hasExplicitIdentifier } from './identity-utils';
9-
import { logDeprecatedApiUsage } from './reporting/deprecatedApiLogger';
9+
import { logDeprecatedMethodUsage } from './reporting/deprecatedMethodLogger';
1010

1111
const { Messages } = Constants;
1212

@@ -68,7 +68,7 @@ export default function SessionManager(
6868
};
6969

7070
this.getSession = function (): string {
71-
logDeprecatedApiUsage(mpInstance, {
71+
logDeprecatedMethodUsage(mpInstance, {
7272
methodName: 'SessionManager.getSession()',
7373
warningMessage: generateDeprecationMessage(
7474
'SessionManager.getSession()',

test/jest/reportingLogger.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ErrorReportingDispatcher } from '../../src/reporting/errorReportingDispatcher';
22
import { LoggingDispatcher } from '../../src/reporting/loggingDispatcher';
33
import { IErrorReportingService, ILoggingService, ISDKError, ISDKLogEntry, WSDKErrorSeverity, ErrorCodes } from '../../src/reporting/types';
4-
import { logDeprecatedApiUsage } from '../../src/reporting/deprecatedApiLogger';
4+
import { logDeprecatedMethodUsage } from '../../src/reporting/deprecatedMethodLogger';
55

66
describe('ErrorReportingDispatcher', () => {
77
let dispatcher: ErrorReportingDispatcher;
@@ -130,12 +130,12 @@ describe('LoggingDispatcher', () => {
130130
});
131131
});
132132

133-
describe('logDeprecatedApiUsage', () => {
133+
describe('logDeprecatedMethodUsage', () => {
134134
it('keeps the console warning and emits structured usage details', () => {
135135
const warning = jest.fn();
136136
const log = jest.fn();
137137

138-
logDeprecatedApiUsage(
138+
logDeprecatedMethodUsage(
139139
{
140140
Logger: { warning },
141141
_LoggingDispatcher: { log },
@@ -158,7 +158,7 @@ describe('logDeprecatedApiUsage', () => {
158158
it('does not require a registered logging dispatcher', () => {
159159
const warning = jest.fn();
160160

161-
expect(() => logDeprecatedApiUsage(
161+
expect(() => logDeprecatedMethodUsage(
162162
{ Logger: { warning } },
163163
{
164164
methodName: 'onUserAlias',

0 commit comments

Comments
 (0)