From 3f15a11ee4be91737f5c8a506889e0bfbeff2ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Henneberg=20Christiansen?= <bhc@workpoint.dk>
Date: Tue, 30 Jul 2024 11:33:42 +0200
Subject: [PATCH] added unique identifier to temporary file name added try
 finally to ensure deletion of file

---
 .../Extensions/UserResourceExtensions.cs      | 69 ++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/Extensions/UserResourceExtensions.cs b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/Extensions/UserResourceExtensions.cs
index cc1d18ff3..3caa5596a 100644
--- a/src/lib/PnP.Framework/Provisioning/ObjectHandlers/Extensions/UserResourceExtensions.cs
+++ b/src/lib/PnP.Framework/Provisioning/ObjectHandlers/Extensions/UserResourceExtensions.cs
@@ -14,57 +14,66 @@ namespace PnP.Framework.Provisioning.ObjectHandlers.Extensions
 {
     internal static class UserResourceExtensions
     {
-
         public static ProvisioningTemplate SaveResourceValues(ProvisioningTemplate template, ProvisioningTemplateCreationInformation creationInfo)
         {
             var tempFolder = Path.GetTempPath();
             List<Tuple<string, int, string>> resourceTokens = creationInfo.ResourceTokens;
-
             var languages = resourceTokens.Select(t => t.Item2).Distinct();
             foreach (int language in languages)
             {
                 var culture = new CultureInfo(language);
+                // Use a unique file name by appending a GUID
+                var uniqueFileName = $"{creationInfo.ResourceFilePrefix}.{culture.Name}.{Guid.NewGuid()}.resx";
+                var resourceFileName = Path.Combine(tempFolder, uniqueFileName);
+                var resourceFileToDelete = resourceFileName;
 
-                var resourceFileName = Path.Combine(tempFolder, $"{creationInfo.ResourceFilePrefix}.{culture.Name}.resx");
-                if (System.IO.File.Exists(resourceFileName))
+                try
                 {
-                    // Read existing entries, if any
-                    using (ResourceReader resxReader = new ResourceReader(resourceFileName))
-                    //using (ResXResourceReader resxReader = new ResXResourceReader(resourceFileName))
+                    if (System.IO.File.Exists(resourceFileName))
                     {
-                        foreach (DictionaryEntry entry in resxReader)
+                        // Read existing entries, if any
+                        using (ResourceReader resxReader = new ResourceReader(resourceFileName))
                         {
-                            // find if token is already there
-                            var existingToken = resourceTokens.FirstOrDefault(t => t.Item1 == entry.Key.ToString() && t.Item2 == language);
-                            if (existingToken == null)
+                            foreach (DictionaryEntry entry in resxReader)
                             {
-                                resourceTokens.Add(new Tuple<string, int, string>(entry.Key.ToString(), language, entry.Value as string));
+                                // find if token is already there
+                                var existingToken = resourceTokens.FirstOrDefault(t => t.Item1 == entry.Key.ToString() && t.Item2 == language);
+                                if (existingToken == null)
+                                {
+                                    resourceTokens.Add(new Tuple<string, int, string>(entry.Key.ToString(), language, entry.Value as string));
+                                }
                             }
                         }
                     }
-                }
 
-                // Create new resource file - use implementation copied from .Net Framework cause otherwise we end up with binary serialized files
-                //using (ResourceWriter resx = new ResourceWriter(resourceFileName))
-                using (ResXResourceWriter resx = new ResXResourceWriter(resourceFileName))
-                {
-                    foreach (var token in resourceTokens.Where(t => t.Item2 == language))
+                    // Create new resource file - use implementation copied from .Net Framework cause otherwise we end up with binary serialized files
+                    //using (ResourceWriter resx = new ResourceWriter(resourceFileName))
+                    using (ResXResourceWriter resx = new ResXResourceWriter(resourceFileName))
                     {
-
-                        resx.AddResource(token.Item1, token.Item3);
+                        foreach (var token in resourceTokens.Where(t => t.Item2 == language))
+                        {
+                            resx.AddResource(token.Item1, token.Item3);
+                        }
                     }
-                }
 
-                template.Localizations.Add(new Localization() { LCID = language, Name = culture.NativeName, ResourceFile = $"{creationInfo.ResourceFilePrefix}.{culture.Name}.resx" });
+                    template.Localizations.Add(new Localization() { LCID = language, Name = culture.NativeName, ResourceFile = uniqueFileName });
 
-                // Persist the file using the connector
-                using (FileStream stream = System.IO.File.Open(resourceFileName, FileMode.Open))
+                    // Persist the file using the connector
+                    using (FileStream stream = System.IO.File.Open(resourceFileName, FileMode.Open))
+                    {
+                        creationInfo.FileConnector.SaveFileStream(uniqueFileName, stream);
+                    }
+                }
+                finally
                 {
-                    creationInfo.FileConnector.SaveFileStream($"{creationInfo.ResourceFilePrefix}.{culture.Name}.resx", stream);
+                    // Ensure the temp resx file is deleted even if an exception occurs
+                    if (System.IO.File.Exists(resourceFileToDelete))
+                    {
+                        System.IO.File.Delete(resourceFileToDelete);
+                    }
                 }
-                // remove the temp resx file
-                System.IO.File.Delete(resourceFileName);
             }
+
             return template;
         }
 
@@ -140,8 +149,8 @@ public static bool PersistResourceValue(List siteList, Guid viewId, string token
                 }
 
                 clientContext.PendingRequest.RequestExecutor.WebRequest.Headers["Accept-Language"] = acceptLanguage;
-
             }
+
             return returnValue;
         }
 
@@ -155,8 +164,6 @@ public static bool ContainsResourceToken(this string value)
             {
                 return false;
             }
-
         }
     }
-
-}
+}
\ No newline at end of file