fix: track and setAttrute issue

Author: sakshamg1304

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.21.1] - 2025-02-20
+
+### Fixed
+
+- Fixed trackEvent, setAttribute methods where usageStatsAccountId was used for network call.
+
 ## [1.21.0] - 2025-02-18
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "vwo/vwo-fme-php-sdk",
 
-    "version": "1.21.0",
+    "version": "1.21.1",
     "keywords": ["vwo", "fme", "sdk"],
     "license": "Apache-2.0",
     "authors": [{

src/Api/SetAttribute.php

@@ -65,8 +65,7 @@ private function createImpressionForAttributes(SettingsModel $settings, array $a
         $properties = $networkUtil->getEventsBaseProperties(
             EventEnum::VWO_SYNC_VISITOR_PROP,
             $context->getUserAgent(),
-            $context->getIpAddress(),
-            $context->getSessionId()
+            $context->getIpAddress()
         );
 
         // Construct payload data for multiple attributes

src/Api/TrackEvent.php

@@ -95,14 +95,14 @@ private function createImpressionForTrack(SettingsModel $settings, string $event
         $networkUtil = new NetworkUtil($serviceContainer);
 
         // Get base properties for the event
-        $properties = $networkUtil->getEventsBaseProperties($eventName, $context->getUserAgent(), $context->getIpAddress(), $context->getSessionId());
+        $properties = $networkUtil->getEventsBaseProperties($eventName, $context->getUserAgent(), $context->getIpAddress());
 
         // Prepare the payload for the track goal
         $payload = $networkUtil->getTrackGoalPayloadData(
             $settings,
             $context,
             $eventName,
-            $eventProperties,
+            $eventProperties
         );
 
         // Send the prepared payload via POST API request

src/Constants/Constants.php

@@ -40,7 +40,7 @@ class Constants {
     const DEFAULT_EVENTS_PER_REQUEST = 100;
     const SDK_NAME = 'vwo-fme-php-sdk';
 
-    const SDK_VERSION = '1.21.0';
+    const SDK_VERSION = '1.21.1';
     const AP = 'server';
 
     const SETTINGS = 'settings';

src/Utils/ImpressionUtil.php

@@ -61,9 +61,7 @@ public static function SendImpressionForVariationShown(
         $properties = $networkUtil->getEventsBaseProperties(
             EventEnum::VWO_VARIATION_SHOWN,
             urlencode($context->getUserAgent()), // Encode user agent to ensure URL safety
-            $context->getIpAddress(),
-            $context->getIpAddress(),
-            $context->getSessionId()
+            $context->getIpAddress()
         );
 
         $campaignKeyWithFeatureName = CampaignUtil::getCampaignKeyFromCampaignId($settings, $payload['d']['event']['props']['id']);

src/VWOClient.php

@@ -214,14 +214,7 @@ public function setAttribute($attributesOrAttributeValue = null, $attributeValue
         try {
             $loggerService = $this->serviceContainer->getLoggerService();
             $loggerService->debug("API Called: $apiName");
-            // Ensure context is valid
-            if (!isset($context['id']) || empty($context['id'])) {
-                $loggerService->error('INVALID_CONTEXT_PASSED', ['an' => ApiEnum::SET_ATTRIBUTE, 'apiName' => $apiName], false);
-                throw new \Error('TypeError: Invalid context');
-            }
-            // set uuid in context 
-            $context['uuid'] = $this->getUUIDFromContext($context, $apiName);
-
+            
             if (DataTypeUtil::isString($attributesOrAttributeValue)) {
                 // Validate attributeKey is a string
                 if (!DataTypeUtil::isString($attributesOrAttributeValue)) {
@@ -235,6 +228,11 @@ public function setAttribute($attributesOrAttributeValue = null, $attributeValue
                     !DataTypeUtil::isBoolean($attributeValueOrContext)) {
                     $loggerService->error("INVALID_PARAM", ['key' => $attributeValueOrContext, 'an'=> ApiEnum::SET_ATTRIBUTE, 'apiName' => $apiName, 'type' => gettype($attributeValueOrContext), 'correctType' => 'string'], false);
                 throw new \TypeError('TypeError: attributeValue should be a valid string, number, or boolean');
+                }
+                 // Ensure context is valid
+                if (!isset($context['id']) || empty($context['id'])) {
+                    $loggerService->error('INVALID_CONTEXT_PASSED', ['an' => ApiEnum::SET_ATTRIBUTE, 'apiName' => $apiName], false);
+                    throw new \Error('TypeError: Invalid context');
                 }
 
                 //Get userId using UserIdUtil if aliasing is enabled and gateway service is provided
@@ -247,6 +245,8 @@ public function setAttribute($attributesOrAttributeValue = null, $attributeValue
                     }
                 }
                 $context['id'] = $userId;
+                // set uuid in context 
+                $context['uuid'] = $this->getUUIDFromContext($context, $apiName);
 
                 $contextModel = new ContextModel();
                 $contextModel->modelFromDictionary($context);
@@ -300,6 +300,8 @@ public function setAttribute($attributesOrAttributeValue = null, $attributeValue
                     }
                 }
                 $context['id'] = $userId;
+                // set uuid in context 
+                $context['uuid'] = $this->getUUIDFromContext($context, $apiName);
 
                 $contextModel = new ContextModel();
                 $contextModel->modelFromDictionary($context);