Merged master

Author: gmsdelmundo

UID2.Client.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>UID2.Client</id>
-    <version>5.2.12</version>
+    <version>5.3.1</version>
     <title>UID2 Client C# SDK</title>
     <authors>UID2 team</authors>
     <owners>UID2 team</owners>

src/UID2.Client/KeyContainer.cs

@@ -14,7 +14,7 @@ internal class KeyContainer
 
         private readonly Dictionary<int, List<Key>> _keysByKeyset = new Dictionary<int, List<Key>>();
 
-        private readonly Dictionary<int, Site> _sites = new Dictionary<int, Site>();
+        private readonly Dictionary<int, Site> _siteIdToSite = new Dictionary<int, Site>();
 
         private readonly int _callerSiteId;
         private readonly int _masterKeysetId;
@@ -82,7 +82,7 @@ internal KeyContainer(int callerSiteId, int masterKeysetId, int defaultKeysetId,
                 kv.Value.Sort((Key a, Key b) => a.Activates.CompareTo(b.Activates));
             }
 
-            _sites = sites.ToDictionary(site => site.Id, site => site);
+            this._siteIdToSite = sites.ToDictionary(site => site.Id, site => site);
         }
 
         public bool IsValid(DateTime asOf)
@@ -110,9 +110,14 @@ public bool TryGetMasterKey(DateTime now, out Key key)
             return TryGetKeysetActiveKey(_masterKeysetId, now, out key);
         }
 
-        public bool IsDomainNameForSite(int siteId, string domainName)
+        public bool IsDomainNameAllowedForSite(int siteId, string domainName)
         {
-            return _sites.TryGetValue(siteId, out var site) && site.HasDomainName(domainName);
+            if (domainName == null)
+            {
+                return false;
+            }
+            
+            return this._siteIdToSite.TryGetValue(siteId, out var site) && site.AllowDomainName(domainName);
         }
 
         private bool TryGetKeysetActiveKey(int keysetId, DateTime now, out Key key)

src/UID2.Client/Site.cs

@@ -15,6 +15,6 @@ public Site(int id, IEnumerable<string> domainNames)
 
         public int Id { get; }
 
-        public bool HasDomainName(string domainName) => _domainNames.Contains(domainName);
+        public bool AllowDomainName(string domainName) => _domainNames.Contains(domainName);
     }
 }

src/UID2.Client/UID2Client.cs

@@ -134,7 +134,7 @@ public async Task<RefreshResponse> RefreshAsync(CancellationToken token)
 
         private string GetAssemblyNameAndVersion()
         {
-            var version = "5.2.12";
+            var version = "5.3.1";
             return "uid-client-net-" + version;
         }
 

src/UID2.Client/UID2Encryption.cs

@@ -101,7 +101,7 @@ private static DecryptionResponse DecryptV2(byte[] encryptedId, KeyContainer key
                 return new DecryptionResponse(DecryptionStatus.UserOptedOut, null, established, siteId, siteKey.SiteId, null, 2, privacyBits.IsClientSideGenerated);
             }
 
-            if (!IsValidDomainNameForSite(privacyBits, siteId, domainName, keys))
+            if (!IsDomainNameAllowedForSite(privacyBits, siteId, domainName, keys))
             {
                 return new DecryptionResponse(DecryptionStatus.DomainNameCheckFailed, null, established, siteId, siteKey.SiteId, null, 2, privacyBits.IsClientSideGenerated);
             }
@@ -178,7 +178,7 @@ private static DecryptionResponse DecryptV3(byte[] encryptedId, KeyContainer key
                 return new DecryptionResponse(DecryptionStatus.UserOptedOut, null, established, siteId, siteKey.SiteId, identityType, advertisingTokenVersion, privacyBits.IsClientSideGenerated);
             }
 
