TNT-40894 Fix incorrect MaxAge set in response cookies (#15)

+ minor VisitorProvider fix

Author: XDex

Source/Adobe.Target.Client/Util/CookieUtils.cs

@@ -64,19 +64,19 @@ internal static Dictionary<string, string> ParseTargetCookie(string? targetCooki
             return nodeDetails.Length != 2 ? null : nodeDetails[0];
         }
 
-        internal static TargetCookie? CreateTargetCookie(string sessionId, string deviceId)
+        internal static TargetCookie? CreateTargetCookie(string? sessionId, string? deviceId)
         {
             var nowInSeconds = GetNowInSeconds();
             var targetCookieValue = new StringBuilder();
-            long maxAge = 0;
+            var maxAge = 0;
             maxAge = CreateSessionId(sessionId, nowInSeconds, targetCookieValue, maxAge);
             maxAge = CreateDeviceId(deviceId, nowInSeconds, targetCookieValue, maxAge);
             var cookieValue = targetCookieValue.ToString();
 
-            return string.IsNullOrEmpty(cookieValue) ? null : new TargetCookie(TargetConstants.MboxCookieName, cookieValue, (int)(maxAge / 1000));
+            return string.IsNullOrEmpty(cookieValue) ? null : new TargetCookie(TargetConstants.MboxCookieName, cookieValue, maxAge);
         }
 
-        internal static TargetCookie? CreateClusterCookie(string tntId)
+        internal static TargetCookie? CreateClusterCookie(string? tntId)
         {
             if (tntId == null)
             {
@@ -90,45 +90,45 @@ internal static Dictionary<string, string> ParseTargetCookie(string? targetCooki
                 return null;
             }
 
-            long maxAge = GetNowInSeconds() + ClusterLocationHintMaxAge;
+            var maxAge = GetNowInSeconds() + ClusterLocationHintMaxAge;
 
-            return new TargetCookie(TargetConstants.ClusterCookieName, locationHint, (int)(maxAge / 1000));
+            return new TargetCookie(TargetConstants.ClusterCookieName, locationHint, maxAge);
         }
 
         private static int GetNowInSeconds()
         {
             return (int)(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() / 1000);
         }
 
-        private static long CreateDeviceId(string deviceId, int nowInSeconds, StringBuilder targetCookieValue, long maxAge)
+        private static int CreateDeviceId(string? deviceId, int nowInSeconds, StringBuilder targetCookieValue, int maxAge)
         {
             if (string.IsNullOrEmpty(deviceId))
             {
                 return maxAge;
             }
 
-            long deviceIdMaxAge = nowInSeconds + DeviceIdCookieMaxAge;
+            var deviceIdMaxAge = nowInSeconds + DeviceIdCookieMaxAge;
             maxAge = Math.Max(maxAge, deviceIdMaxAge);
             AppendCookieValue(deviceId, targetCookieValue, deviceIdMaxAge, TargetConstants.DeviceIdCookieName);
 
             return maxAge;
         }
 
-        private static long CreateSessionId(string sessionId, int nowInSeconds, StringBuilder targetCookieValue, long maxAge)
+        private static int CreateSessionId(string? sessionId, int nowInSeconds, StringBuilder targetCookieValue, int maxAge)
         {
             if (string.IsNullOrEmpty(sessionId))
             {
                 return maxAge;
             }
 
-            long sessionIdMaxAge = nowInSeconds + SessionIdCookieMaxAge;
+            var sessionIdMaxAge = nowInSeconds + SessionIdCookieMaxAge;
             maxAge = sessionIdMaxAge;
             AppendCookieValue(sessionId, targetCookieValue, sessionIdMaxAge, TargetConstants.SessionIdCookieName);
 
             return maxAge;
         }
 
-        private static void AppendCookieValue(string id, StringBuilder targetCookieValue, long maxAge, string cookieName)
+        private static void AppendCookieValue(string? id, StringBuilder targetCookieValue, int maxAge, string cookieName)
         {
             targetCookieValue.Append(cookieName)
                 .Append(InternalCookieSerializationSeparator)

Source/Adobe.Target.Client/Util/TargetConstants.cs

@@ -18,7 +18,7 @@ public static class TargetConstants
         /// <summary>
         /// SDK Version
         /// </summary>
-        public const string SdkVersion = "1.0.1";
+        public const string SdkVersion = "1.0.2";
 
         /// <summary>
         /// Mbox cookie name

Source/Adobe.Target.Client/Util/VisitorProvider.cs

@@ -15,13 +15,14 @@ namespace Adobe.Target.Client.Util
 
     internal sealed class VisitorProvider
     {
+        private const string AmcvPrefix = "AMCV_";
         private static VisitorProvider instance;
         private string orgId;
 
         private VisitorProvider(string orgId)
         {
             this.orgId = orgId;
-            this.VisitorCookieName = new Visitor(orgId).AmcvCookieName;
+            this.VisitorCookieName = AmcvPrefix + orgId;
         }
 
         internal static VisitorProvider Instance