Merge pull request #12 from tjgruber/10b-datetime-isnt-locale-safe-fi…

…x-test 10b datetime isnt locale safe fix test
MSEndpointMgr · Nov 16, 2024 · 75901a5 · 75901a5
2 parents 9410978 + 0580d33
commit 75901a5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Private/Invoke-AzureStorageBlobUpload.ps1 b/Private/Invoke-AzureStorageBlobUpload.ps1
@@ -13,14 +13,15 @@ function Invoke-AzureStorageBlobUpload {
         Author:      Nickolaj Andersen
         Contact:     @NickolajA
         Created:     2020-01-04
-        Updated:     2024-06-04
+        Updated:     2024-11-15
 
         Version history:
         1.0.0 - (2020-01-04) Function created
         1.0.1 - (2020-09-20) Fixed an issue where the System.IO.BinaryReader wouldn't open a file path containing whitespaces
         1.0.2 - (2021-03-15) Fixed an issue where SAS Uri renewal wasn't working correctly
         1.0.3 - (2022-09-03) Added access token refresh functionality when a token is about to expire, to prevent uploads from failing due to an expired access token
         1.0.5 - (2024-06-04) Added retry logic for chunk uploads and finalization steps to enhance reliability (thanks to @tjgruber)
+        1.0.6 - (2024-11-15) Refactor date handling for token to fix locale-specific parsing issues (thanks to @tjgruber)
     #>
     param(
         [parameter(Mandatory = $true)]

diff --git a/Public/Test-AccessToken.ps1 b/Public/Test-AccessToken.ps1
@@ -13,13 +13,14 @@ function Test-AccessToken {
         Author:      Nickolaj Andersen
         Contact:     @NickolajA
         Created:     2021-04-08
-        Updated:     2024-03-07
+        Updated:     2024-11-15
 
         Version history:
         1.0.0 - (2021-04-08) Script created
         1.0.1 - (2023-09-04) Updated to use TotalMinutes instead of Minutes property, which would cause for inaccurate results
         1.0.2 - (2024-03-07) Invocation of function when access token is null will now return false
         1.0.3 - (2024-05-29) Updated to handle tokens with ExpiresOn property (thanks to @tjgruber)
+        1.0.4 - (2024-11-15) Refactor date handling for token to fix locale-specific parsing issues (thanks to @tjgruber)
     #>
     param(
         [parameter(Mandatory = $false, HelpMessage = "Specify the renewal threshold for access token age in minutes.")]
@@ -43,8 +44,21 @@ function Test-AccessToken {
                 return $false
             }
 
-            # Determine the token expiration count as minutes
-            $TokenExpireMinutes = [System.Math]::Round(($ExpiresOn - $UTCDateTime).TotalMinutes)
+            # Convert ExpiresOn to DateTimeOffset in UTC
+            $ExpiresOnUTC = [DateTimeOffset]::Parse(
+                $Global:AccessToken.ExpiresOn.ToString(),
+                [System.Globalization.CultureInfo]::InvariantCulture,
+                [System.Globalization.DateTimeStyles]::AssumeUniversal
+                ).ToUniversalTime()
+
+            # Get the current UTC time as DateTimeOffset
+            $UTCDateTime = [DateTimeOffset]::UtcNow
+
+            # Calculate the TimeSpan between expiration and current time
+            $TimeSpan = $ExpiresOnUTC - $UTCDateTime
+
+            # Calculate the token expiration time in minutes
+            $TokenExpireMinutes = [System.Math]::Round($TimeSpan.TotalMinutes)
 
             # Determine if refresh of access token is required when expiration count is less than or equal to minimum age
             if ($TokenExpireMinutes -le $RenewalThresholdMinutes) {