-            if (!IsValidDomainNameForSite(privacyBits, siteId, domainName, keys))
+            if (!IsDomainNameAllowedForSite(privacyBits, siteId, domainName, keys))
             {
                 return new DecryptionResponse(DecryptionStatus.DomainNameCheckFailed, null, established, siteId, siteKey.SiteId, identityType, advertisingTokenVersion,
                     privacyBits.IsClientSideGenerated);
@@ -187,14 +187,14 @@ private static DecryptionResponse DecryptV3(byte[] encryptedId, KeyContainer key
             return new DecryptionResponse(DecryptionStatus.Success, idString, established, siteId, siteKey.SiteId, identityType, advertisingTokenVersion, privacyBits.IsClientSideGenerated);
         }
 
-        private static bool IsValidDomainNameForSite(PrivacyBits privacyBits, int siteId, string domainName, KeyContainer keys)
+        private static bool IsDomainNameAllowedForSite(PrivacyBits privacyBits, int siteId, string domainName, KeyContainer keys)
         {
             if (!privacyBits.IsClientSideGenerated)
             {
                 return true;
             }
 
-            return keys.IsDomainNameForSite(siteId, domainName);
+            return keys.IsDomainNameAllowedForSite(siteId, domainName);
         }
 
         internal static EncryptionDataResponse Encrypt(string rawUid, KeyContainer keys, IdentityScope identityScope,

test/UID2.Client.Test/EncryptionTestsV2.cs

@@ -142,7 +142,6 @@ public void TokenExpiryAndCustomNow()
 
             _client.RefreshJson(KeySetToJson(MASTER_KEY, SITE_KEY));
             var advertisingToken = _tokenBuilder.WithExpiry(expiry).Build();
-            ;
 
             var res = _client.Decrypt(advertisingToken, expiry.AddSeconds(1));
             Assert.Equal(DecryptionStatus.ExpiredToken, res.Status);

test/UID2.Client.Test/KeyParserTests.cs

@@ -137,7 +137,7 @@ public void ParseMissingSiteData()
 
             var keyContainer = KeyParser.Parse(json);
 
-            var isDomainNameForSite = keyContainer.IsDomainNameForSite(1, "example.com");
+            var isDomainNameForSite = keyContainer.IsDomainNameAllowedForSite(1, "example.com");
 
             Assert.False(isDomainNameForSite);
 
@@ -165,10 +165,9 @@ public void ParseEmptySiteData()
 
             var keyContainer = KeyParser.Parse(json);
 
-            var isDomainNameForSite = keyContainer.IsDomainNameForSite(1, "example.com");
-
+            var isDomainNameForSite = keyContainer.IsDomainNameAllowedForSite(1, "example.com");
             Assert.False(isDomainNameForSite);
-
+            Assert.False(keyContainer.IsDomainNameAllowedForSite(1, null));
             Assert.True(keyContainer.TryGetKey(3, out var key));
         }
 
@@ -202,13 +201,14 @@ public void ParseSiteDataSharingEndpoint()
 
             var keyContainer = KeyParser.Parse(s);
 
-            Assert.True(keyContainer.IsDomainNameForSite(9, "example.com"));
-            Assert.False(keyContainer.IsDomainNameForSite(9, "example.org"));
-            Assert.False(keyContainer.IsDomainNameForSite(9, "example.net"));
+            Assert.True(keyContainer.IsDomainNameAllowedForSite(9, "example.com"));
+            Assert.False(keyContainer.IsDomainNameAllowedForSite(9, "example.org"));
+            Assert.False(keyContainer.IsDomainNameAllowedForSite(9, "example.net"));
 
-            Assert.False(keyContainer.IsDomainNameForSite(100, "example.com"));
-            Assert.True(keyContainer.IsDomainNameForSite(100, "example.org"));
-            Assert.True(keyContainer.IsDomainNameForSite(100, "example.net"));
+            Assert.False(keyContainer.IsDomainNameAllowedForSite(100, "example.com"));
+            Assert.True(keyContainer.IsDomainNameAllowedForSite(100, "example.org"));
+            Assert.True(keyContainer.IsDomainNameAllowedForSite(100, "example.net"));
+            Assert.False(keyContainer.IsDomainNameAllowedForSite(100, null));
 
             Assert.True(keyContainer.TryGetKey(3, out var key));
         }

test/UID2.Client.Test/TestData.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UID2.Client;
 using UID2.Client.Utils;