Implement clone method rather than relying on Serialization (#1469)

AzureAD · Jan 11, 2019 · 9ba5664 · 9ba5664
1 parent 828529d
commit 9ba5664
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Microsoft.IdentityModel.Clients.ActiveDirectory/Core/Cache/AdalResult.cs b/src/Microsoft.IdentityModel.Clients.ActiveDirectory/Core/Cache/AdalResult.cs
@@ -144,5 +144,18 @@ internal void UpdateTenantAndUserInfo(string tenantId, string idToken, AdalUserI
                 this.UserInfo = new AdalUserInfo(userInfo);
             }
         }
+
+        internal AdalResult Clone()
+        {
+            var result = new AdalResult(AccessTokenType, AccessToken, ExpiresOn, ExtendedExpiresOn)
+            {
+                Authority = Authority,
+                ExtendedLifeTimeToken = ExtendedLifeTimeToken,
+            };
+
+            result.UpdateTenantAndUserInfo(TenantId, IdToken, UserInfo);
+
+            return result;
+        }
     }
 }
diff --git a/src/Microsoft.IdentityModel.Clients.ActiveDirectory/Core/Cache/AdalResultWrapper.cs b/src/Microsoft.IdentityModel.Clients.ActiveDirectory/Core/Cache/AdalResultWrapper.cs
@@ -110,7 +110,15 @@ public string Serialize()
 
         internal AdalResultWrapper Clone()
         {
-            return Deserialize(Serialize());
+            return new AdalResultWrapper()
+            {
+                Exception = Exception,
+                RawClientInfo = RawClientInfo,
+                RefreshToken = RefreshToken,
+                ResourceInResponse = ResourceInResponse,
+                UserAssertionHash = UserAssertionHash,
+                Result = Result.Clone()
+            };
         }
     }
 }