From 3fe4230d59d672746572bbf0cce0841fe4e49c2e Mon Sep 17 00:00:00 2001
From: junaed-optimizely <junaed.hossain@optimizely.com>
Date: Thu, 16 May 2024 20:20:24 +0600
Subject: [PATCH 1/5] ODP integration error resolve by removing unnecessary
 qualified segment fetching

---
 src/client.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client.ts b/src/client.ts
index 405493d..7597c6c 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -364,7 +364,7 @@ class OptimizelyReactSDKClient implements ReactSDKClient {
   }
 
   public async fetchQualifiedSegments(options?: optimizely.OptimizelySegmentOption[]): Promise<boolean> {
-    if (this.odpExplicitlyOff) {
+    if (this.odpExplicitlyOff || !this._client?.getProjectConfig()?.odpIntegrationConfig?.integrated) {
       return true;
     }
 

From e5eef09ca80206ab8bcf4edbef9195d2d66d4e19 Mon Sep 17 00:00:00 2001
From: junaed-optimizely <junaed.hossain@optimizely.com>
Date: Thu, 16 May 2024 20:37:50 +0600
Subject: [PATCH 2/5] Condition order adjustment

---
 src/client.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index 7597c6c..0aea2c3 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -364,14 +364,14 @@ class OptimizelyReactSDKClient implements ReactSDKClient {
   }
 
   public async fetchQualifiedSegments(options?: optimizely.OptimizelySegmentOption[]): Promise<boolean> {
-    if (this.odpExplicitlyOff || !this._client?.getProjectConfig()?.odpIntegrationConfig?.integrated) {
-      return true;
-    }
-
     if (!this.userContext) {
       return false;
     }
 
+    if (this.odpExplicitlyOff || !this._client?.getProjectConfig()?.odpIntegrationConfig?.integrated) {
+      return true;
+    }
+
     return await this.userContext.fetchQualifiedSegments(options);
   }
 

From d2bb889d370cc12358210abf7e9541d820957825 Mon Sep 17 00:00:00 2001
From: Md Junaed Hossain <169046794+junaed-optimizely@users.noreply.github.com>
Date: Tue, 21 May 2024 20:56:46 +0600
Subject: [PATCH 3/5] Javascript sdk upgrade, odp integration public method
 addition

---
 src/client.ts | 5 +++--
 yarn.lock     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index 0aea2c3..83140c4 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -54,7 +54,8 @@ export const DefaultUser: UserInfo = {
   attributes: {},
 };
 
-export interface ReactSDKClient extends Omit<optimizely.Client, 'createUserContext' | 'getProjectConfig'> {
+export interface ReactSDKClient
+  extends Omit<optimizely.Client, 'createUserContext' | 'getProjectConfig' | 'isOdpIntegrated'> {
   user: UserInfo;
 
   onReady(opts?: { timeout?: number }): Promise<any>;
@@ -368,7 +369,7 @@ class OptimizelyReactSDKClient implements ReactSDKClient {
       return false;
     }
 
-    if (this.odpExplicitlyOff || !this._client?.getProjectConfig()?.odpIntegrationConfig?.integrated) {
+    if (this.odpExplicitlyOff || !this._client?.isOdpIntegrated()) {
       return true;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 43f39ab..107591b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -656,9 +656,9 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@optimizely/optimizely-sdk@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@optimizely/optimizely-sdk/-/optimizely-sdk-5.3.0.tgz#dd1ca9d19287b31675d2f95c24234e074ade9a8b"
-  integrity sha512-PzfjcApCvcHGir8XWSG3IBaOJXvPADjqpzXypEWTfArrONA3FlmqdnwDAlxF4b557fo/UZI6ZCyj3AWrG8cprg==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/@optimizely/optimizely-sdk/-/optimizely-sdk-5.3.2.tgz#4a4918485c9319b2237f6e32d901c3ff7e998051"
+  integrity sha512-9d3sRusZfkN+CCq7C7DXp0bKam+dx2cDPPdcBQxLfwtTKFulzf6kGwnz4pVTtjwQ89vbJz10iJNMmD9qtSduPw==
   dependencies:
     decompress-response "^4.2.1"
     json-schema "^0.4.0"

From 3f15c6c0621d5d195dee7b021b0a1ae5a0b11584 Mon Sep 17 00:00:00 2001
From: Md Junaed Hossain <169046794+junaed-optimizely@users.noreply.github.com>
Date: Tue, 21 May 2024 21:43:17 +0600
Subject: [PATCH 4/5] client test adjustment

---
 src/client.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client.spec.ts b/src/client.spec.ts
index 177770b..473c493 100644
--- a/src/client.spec.ts
+++ b/src/client.spec.ts
@@ -79,6 +79,7 @@ describe('ReactSDKClient', () => {
       getFeatureVariableString: jest.fn(() => null),
       getOptimizelyConfig: jest.fn(() => null),
       getProjectConfig: jest.fn(() => null),
+      isOdpIntegrated: jest.fn(() => true),
       onReady: jest.fn(() => Promise.resolve({ success: false })),
       close: jest.fn(),
       getVuid: jest.fn(),

From a4b373bbabe2017ccabebe7eab1b9b2d3135462b Mon Sep 17 00:00:00 2001
From: Md Junaed Hossain <169046794+junaed-optimizely@users.noreply.github.com>
Date: Tue, 21 May 2024 22:34:56 +0600
Subject: [PATCH 5/5] package json update with explicit sdk version declaration

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa5e7e9..55611e7 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@optimizely/optimizely-sdk": "^5.3.0",
+    "@optimizely/optimizely-sdk": "^5.3.2",
     "hoist-non-react-statics": "^3.3.0",
     "prop-types": "^15.6.2",
     "utility-types": "^2.1.0 || ^3.0.0"