From 14c08b8c4c9399ffb94682fb5a2ac744a76b9893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Angel=20Garc=C3=ADa=20Mart=C3=ADnez?=
 <magarma@gmail.com>
Date: Wed, 9 Oct 2024 19:27:36 +0200
Subject: [PATCH 1/2] Support Everyone except external users

Adding support for UserMulti field for "Everyone except external users".

LookupValue comes with the string "Everyone except external users" that is compared with the value returned for the function GetEveryoneExceptExternalUsersClaimName
---
 .../Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
index 996664698..1629a606a 100644
--- a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
+++ b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
@@ -649,6 +649,10 @@ private string TokenizeValue(Web web, string fieldTypeAsString, KeyValuePair<str
                     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()))
+                        {
+                            value = value + ",{everyonebutexternalusers}";
+                        }
                     }
                     break;
                 case "Lookup":

From ea4e154f4e167bbaac8768c8538f9e1bbf053452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Angel=20Garc=C3=ADa=20Mart=C3=ADnez?=
 <magarma@gmail.com>
Date: Wed, 9 Oct 2024 19:34:41 +0200
Subject: [PATCH 2/2] Support User single value for everyone except external
 users

Support User single value for everyone except external users
---
 .../ObjectHandlers/ObjectListInstanceDataRows.cs         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
index 1629a606a..17ebfb331 100644
--- a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
+++ b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstanceDataRows.cs
@@ -641,7 +641,10 @@ 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":
@@ -651,7 +654,9 @@ private string TokenizeValue(Web web, string fieldTypeAsString, KeyValuePair<str
                         value = string.Join(",", userMultiFieldValue.Select(u => u.Email).ToArray())?.TrimEnd(new char[] { ',' }).Trim(new char[] { ',' });
                         if (userMultiFieldValue.Any(u => u.LookupValue == web.GetEveryoneExceptExternalUsersClaimName()))
                         {
-                            value = value + ",{everyonebutexternalusers}";
+                            if (!string.IsNullOrEmpty(value))
+                                value = value + ",";
+                            value = value + "{everyonebutexternalusers}";
                         }
                     }
                     break;