isFeatureEnabled now returns false if disabled (#74)

PostHog · Oct 9, 2023 · 74d803c · 74d803c
1 parent 4474be1
commit 74d803c
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Next
 
+- isFeatureEnabled now returns false if disabled [#74](https://github.com/PostHog/posthog-ios/pull/74)
 - Add loadFeatureFlagsOnStart configuration flag [#71](https://github.com/PostHog/posthog-ios/pull/71)
 
 ## 2.0.5 - 2023-10-06

diff --git a/Examples/CarthageExample/CarthageExample/AppDelegate.swift b/Examples/CarthageExample/CarthageExample/AppDelegate.swift
@@ -2,7 +2,7 @@ import UIKit
 import PostHog
 
 // Use your own apiKey!
-let PostHog = PHGPostHog(configuration: PHGPostHogConfiguration(apiKey: "b2XoQDHA5YhWQAjr2FZ4qIckgyEqXyY8"))
+let PostHog = PHGPostHog(configuration: PHGPostHogConfiguration(apiKey: "_6SG-F7I1vCuZ-HdJL3VZQqjBlaSb1_20hDPwqMNnGI"))
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

diff --git a/Examples/CocoapodsExample/CocoapodsExample/AppDelegate.m b/Examples/CocoapodsExample/CocoapodsExample/AppDelegate.m
@@ -6,7 +6,7 @@ @interface AppDelegate ()
 
 @end
 
-NSString *const POSTHOG_API_KEY = @"BrpS4SctoaCCsyjlnlun3OzyNJAafdlv__jUWaaJWXg";
+NSString *const POSTHOG_API_KEY = @"_6SG-F7I1vCuZ-HdJL3VZQqjBlaSb1_20hDPwqMNnGI";
 
 
 @implementation AppDelegate

diff --git a/Examples/ManualExample/ManualExample/AppDelegate.m b/Examples/ManualExample/ManualExample/AppDelegate.m
@@ -12,7 +12,7 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Use your own apiKey!
-    [PHGPostHog setupWithConfiguration:[PHGPostHogConfiguration configurationWithApiKey:@"St5WbSrxW5bzxn2NGwPDVzS9PBPYctOl" host:@"https://app.posthog.com"]];
+    [PHGPostHog setupWithConfiguration:[PHGPostHogConfiguration configurationWithApiKey:@"_6SG-F7I1vCuZ-HdJL3VZQqjBlaSb1_20hDPwqMNnGI" host:@"https://app.posthog.com"]];
     [[PHGPostHog sharedPostHog] capture:@"Manual Example Launched"];
     [[PHGPostHog sharedPostHog] flush];
 

diff --git a/PostHog/Classes/PHGPostHog.m b/PostHog/Classes/PHGPostHog.m
@@ -315,8 +315,18 @@ - (bool)isFeatureEnabled:(NSString *)flagKey
 
 - (bool)isFeatureEnabled:(NSString *)flagKey options:(NSDictionary *)options
 {
-    NSArray *keys = [self.payloadManager getFeatureFlags];
-    BOOL isFlagEnabled = [keys containsObject: flagKey];
+    NSDictionary *flags = [self.payloadManager getFlagVariants];
+
+    bool isFlagEnabled = true;
+    id value = [flags valueForKey:flagKey];
+
+    if (value != nil) {
+        if ([value isKindOfClass:[NSNumber class]]) {
+            isFlagEnabled = [value boolValue];
+        }
+    } else {
+        isFlagEnabled = false;
+    }
 
     id send_event = [options valueForKey:@"send_event"];
 

diff --git a/PostHogTests/CapturingTests.swift b/PostHogTests/CapturingTests.swift
@@ -8,7 +8,7 @@ class CapturingTests: QuickSpec {
     var posthog: PHGPostHog!
 
     beforeEach {
-      let config = PHGPostHogConfiguration(apiKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE")
+      let config = PHGPostHogConfiguration(apiKey: "foobar")
       passthrough = PHGPassthroughMiddleware()
       config.middlewares = [
         passthrough,

diff --git a/PostHogTests/EndToEndTests.swift b/PostHogTests/EndToEndTests.swift
@@ -10,8 +10,7 @@ class PostHogE2ETests: QuickSpec {
     var posthog: PHGPostHog!
 
     beforeEach {
-//      let config = PHGPostHogConfiguration(apiKey: "BrpS4SctoaCCsyjlnlun3OzyNJAafdlv__jUWaaJWXg")
-      let config = PHGPostHogConfiguration(apiKey: "8jVz0YZ2YPtP7eL1I5l5RQIp-WcuFeD3pZO8c0YDMx4", host: "http://localhost:8000")
+     let config = PHGPostHogConfiguration(apiKey: "foobar")
       config.flushAt = 1
 
       PHGPostHog.setup(with: config)

diff --git a/PostHogTests/FeatureFlagTests.swift b/PostHogTests/FeatureFlagTests.swift
@@ -10,7 +10,7 @@ class FeatureFlagTests: QuickSpec {
 
     beforeEach {
       LSNocilla.sharedInstance().start()
-      let config = PHGPostHogConfiguration(apiKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE", host: "https://app.posthog.test")
+      let config = PHGPostHogConfiguration(apiKey: "foobar", host: "https://app.posthog.test")
       passthrough = PHGPassthroughMiddleware()
       config.middlewares = [
         passthrough,
@@ -27,13 +27,24 @@ class FeatureFlagTests: QuickSpec {
     it("checks flag is enabled") {
       _ = stubRequest("POST", "https://app.posthog.test/decide/?v=3" as LSMatcheable)
         .andReturn(200)?
-        .withBody("{\"featureFlags\":{\"some-flag\":\"true\"}}" as LSHTTPBody);
+        .withBody("{\"featureFlags\":{\"some-flag\": true}}" as LSHTTPBody);
       posthog.reloadFeatureFlags()
       // Hacky: Need to buffer for async request to happen without stub being cleaned up
       sleep(1)
       let isEnabled = posthog.isFeatureEnabled("some-flag")
       expect(isEnabled).to(beTrue())
     }
+
+    it("checks flag is disabled") {
+      _ = stubRequest("POST", "https://app.posthog.test/decide/?v=3" as LSMatcheable)
+        .andReturn(200)?
+        .withBody("{\"featureFlags\":{\"some-flag\": false}}" as LSHTTPBody);
+      posthog.reloadFeatureFlags()
+      // Hacky: Need to buffer for async request to happen without stub being cleaned up
+      sleep(1)
+      let isEnabled = posthog.isFeatureEnabled("some-flag")
+      expect(isEnabled).to(beFalse())
+    }
 
     it("checks multivariate flag is enabled - integer") {
       _ = stubRequest("POST", "https://app.posthog.test/decide/?v=3" as LSMatcheable)
@@ -212,7 +223,7 @@ class FeatureFlagTests: QuickSpec {
     it("bad request does not override current flags") {
       _ = stubRequest("POST", "https://app.posthog.test/decide/?v=3" as LSMatcheable)
         .andReturn(200)?
-        .withBody("{\"featureFlags\":{\"some-flag\":\"true\"}}" as LSHTTPBody);
+        .withBody("{\"featureFlags\":{\"some-flag\": true}}" as LSHTTPBody);
       posthog.reloadFeatureFlags()
       // Hacky: Need to buffer for async request to happen without stub being cleaned up
       sleep(1)
@@ -231,7 +242,7 @@ class FeatureFlagTests: QuickSpec {
     it("Won't send $feature_flag_called if option is set to false") {
       _ = stubRequest("POST", "https://app.posthog.test/decide/?v=3" as LSMatcheable)
         .andReturn(200)?
-        .withBody("{\"featureFlags\":{\"some-flag\":\"true\"}}" as LSHTTPBody);
+        .withBody("{\"featureFlags\":{\"some-flag\": true}}" as LSHTTPBody);
       posthog.reloadFeatureFlags()
       // Hacky: Need to buffer for async request to happen without stub being cleaned up
       sleep(1)

diff --git a/PostHogTests/MiddlewareTests.swift b/PostHogTests/MiddlewareTests.swift
@@ -30,7 +30,7 @@ let eatAllCalls = PHGBlockMiddleware { (context, next) in
 class MiddlewareTests: QuickSpec {
   override func spec() {
     it("receives events") {
-      let config = PHGPostHogConfiguration(apiKey: "TESTKEY")
+      let config = PHGPostHogConfiguration(apiKey: "foobar")
       let passthrough = PHGPassthroughMiddleware()
       config.middlewares = [
         passthrough,
@@ -43,7 +43,7 @@ class MiddlewareTests: QuickSpec {
     }
 
     it("modifies and passes event to next") {
-      let config = PHGPostHogConfiguration(apiKey: "TESTKEY")
+      let config = PHGPostHogConfiguration(apiKey: "foobar")
       let passthrough = PHGPassthroughMiddleware()
       config.middlewares = [
         customizeAllCaptureCalls,
@@ -60,7 +60,7 @@ class MiddlewareTests: QuickSpec {
     }
 
     it("expects event to be swallowed if next is not called") {
-      let config = PHGPostHogConfiguration(apiKey: "TESTKEY")
+      let config = PHGPostHogConfiguration(apiKey: "foobar")
       let passthrough = PHGPassthroughMiddleware()
       config.middlewares = [
         eatAllCalls,

diff --git a/PostHogTests/PostHogTests.swift b/PostHogTests/PostHogTests.swift
@@ -4,7 +4,7 @@ import PostHog
 
 class PostHogTests: QuickSpec {
   override func spec() {
-    let config = PHGPostHogConfiguration(apiKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE")
+    let config = PHGPostHogConfiguration(apiKey: "foobar")
     var posthog: PHGPostHog!
     var testMiddleware: TestMiddleware!
     var testApplication: TestApplication!
@@ -31,7 +31,7 @@ class PostHogTests: QuickSpec {
       expect(posthog.configuration.flushAt) == 20
       expect(posthog.configuration.flushInterval) == 30
       expect(posthog.configuration.maxQueueSize) == 1000
-      expect(posthog.configuration.apiKey) == "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE"
+      expect(posthog.configuration.apiKey) == "foobar"
       expect(posthog.configuration.host) == URL(string: "https://app.posthog.com")
       expect(posthog.configuration.shouldUseLocationServices) == false
       expect(posthog.configuration.shouldUseBluetooth) == false
@@ -55,15 +55,15 @@ class PostHogTests: QuickSpec {
     }
 
     it("initialized correctly with api host") {
-      let config = PHGPostHogConfiguration(apiKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE", host: "https://testapp.posthog.test")
+      let config = PHGPostHogConfiguration(apiKey: "foobar", host: "https://testapp.posthog.test")
       config.libraryName = "posthog-ios-test"
       config.libraryVersion = "posthog-ios-version"
 
       posthog = PHGPostHog(configuration: config)
       expect(posthog.configuration.flushAt) == 20
       expect(posthog.configuration.flushInterval) == 30
       expect(posthog.configuration.maxQueueSize) == 1000
-      expect(posthog.configuration.apiKey) == "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE"
+      expect(posthog.configuration.apiKey) == "foobar"
       expect(posthog.configuration.host) == URL(string: "https://testapp.posthog.test")
       expect(posthog.configuration.shouldUseLocationServices) == false
       expect(posthog.configuration.shouldUseBluetooth) == false
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @interface AppDelegate () @@
     @end
-    NSString *const POSTHOG_API_KEY = @"BrpS4SctoaCCsyjlnlun3OzyNJAafdlv__jUWaaJWXg";
+    NSString *const POSTHOG_API_KEY = @"_6SG-F7I1vCuZ-HdJL3VZQqjBlaSb1_20hDPwqMNnGI";
     @implementation AppDelegate
@@ Expand Down @@