Merge pull request #317 in TSI/web-application from feature/TSI-3302 …

…to develop

* commit '848b41d4bac19a08c20bbe8e0499a23e7a0ddaac':
  TSI-3302 : Forward on conditions to model-service

Sdl.Web.ModelService/ModelServiceClient.cs

@@ -235,6 +235,7 @@ private string PerformRequest(Uri requestUri)
                     SetCookie(request, PreviewSessionTokenCookie, cookies[PreviewSessionTokenCookie]);
                 }             
 
+                // Forward all claims on to model-service
                 var forwardedClaimValues = AmbientDataContext.ForwardedClaims;
                 if (forwardedClaimValues != null && forwardedClaimValues.Count > 0)
                 {
@@ -252,10 +253,17 @@ private string PerformRequest(Uri requestUri)
                         {
                             byte[] cookieValue = claimsCookie.Value;
                             Cookie cookie = new Cookie(claimsCookie.Name, new System.Text.ASCIIEncoding().GetString(cookieValue));                        
-                            SetCookie(request, cookie);
+                            SetCookie(request, cookie.Name, cookie.Value);
                         }
                     }
                 }
+
+                // To support the TridionDocs module (should not require this when model-service is PCA plugin)
+                var conditions = claimStore.Get<string>(new Uri("taf:ish:userconditions"));
+                if (conditions != null)
+                {
+                    SetCookie(request, "taf.ish.userconditions", Base64.Encode(conditions));
+                }
             }
 
             int attempt = 0;
@@ -291,13 +299,10 @@ private string PerformRequest(Uri requestUri)
         private static void SetCookie(HttpWebRequest httpWebRequest, string name, string value)
         {
             // Quick-and-dirty way: just directly set the "Cookie" HTTP header
-            httpWebRequest.Headers.Add("Cookie", $"{name}={value}");
-        }
-
-        private static void SetCookie(HttpWebRequest httpWebRequest, Cookie cookie)
-        {
-            // Quick-and-dirty way: just directly set the "Cookie" HTTP header
-            httpWebRequest.Headers.Add("Cookie", $"{cookie}");
+            string headerValue = httpWebRequest.Headers["Cookie"] ?? "";
+            if (headerValue.Length > 0) headerValue += ";";
+            headerValue += $"{name}={value}";
+            httpWebRequest.Headers.Add("Cookie", headerValue);
         }
 
         private static string GetResponseBody(WebResponse webResponse)