Skip to content

[FSSDK-9055] fix: add config check in odp methods #345

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 8 commits into from
Apr 18, 2023
Merged

[FSSDK-9055] fix: add config check in odp methods #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8c871a
add config check in odp methods
andrewleap-optimizely Apr 13, 2023
32b97ae
add unit tests
andrewleap-optimizely Apr 13, 2023
12e9677
lint fix
andrewleap-optimizely Apr 13, 2023
4f68a22
Revert "lint fix"
andrewleap-optimizely Apr 13, 2023
1c17ab8
lint fix
andrewleap-optimizely Apr 13, 2023
1a710a4
fix file encoding
andrewleap-optimizely Apr 14, 2023
4509019
Merge branch 'master' into aleap/block_odp_calls_on_datafile
andrewleap-optimizely Apr 18, 2023
a944bd1
fix tests
andrewleap-optimizely Apr 18, 2023
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
39 changes: 39 additions & 0 deletions OptimizelySDK.Tests/OptimizelyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6183,6 +6183,16 @@ public void TestSendOdpEventNullAction()
optly.Dispose();
}

[Test]
public void TestSendOdpEventInvalidOptimizelyObject()
{
var optly = new Optimizely("Random datafile", null, LoggerMock.Object);
optly.SendOdpEvent("some_action", new Dictionary<string, string>() { { "some_key", "some_value" } }, "some_event");
LoggerMock.Verify(
l => l.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'SendOdpEvent'."),
Times.Once);
}

[Test]
public void TestSendOdpEventEmptyStringAction()
{
Expand All @@ -6193,6 +6203,7 @@ public void TestSendOdpEventEmptyStringAction()

optly.Dispose();
}

[Test]
public void TestSendOdpEventNullType()
{
Expand Down Expand Up @@ -6226,5 +6237,33 @@ public void TestSendOdpEventEmptyStringType()
}

#endregion Test SendOdpEvent

#region Test FetchQualifiedSegments

[Test]
public void TestFetchQualifiedSegmentsInvalidOptimizelyObject()
{
var optly = new Optimizely("Random datafile", null, LoggerMock.Object);
optly.FetchQualifiedSegments("some_user", null);
LoggerMock.Verify(
l => l.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'FetchQualifiedSegments'."),
Times.Once);
}

#endregion Test FetchQualifiedSegments

#region Test IdentifyUser

[Test]
public void TestIdentifyUserInvalidOptimizelyObject()
{
var optly = new Optimizely("Random datafile", null, LoggerMock.Object);
optly.IdentifyUser("some_user");
LoggerMock.Verify(
l => l.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'IdentifyUser'."),
Times.Once);
}

#endregion Test IdentifyUser
}
}
24 changes: 24 additions & 0 deletions OptimizelySDK/Optimizely.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,14 @@ internal string[] FetchQualifiedSegments(string userId,
List<OdpSegmentOption> segmentOptions
)
{
var config = ProjectConfigManager?.GetConfig();

if (config == null)
{
Logger.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'FetchQualifiedSegments'.");
return null;
}

return OdpManager?.FetchQualifiedSegments(userId, segmentOptions);
}

Expand All @@ -1348,6 +1356,14 @@ List<OdpSegmentOption> segmentOptions
/// <param name="userId">FS User ID to send</param>
internal void IdentifyUser(string userId)
{
var config = ProjectConfigManager?.GetConfig();

if (config == null)
{
Logger.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'IdentifyUser'.");
return;
}

OdpManager?.IdentifyUser(userId);
}

Expand All @@ -1373,6 +1389,14 @@ public void SendOdpEvent(string action, Dictionary<string, string> identifiers,
type = Constants.ODP_EVENT_TYPE;
}

var config = ProjectConfigManager?.GetConfig();

if (config == null)
{
Logger.Log(LogLevel.ERROR, "Datafile has invalid format. Failing 'SendOdpEvent'.");
return;
}

OdpManager?.SendEvent(type, action, identifiers, data);
}
#endif
Expand Down