Fix: fallback for usage location in Set-CIPPUserLicense if usageLocation for user is null

Author: kris6673

Modules/CIPPCore/Public/Set-CIPPUserLicense.ps1

@@ -5,7 +5,8 @@ function Set-CIPPUserLicense {
         [Parameter(Mandatory)][string]$TenantFilter,
         [Parameter()][array]$AddLicenses = @(),
         [Parameter()][array]$RemoveLicenses = @(),
-        $Headers
+        $Headers,
+        $APIName = 'Set User License'
     )
 
     # Build the addLicenses array
@@ -28,7 +29,25 @@ function Set-CIPPUserLicense {
     Write-Host "License body JSON: $LicenseBodyJson"
 
     try {
-        $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$UserId/assignLicense" -tenantid $TenantFilter -type POST -body $LicenseBodyJson -Verbose
+        try {
+            $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$UserId/assignLicense" -tenantid $TenantFilter -type POST -body $LicenseBodyJson -Verbose
+        } catch {
+            # Handle if the error is due to missing usage location
+            if ($_.Exception.Message -like '*invalid usage location*') {
+                $Table = Get-CippTable -tablename 'UserSettings'
+                $UserSettings = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'UserSettings' and RowKey eq 'allUsers'"
+                if ($UserSettings) { $DefaultUsageLocation = (ConvertFrom-Json $UserSettings.JSON -Depth 5 -ErrorAction SilentlyContinue).usageLocation.value }
+                $DefaultUsageLocation ??= 'US' # Fallback to US if not set
+
+                $UsageLocationJson = ConvertTo-Json -InputObject @{'usageLocation' = $DefaultUsageLocation } -Depth 5 -Compress
+                $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$UserId" -tenantid $TenantFilter -type PATCH -body $UsageLocationJson -Verbose
+                Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message "Set usage location for user $UserId to $DefaultUsageLocation" -Sev 'Info'
+                # Retry assigning the license
+                $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$UserId/assignLicense" -tenantid $TenantFilter -type POST -body $LicenseBodyJson -Verbose
+            } else {
+                throw $_
+            }
+        }
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
         Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message "Failed to assign the license. Error: $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage