[FSSDK-10880] logic update

optimizely · Nov 7, 2024 · 77b4555 · 77b4555
1 parent 395e3c3
commit 77b4555
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Checkout branch
       uses: actions/checkout@v3
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}`
+        token: ${{ secrets.CI_USER_TOKEN || secrets.GITHUB_TOKEN }}`
         repository: 'optimizely/travisci-tools'
         path: 'home/runner/travisci-tools'
         ref: 'master'

diff --git a/src/Provider.tsx b/src/Provider.tsx
@@ -74,9 +74,10 @@ export class OptimizelyProvider extends React.Component<OptimizelyProviderProps,
       // deprecation warning
       logger.warn('Passing userId and userAttributes as props is deprecated, please switch to using `user` prop');
     } else if (optimizely.user) {
+      const { id, attributes } = optimizely.user;
       finalUser = {
-        id: optimizely.user.id,
-        attributes: optimizely.user.attributes || userAttributes || {},
+        id,
+        attributes: userAttributes || attributes || {},
       };
     } else {
       finalUser = {