Skip to content

Fix: Allowing Empty UserID as valid field #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 27, 2018
Merged

Fix: Allowing Empty UserID as valid field #220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2e0424b
Fix: Allowing Empty UserID as valid field
mnoman09 Sep 27, 2018
35ea560
Removed userid.isempty check
mnoman09 Sep 27, 2018
77c75fb
Merge branch 'main_master' into mnoman/AllowingEmptyUserId
mnoman09 Oct 8, 2018
afda184
made function of validateUserID in projectConfig to check if userID i…
mnoman09 Oct 8, 2018
a7b65e9
Merge branch 'main_master' into mnoman/AllowingEmptyUserId
mnoman09 Oct 10, 2018
2565033
Merge branch 'master' into mnoman/AllowingEmptyUserId
mnoman09 Oct 12, 2018
f74ffb3
Merge branch 'master' into mnoman/AllowingEmptyUserId
mnoman09 Oct 18, 2018
944c01f
Merge branch 'master' into mnoman/AllowingEmptyUserId
mnoman09 Nov 5, 2018
5241c06
Merge branch 'master' into mnoman/AllowingEmptyUserId
mnoman09 Nov 12, 2018
a8ef442
Merge branch 'master' into mnoman/AllowingEmptyUserId
thomaszurkan-optimizely Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core-api/src/main/java/com/optimizely/ab/Optimizely.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,10 +872,6 @@ private boolean validateUserId(String userId) {
logger.error("The user ID parameter must be nonnull.");
return false;
}
if (userId.trim().isEmpty()) {
logger.error("Non-empty user ID required");
return false;
}

return true;
}
Expand Down
4 changes: 2 additions & 2 deletions core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public boolean setForcedVariation(@Nonnull String experimentKey,
}

// if the user id is invalid, return false.
if (userId == null || userId.trim().isEmpty()) {
if (userId == null) {
logger.error("User ID is invalid");
return false;
}
Expand Down Expand Up @@ -537,7 +537,7 @@ public boolean setForcedVariation(@Nonnull String experimentKey,
@Nonnull String userId) {

// if the user id is invalid, return false.
if (userId == null || userId.trim().isEmpty()) {
if (userId == null) {
logger.error("User ID is invalid");
return null;
}
Expand Down
14 changes: 5 additions & 9 deletions core-api/src/test/java/com/optimizely/ab/OptimizelyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ public void activateUserNoAttributesWithAudiences() throws Exception {
}

/**
* Verify that {@link Optimizely#activate(String, String)} doesn't return a variation when provided an empty string.
* Verify that {@link Optimizely#activate(String, String)} return a variation when provided an empty string.
*/
@Test
public void activateWithEmptyUserId() throws Exception {
Expand All @@ -1003,9 +1003,7 @@ public void activateWithEmptyUserId() throws Exception {
.withErrorHandler(new RaiseExceptionErrorHandler())
.build();

logbackVerifier.expectMessage(Level.ERROR, "Non-empty user ID required");
logbackVerifier.expectMessage(Level.INFO, "Not activating user for experiment \"" + experimentKey + "\".");
assertNull(optimizely.activate(experimentKey, ""));
assertNotNull(optimizely.activate(experimentKey, ""));
}

/**
Expand Down Expand Up @@ -2297,7 +2295,7 @@ public void getVariationWithUnknownExperimentKeyAndRaiseExceptionErrorHandler()
}

/**
* Verify that {@link Optimizely#getVariation(String, String)} doesn't return a variation when provided an
* Verify that {@link Optimizely#getVariation(String, String)} return a variation when provided an
* empty string.
*/
@Test
Expand All @@ -2309,8 +2307,7 @@ public void getVariationWithEmptyUserId() throws Exception {
.withErrorHandler(new RaiseExceptionErrorHandler())
.build();

logbackVerifier.expectMessage(Level.ERROR, "Non-empty user ID required");
assertNull(optimizely.getVariation(experiment.getKey(), ""));
assertNotNull(optimizely.getVariation(experiment.getKey(), ""));
}

/**
Expand Down Expand Up @@ -3653,8 +3650,7 @@ public void getEnabledFeatureWithEmptyUserId() throws ConfigParseException{
.build());
ArrayList<String> featureFlags = (ArrayList<String>) spyOptimizely.getEnabledFeatures("",
new HashMap<String, String>());
logbackVerifier.expectMessage(Level.ERROR, "Non-empty user ID required");
assertTrue(featureFlags.isEmpty());
assertFalse(featureFlags.isEmpty());

}

Expand Down
10 changes: 3 additions & 7 deletions core-api/src/test/java/com/optimizely/ab/config/ProjectConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@

import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;


import com.optimizely.ab.internal.LogbackVerifier;
Expand Down Expand Up @@ -244,12 +240,12 @@ public void getForcedVariationNullUserId() {

@Test
public void setForcedVariationEmptyUserId() {
assertFalse(projectConfig.setForcedVariation("etag1", "", "vtag1"));
assertTrue(projectConfig.setForcedVariation("etag1", "", "vtag1"));
}

@Test
public void getForcedVariationEmptyUserId() {
assertNull(projectConfig.getForcedVariation("etag1", ""));
assertNotNull(projectConfig.getForcedVariation("etag1", ""));
}

/* Invalid Experiement */
Expand Down