Merge pull request #1070 from magarma/dev

Giving support for Everyone except external users during the ListItem data row extraction

Author: gautamdsheth

src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs

@@ -641,14 +641,23 @@ private string TokenizeValue(Web web, string fieldTypeAsString, KeyValuePair<str
                     var userFieldValue = fieldValue.Value as Microsoft.SharePoint.Client.FieldUserValue;
                     if (userFieldValue != null)
                     {
-                        value = userFieldValue.Email;
+                        if (!string.IsNullOrEmpty(userFieldValue.Email))
+                            value = userFieldValue.Email;
+                        else if (userFieldValue.LookupValue == web.GetEveryoneExceptExternalUsersClaimName())
+                            value = "{everyonebutexternalusers}";
                     }
                     break;
                 case "UserMulti":
                     var userMultiFieldValue = fieldValue.Value as Microsoft.SharePoint.Client.FieldUserValue[];
                     if (userMultiFieldValue != null)
                     {
                         value = string.Join(",", userMultiFieldValue.Select(u => u.Email).ToArray())?.TrimEnd(new char[] { ',' }).Trim(new char[] { ',' });
+                        if (userMultiFieldValue.Any(u => u.LookupValue == web.GetEveryoneExceptExternalUsersClaimName()))
+                        {
+                            if (!string.IsNullOrEmpty(value))
+                                value = value + ",";
+                            value = value + "{everyonebutexternalusers}";
+                        }
                     }
                     break;
                 case "Lookup":