From 6f96e87181bc94d27403f26e11a127b5694efea8 Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Wed, 3 Aug 2022 12:02:29 -0600 Subject: [PATCH 1/8] updgrade mparticle sdk and replace isSandboxed method --- iterable-extension/build.gradle | 2 +- .../java/com/mparticle/ext/iterable/IterableExtension.java | 4 ++-- iterable-ingress-extension/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iterable-extension/build.gradle b/iterable-extension/build.gradle index bdf8d06..fdd9875 100644 --- a/iterable-extension/build.gradle +++ b/iterable-extension/build.gradle @@ -10,7 +10,7 @@ dependencies { 'com.amazonaws:aws-lambda-java-core:1.2.0', 'com.amazonaws:aws-lambda-java-events:2.0.2', 'commons-io:commons-io:2.6', - 'com.mparticle:java-sdk:2.2.0' + 'com.mparticle:java-sdk:2.7.0' ) compile project(':iterable-java-sdk') testCompile('junit:junit:4.12') diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index 1e93667..9fb0fd5 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -155,8 +155,8 @@ public void processPushSubscriptionEvent(PushSubscriptionEvent event) throws IOE } request.device = new Device(); if (event.getRequest().getRuntimeEnvironment().getType().equals(RuntimeEnvironment.Type.IOS)) { - Boolean sandboxed = ((IosRuntimeEnvironment) event.getRequest().getRuntimeEnvironment()).getIsSandboxed(); - if (sandboxed != null && sandboxed) { + Boolean isDebugMode = event.getRequest().getRuntimeEnvironment().isDebug(); + if (isDebugMode != null && isDebugMode) { request.device.platform = Device.PLATFORM_APNS_SANDBOX; request.device.applicationName = event.getRequest().getAccount().getAccountSettings().get(SETTING_APNS_SANDBOX_KEY); } else { diff --git a/iterable-ingress-extension/build.gradle b/iterable-ingress-extension/build.gradle index d7a0e6f..a9f7136 100644 --- a/iterable-ingress-extension/build.gradle +++ b/iterable-ingress-extension/build.gradle @@ -11,7 +11,7 @@ dependencies { 'com.amazonaws:aws-lambda-java-events:2.0.2', 'software.amazon.awssdk:sqs:2.13.60', 'commons-io:commons-io:2.6', - 'com.mparticle:java-sdk:2.2.0', + 'com.mparticle:java-sdk:2.7.0', ) testCompile('junit:junit:4.12') testCompile('org.mockito:mockito-core:1.10.19') From f9750501f3e5299058570b827918cb4fc609d425 Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Wed, 3 Aug 2022 19:28:40 -0600 Subject: [PATCH 2/8] add push registration test --- .../ext/iterable/IterableExtensionTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java index 619fc2e..a6dab65 100644 --- a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java +++ b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java @@ -721,6 +721,45 @@ public void testConvertToCommerceItem() throws Exception { } + @Test + public void testProcessPushSubscriptionEvent() throws Exception { + EventProcessingRequest request = createEventProcessingRequest(true); + String fakeToken = "bdcbbb717ed20a9bad33e63dec3703210abf085dd73362589c92e61697ca1234"; + PushSubscriptionEvent event = new PushSubscriptionEvent(); + event.setToken(fakeToken); + + Account account = new Account(); + HashMap settings = new HashMap(); + settings.put(SETTING_APNS_KEY, "iterable.app"); + settings.put(SETTING_API_KEY, TEST_API_KEY); + account.setAccountSettings(settings); + request.setAccount(account); + + List userIdentities = new LinkedList<>(); + userIdentities.add(new UserIdentity(UserIdentity.Type.EMAIL, Identity.Encoding.RAW, "mptest@mparticle.com")); + userIdentities.add(new UserIdentity(UserIdentity.Type.CUSTOMER, Identity.Encoding.RAW, "123456")); + request.setUserIdentities(userIdentities); + request.setRuntimeEnvironment(new IosRuntimeEnvironment()); + event.setRequest(request); + + testExtension.iterableService = Mockito.mock(IterableService.class); + Call callMock = Mockito.mock(Call.class); + Mockito.when(testExtension.iterableService.registerToken(Mockito.any(), Mockito.any())).thenReturn(callMock); + + IterableApiResponse apiResponse = new IterableApiResponse(); + apiResponse.code = IterableApiResponse.SUCCESS_MESSAGE; + Response response = Response.success(apiResponse); + Mockito.when(callMock.execute()).thenReturn(response); + + testExtension.processPushSubscriptionEvent(event); + ArgumentCaptor pushRegisterArgs = ArgumentCaptor.forClass(RegisterDeviceTokenRequest.class); + Mockito.verify(testExtension.iterableService, Mockito.times(1)).registerToken(Mockito.any(), pushRegisterArgs.capture()); + RegisterDeviceTokenRequest registerTokenRequest = pushRegisterArgs.getValue(); + assertEquals("iterable.app", registerTokenRequest.device.applicationName); + assertEquals(fakeToken, registerTokenRequest.device.token); + assertEquals("mptest@mparticle.com", registerTokenRequest.email); + } + @Test public void testProcessProductActionEvent() throws Exception { ProductActionEvent event = new ProductActionEvent(); From 43529a2c5f587acbc9730aa504d46d7f688117d8 Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Wed, 31 Aug 2022 16:30:42 -0600 Subject: [PATCH 3/8] logs key identifier o nios sandbox registration events --- .../ext/iterable/IterableExtension.java | 8 +++- .../ext/iterable/IterableExtensionTest.java | 41 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index 9fb0fd5..9d7127f 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -155,8 +155,12 @@ public void processPushSubscriptionEvent(PushSubscriptionEvent event) throws IOE } request.device = new Device(); if (event.getRequest().getRuntimeEnvironment().getType().equals(RuntimeEnvironment.Type.IOS)) { - Boolean isDebugMode = event.getRequest().getRuntimeEnvironment().isDebug(); - if (isDebugMode != null && isDebugMode) { + Boolean sandboxed = ((IosRuntimeEnvironment) event.getRequest().getRuntimeEnvironment()).getIsSandboxed(); + if (sandboxed != null && sandboxed) { + // TODO: Replace isSandboxed with isDebug + String keyIdentifier = getApiKey(event).substring(getApiKey(event).length() - 8); + logger.logMessage("Key identifier for sandbox registrant: " + keyIdentifier); + // request.device.platform = Device.PLATFORM_APNS_SANDBOX; request.device.applicationName = event.getRequest().getAccount().getAccountSettings().get(SETTING_APNS_SANDBOX_KEY); } else { diff --git a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java index a6dab65..c5e02be 100644 --- a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java +++ b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java @@ -760,6 +760,47 @@ public void testProcessPushSubscriptionEvent() throws Exception { assertEquals("mptest@mparticle.com", registerTokenRequest.email); } + @Test + public void testIosSandboxProcessPushSubscriptionEvent() throws Exception { + EventProcessingRequest request = createEventProcessingRequest(true); + String fakeToken = "bdcbbb717ed20a9bad33e63dec3703210abf085dd73362589c92e61697ca1234"; + PushSubscriptionEvent event = new PushSubscriptionEvent(); + event.setToken(fakeToken); + + Account account = new Account(); + HashMap settings = new HashMap(); + settings.put(SETTING_APNS_SANDBOX_KEY, "iterable.app"); + settings.put(SETTING_API_KEY, TEST_API_KEY); + account.setAccountSettings(settings); + request.setAccount(account); + + List userIdentities = new LinkedList<>(); + userIdentities.add(new UserIdentity(UserIdentity.Type.EMAIL, Identity.Encoding.RAW, "mptest@mparticle.com")); + userIdentities.add(new UserIdentity(UserIdentity.Type.CUSTOMER, Identity.Encoding.RAW, "123456")); + request.setUserIdentities(userIdentities); + IosRuntimeEnvironment iosRuntimeEnvironment = new IosRuntimeEnvironment(); + iosRuntimeEnvironment.setIsSandboxed(true); + request.setRuntimeEnvironment(iosRuntimeEnvironment); + event.setRequest(request); + + testExtension.iterableService = Mockito.mock(IterableService.class); + Call callMock = Mockito.mock(Call.class); + Mockito.when(testExtension.iterableService.registerToken(Mockito.any(), Mockito.any())).thenReturn(callMock); + + IterableApiResponse apiResponse = new IterableApiResponse(); + apiResponse.code = IterableApiResponse.SUCCESS_MESSAGE; + Response response = Response.success(apiResponse); + Mockito.when(callMock.execute()).thenReturn(response); + + testExtension.processPushSubscriptionEvent(event); + ArgumentCaptor pushRegisterArgs = ArgumentCaptor.forClass(RegisterDeviceTokenRequest.class); + Mockito.verify(testExtension.iterableService, Mockito.times(1)).registerToken(Mockito.any(), pushRegisterArgs.capture()); + RegisterDeviceTokenRequest registerTokenRequest = pushRegisterArgs.getValue(); + assertEquals("iterable.app", registerTokenRequest.device.applicationName); + assertEquals(fakeToken, registerTokenRequest.device.token); + assertEquals("mptest@mparticle.com", registerTokenRequest.email); + } + @Test public void testProcessProductActionEvent() throws Exception { ProductActionEvent event = new ProductActionEvent(); From 1d5e41b90258a13b9c01d642420262d75145d5be Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Thu, 1 Sep 2022 11:15:03 -0600 Subject: [PATCH 4/8] fix log statement --- .../ext/iterable/IterableExtension.java | 10 +++-- .../ext/iterable/IterableExtensionTest.java | 41 ------------------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index 9d7127f..613dac6 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -156,11 +156,15 @@ public void processPushSubscriptionEvent(PushSubscriptionEvent event) throws IOE request.device = new Device(); if (event.getRequest().getRuntimeEnvironment().getType().equals(RuntimeEnvironment.Type.IOS)) { Boolean sandboxed = ((IosRuntimeEnvironment) event.getRequest().getRuntimeEnvironment()).getIsSandboxed(); - if (sandboxed != null && sandboxed) { - // TODO: Replace isSandboxed with isDebug + Boolean isDebugMode = event.getRequest().getRuntimeEnvironment().isDebug(); + + // TODO: Replace isSandboxed with isDebug + if (isDebugMode != null && isDebugMode) { String keyIdentifier = getApiKey(event).substring(getApiKey(event).length() - 8); logger.logMessage("Key identifier for sandbox registrant: " + keyIdentifier); - // + } + + if (sandboxed != null && sandboxed) { request.device.platform = Device.PLATFORM_APNS_SANDBOX; request.device.applicationName = event.getRequest().getAccount().getAccountSettings().get(SETTING_APNS_SANDBOX_KEY); } else { diff --git a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java index c5e02be..a6dab65 100644 --- a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java +++ b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java @@ -760,47 +760,6 @@ public void testProcessPushSubscriptionEvent() throws Exception { assertEquals("mptest@mparticle.com", registerTokenRequest.email); } - @Test - public void testIosSandboxProcessPushSubscriptionEvent() throws Exception { - EventProcessingRequest request = createEventProcessingRequest(true); - String fakeToken = "bdcbbb717ed20a9bad33e63dec3703210abf085dd73362589c92e61697ca1234"; - PushSubscriptionEvent event = new PushSubscriptionEvent(); - event.setToken(fakeToken); - - Account account = new Account(); - HashMap settings = new HashMap(); - settings.put(SETTING_APNS_SANDBOX_KEY, "iterable.app"); - settings.put(SETTING_API_KEY, TEST_API_KEY); - account.setAccountSettings(settings); - request.setAccount(account); - - List userIdentities = new LinkedList<>(); - userIdentities.add(new UserIdentity(UserIdentity.Type.EMAIL, Identity.Encoding.RAW, "mptest@mparticle.com")); - userIdentities.add(new UserIdentity(UserIdentity.Type.CUSTOMER, Identity.Encoding.RAW, "123456")); - request.setUserIdentities(userIdentities); - IosRuntimeEnvironment iosRuntimeEnvironment = new IosRuntimeEnvironment(); - iosRuntimeEnvironment.setIsSandboxed(true); - request.setRuntimeEnvironment(iosRuntimeEnvironment); - event.setRequest(request); - - testExtension.iterableService = Mockito.mock(IterableService.class); - Call callMock = Mockito.mock(Call.class); - Mockito.when(testExtension.iterableService.registerToken(Mockito.any(), Mockito.any())).thenReturn(callMock); - - IterableApiResponse apiResponse = new IterableApiResponse(); - apiResponse.code = IterableApiResponse.SUCCESS_MESSAGE; - Response response = Response.success(apiResponse); - Mockito.when(callMock.execute()).thenReturn(response); - - testExtension.processPushSubscriptionEvent(event); - ArgumentCaptor pushRegisterArgs = ArgumentCaptor.forClass(RegisterDeviceTokenRequest.class); - Mockito.verify(testExtension.iterableService, Mockito.times(1)).registerToken(Mockito.any(), pushRegisterArgs.capture()); - RegisterDeviceTokenRequest registerTokenRequest = pushRegisterArgs.getValue(); - assertEquals("iterable.app", registerTokenRequest.device.applicationName); - assertEquals(fakeToken, registerTokenRequest.device.token); - assertEquals("mptest@mparticle.com", registerTokenRequest.email); - } - @Test public void testProcessProductActionEvent() throws Exception { ProductActionEvent event = new ProductActionEvent(); From 7ddef0632c5a3a9d02b0ae6c661258d455245eb6 Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Thu, 1 Sep 2022 14:19:55 -0600 Subject: [PATCH 5/8] log key suffix if isSandboxed --- .../com/mparticle/ext/iterable/IterableExtension.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index 613dac6..a40b7eb 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -156,15 +156,10 @@ public void processPushSubscriptionEvent(PushSubscriptionEvent event) throws IOE request.device = new Device(); if (event.getRequest().getRuntimeEnvironment().getType().equals(RuntimeEnvironment.Type.IOS)) { Boolean sandboxed = ((IosRuntimeEnvironment) event.getRequest().getRuntimeEnvironment()).getIsSandboxed(); - Boolean isDebugMode = event.getRequest().getRuntimeEnvironment().isDebug(); - - // TODO: Replace isSandboxed with isDebug - if (isDebugMode != null && isDebugMode) { + if (sandboxed != null && sandboxed) { + // TODO: Replace isSandboxed with isDebug String keyIdentifier = getApiKey(event).substring(getApiKey(event).length() - 8); logger.logMessage("Key identifier for sandbox registrant: " + keyIdentifier); - } - - if (sandboxed != null && sandboxed) { request.device.platform = Device.PLATFORM_APNS_SANDBOX; request.device.applicationName = event.getRequest().getAccount().getAccountSettings().get(SETTING_APNS_SANDBOX_KEY); } else { From 4a7ff000dd1eb1cc9f42fefa4738a14e2b48d962 Mon Sep 17 00:00:00 2001 From: jake kopulsky Date: Thu, 1 Sep 2022 14:54:06 -0600 Subject: [PATCH 6/8] reset sdk to 2.2 --- iterable-extension/build.gradle | 2 +- iterable-ingress-extension/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iterable-extension/build.gradle b/iterable-extension/build.gradle index fdd9875..bdf8d06 100644 --- a/iterable-extension/build.gradle +++ b/iterable-extension/build.gradle @@ -10,7 +10,7 @@ dependencies { 'com.amazonaws:aws-lambda-java-core:1.2.0', 'com.amazonaws:aws-lambda-java-events:2.0.2', 'commons-io:commons-io:2.6', - 'com.mparticle:java-sdk:2.7.0' + 'com.mparticle:java-sdk:2.2.0' ) compile project(':iterable-java-sdk') testCompile('junit:junit:4.12') diff --git a/iterable-ingress-extension/build.gradle b/iterable-ingress-extension/build.gradle index a9f7136..d7a0e6f 100644 --- a/iterable-ingress-extension/build.gradle +++ b/iterable-ingress-extension/build.gradle @@ -11,7 +11,7 @@ dependencies { 'com.amazonaws:aws-lambda-java-events:2.0.2', 'software.amazon.awssdk:sqs:2.13.60', 'commons-io:commons-io:2.6', - 'com.mparticle:java-sdk:2.7.0', + 'com.mparticle:java-sdk:2.2.0', ) testCompile('junit:junit:4.12') testCompile('org.mockito:mockito-core:1.10.19') From 2a0947f68a1156e054ee8989426582147149deff Mon Sep 17 00:00:00 2001 From: Matt Olcikas Date: Mon, 9 Jan 2023 13:49:59 -0600 Subject: [PATCH 7/8] [FRAM-4889] Fix NPE in production (#74) Fix null pointer error in prod due to a user_attribute_list with a null value. --- .../java/com/mparticle/ext/iterable/IterableExtension.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index a40b7eb..9604d39 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -267,6 +267,9 @@ void updateUser(EventProcessingRequest request) throws IOException { private Map> processUserAttributesList(Map> userAttributesList, boolean shouldCoerceStrings) { Map> convertedAttributeList = new HashMap<>(); userAttributesList.forEach((key, value)-> { + if (value == null) { + return; + } List convertedAttributes = convertedAttributeList.get(key); if (convertedAttributes == null) { convertedAttributes = new ArrayList<>(); From 12ff6c7bfabec856aaa0068f80f1baa4dd6cc875 Mon Sep 17 00:00:00 2001 From: Matt Olcikas Date: Mon, 9 Jan 2023 16:56:24 -0600 Subject: [PATCH 8/8] [IN-2347] Ignore invalid length API keys (#75) Reject requests with API keys with incorrect length to avoid the extra latency from calling the Iterable API with them. --- .../ext/iterable/IterableExtension.java | 24 ++++++++++++------- .../ext/iterable/IterableExtensionTest.java | 12 +++++----- .../ext/iterable/IngressExtensionTest.java | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java index 9604d39..88d0953 100644 --- a/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java +++ b/iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java @@ -33,6 +33,7 @@ public class IterableExtension extends MessageProcessor { public static final String MPARTICLE_RESERVED_PHONE_ATTR = "$Mobile"; public static final String ITERABLE_RESERVED_PHONE_ATTR = "phoneNumber"; public static final Set RETRIABLE_HTTP_STATUS_SET = new HashSet<>(Arrays.asList(429, 502, 504)); + public static final long API_KEY_LENGTH = 32; static final ObjectMapper mapper = new ObjectMapper(); IterableService iterableService = IterableService.newInstance(); IterableExtensionLogger logger; @@ -107,19 +108,24 @@ private void processPushOpens(EventProcessingRequest processingRequest) throws I } } - private static String getApiKey(Event event) { - Account account = event.getRequest().getAccount(); - return account.getStringSetting(SETTING_API_KEY, true, null); + private static String getApiKey(Event event) throws IOException { + return getApiKeyOrThrow(event.getRequest().getAccount()); } - private static String getApiKey(EventProcessingRequest event) { - Account account = event.getAccount(); - return account.getStringSetting(SETTING_API_KEY, true, null); + private static String getApiKey(EventProcessingRequest event) throws IOException { + return getApiKeyOrThrow(event.getAccount()); } - private static String getApiKey(AudienceMembershipChangeRequest event) { - Account account = event.getAccount(); - return account.getStringSetting(SETTING_API_KEY, true, null); + private static String getApiKey(AudienceMembershipChangeRequest event) throws IOException { + return getApiKeyOrThrow(event.getAccount()); + } + + private static String getApiKeyOrThrow(Account account) throws IOException { + String apiKey = account.getStringSetting(SETTING_API_KEY, true, null); + if (apiKey.length() != API_KEY_LENGTH) { + throw new ProcessingError("Invalid API key, length is " + apiKey.length()); + } + return apiKey; } /** diff --git a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java index a6dab65..f55beb4 100644 --- a/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java +++ b/iterable-extension/src/test/java/com/mparticle/ext/iterable/IterableExtensionTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.times; public class IterableExtensionTest { - private static final String TEST_API_KEY = "foo api key"; + private static final String TEST_API_KEY = "7982f56948624d8dc2f53ff007f51de3"; private IterableExtension testExtension; private IterableExtensionLogger testLogger; private IterableService iterableServiceMock; @@ -91,7 +91,7 @@ public void setup() { testAccount = new Account(); Map accountSettings = new HashMap<>(); - accountSettings.put(SETTING_API_KEY, "some api key"); + accountSettings.put(SETTING_API_KEY, "7982f56948624d8dc2f53ff007f51de3"); testAccount.setAccountSettings(accountSettings); testIterableApiSuccess = new IterableApiResponse(); @@ -552,7 +552,7 @@ public void testProcessAudienceMembershipChangeRequest() throws Exception { AudienceMembershipChangeRequest request = new AudienceMembershipChangeRequest(); Account account = new Account(); Map settings = new HashMap<>(); - settings.put(SETTING_API_KEY, "some api key"); + settings.put(SETTING_API_KEY, "7982f56948624d8dc2f53ff007f51de3"); account.setAccountSettings(settings); request.setAccount(account); request.setUserProfiles(profiles); @@ -563,7 +563,7 @@ public void testProcessAudienceMembershipChangeRequest() throws Exception { ArgumentCaptor apiArgument = ArgumentCaptor.forClass(String.class); Mockito.verify(service, Mockito.times(3)).listSubscribe(apiArgument.capture(), argument.capture()); String apiKey = apiArgument.getValue(); - assertEquals("some api key", apiKey); + assertEquals("7982f56948624d8dc2f53ff007f51de3", apiKey); List subscribeRequests = argument.getAllValues(); int i = 0; for (SubscribeRequest subscribeRequest : subscribeRequests) { @@ -984,7 +984,7 @@ public void testUpdateSubscriptionsEvent() throws Exception { event.setName(IterableExtension.UPDATE_SUBSCRIPTIONS_CUSTOM_EVENT_NAME); EventProcessingRequest request = createEventProcessingRequest(); Map settings = request.getAccount().getAccountSettings(); - settings.put(SETTING_API_KEY, "foo api key 2"); + settings.put(SETTING_API_KEY, "7982f56948624d8dc2f53ff007f51de3"); List userIdentities = new LinkedList<>(); userIdentities.add(new UserIdentity(UserIdentity.Type.EMAIL, Identity.Encoding.RAW, "mptest@mparticle.com")); request.setUserIdentities(userIdentities); @@ -1008,7 +1008,7 @@ public void testUpdateSubscriptionsEvent() throws Exception { ArgumentCaptor argument = ArgumentCaptor.forClass(UpdateSubscriptionsRequest.class); ArgumentCaptor stringArgumentCaptor = ArgumentCaptor.forClass(String.class); Mockito.verify(testExtension.iterableService).updateSubscriptions(stringArgumentCaptor.capture(), argument.capture()); - assertEquals("foo api key 2", stringArgumentCaptor.getValue()); + assertEquals("7982f56948624d8dc2f53ff007f51de3", stringArgumentCaptor.getValue()); assertEquals("mptest@mparticle.com", argument.getValue().email); assertEquals(expectedEmailListIdList, argument.getValue().emailListIds); assertEquals(expectedChannelIdList, argument.getValue().unsubscribedChannelIds); diff --git a/iterable-ingress-extension/src/test/java/com/mparticle/ext/iterable/IngressExtensionTest.java b/iterable-ingress-extension/src/test/java/com/mparticle/ext/iterable/IngressExtensionTest.java index fb40bc8..741f0af 100644 --- a/iterable-ingress-extension/src/test/java/com/mparticle/ext/iterable/IngressExtensionTest.java +++ b/iterable-ingress-extension/src/test/java/com/mparticle/ext/iterable/IngressExtensionTest.java @@ -19,7 +19,7 @@ public class IngressExtensionTest { - private static final String TEST_API_KEY = "foo api key"; + private static final String TEST_API_KEY = "7982f56948624d8dc2f53ff007f51de3"; private static MessageSerializer serializer; private static IngressExtension ingressExtension;