Revert "O365OrgSettings - Added Support for CustomerLockboxEnabled"

microsoft · Sep 16, 2024 · 6510831 · 6510831
1 parent e2d05ef
commit 6510831
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,8 +32,6 @@
 * IntuneDeviceConfigurationSharedMultiDevicePolicyWindows10
   * Add missing `AccessTokens` parameter to `Export-TargetResource`
     FIXES [#5034](https://github.com/microsoft/Microsoft365DSC/issues/5034)
-* O365OrgSettings
-  * Added support for the CustomerLockboxEnabled property.
 * SCRoleGroup
   * Fixes an issue with creation without specifying Displayname
   * Fixes an issue with Drifts because of returned Role format

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1
@@ -17,10 +17,6 @@ function Get-TargetResource
         [System.Boolean]
         $AppsAndServicesIsOfficeStoreEnabled,
 
-        [Parameter()]
-        [System.Boolean]
-        $CustomerLockboxEnabled,
-
         [Parameter()]
         [System.Boolean]
         $AppsAndServicesIsAppAndServicesTrialEnabled,
@@ -239,6 +235,61 @@ function Get-TargetResource
             }
         }
 
+        # DEPRECATED - Microsoft Viva Briefing Email
+        <#
+        $vivaBriefingEmailValue = $false
+        try
+        {
+            $currentBriefingConfig = Get-DefaultTenantBriefingConfig -ErrorAction Stop -Verbose:$false
+            if ($currentBriefingConfig.IsEnabledByDefault -eq 'opt-in')
+            {
+                $vivaBriefingEmailValue = $true
+            }
+        }
+        catch
+        {
+            if ($_.Exception.Message -like "*Unexpected character encountered while parsing value*")
+            {
+                $vivaBriefingEmailValue = $true
+            }
+            elseif ($_.Exception.Message -like "*A task was canceled*")
+            {
+                $retries = 1
+                $errorContent = $null
+                while ($retries -le 5)
+                {
+                    try
+                    {
+                        Start-Sleep -Seconds 2
+                        $currentBriefingConfig = Get-DefaultTenantBriefingConfig -ErrorAction Stop -Verbose:$false
+                    }
+                    catch
+                    {
+                        $errorContent = $_
+                        $retries++
+                    }
+                }
+                if ($null -eq $currentBriefingConfig)
+                {
+                    throw $errorContent
+                }
+                else
+                {
+                    if ($currentBriefingConfig.IsEnabledByDefault -eq 'opt-in')
+                    {
+                        $vivaBriefingEmailValue = $true
+                    }
+                }
+            }
+            else
+            {
+                throw $_
+            }
+        }
+        $results += @{
+            MicrosoftVivaBriefingEmail = $vivaBriefingEmailValue
+        }#>
+
         # Viva Insights settings
         $currentVivaInsightsSettings = Get-DefaultTenantMyAnalyticsFeatureConfig -Verbose:$false
         if ($null -ne $currentVivaInsightsSettings)
@@ -254,11 +305,11 @@ function Get-TargetResource
         $MRODeviceManagerService = 'ebe0c285-db95-403f-a1a3-a793bd6d7767'
         try
         {
-            $servicePrincipal = Get-MgServicePrincipal -Filter "appid eq '$MRODeviceManagerService'"
+            $servicePrincipal = Get-MgServicePrincipal -Filter "appid eq 'ebe0c285-db95-403f-a1a3-a793bd6d7767'"
             if ($null -eq $servicePrincipal)
             {
                 Write-Verbose -Message "Registering the MRO Device Manager Service Principal"
-                New-MgServicePrincipal -AppId $MRODeviceManagerService -ErrorAction Stop | Out-Null
+                New-MgServicePrincipal -AppId 'ebe0c285-db95-403f-a1a3-a793bd6d7767' -ErrorAction Stop | Out-Null
             }
         }
         catch
@@ -350,9 +401,6 @@ function Get-TargetResource
             }
         }
 
-        $OrganizationConfig = Get-OrganizationConfig
-        $results.Add('CustomerLockboxEnabled', $OrganizationConfig.CustomerLockboxEnabled)
-
         return $results
     }
     catch
@@ -389,10 +437,6 @@ function Set-TargetResource
         [System.Boolean]
         $AppsAndServicesIsAppAndServicesTrialEnabled,
 
-        [Parameter()]
-        [System.Boolean]
-        $CustomerLockboxEnabled,
-
         [Parameter()]
         [System.Boolean]
         $DynamicsCustomerVoiceIsRestrictedSurveyAccessEnabled,
@@ -582,6 +626,14 @@ function Set-TargetResource
     {
         Write-Verbose -Message "DEPRECATED - The MicrosoftVivaBriefingEmail parameter is deprecated and will be ignored."
     }
+    #$briefingValue = 'opt-out'
+
+    <# DEPRECATED
+    if ($currentValues.MicrosoftVivaBriefingEmail -and $MicrosoftVivaBriefingEmail -ne $currentValues.MicrosoftVivaBriefingEmail)
+    {
+        Write-Verbose -Message "Updating Microsoft Viva Briefing Email settings."
+        Set-DefaultTenantBriefingConfig -IsEnabledByDefault $briefingValue -Verbose:$false | Out-Null
+    }#>
 
     # Viva Insights
     if ($PSBoundParameters.ContainsKey('VivaInsightsWebExperience') -and `
@@ -792,12 +844,6 @@ function Set-TargetResource
         Write-Verbose -Message "Updating the To Do settings with values:$(Convert-M365DscHashtableToString -Hashtable $ToDoParametersToUpdate)"
         Update-M365DSCOrgSettingsToDo -Options $ToDoParametersToUpdate
     }
-
-    # Customer Lockbox
-    if ($PSBoundParameters.ContainsKey('CustomerLockboxEnabled'))
-    {
-        Set-OrganizationConfig -CustomerLockboxEnabled $CustomerLockboxEnabled | Out-Null
-    }
 }
 
 function Test-TargetResource
@@ -823,10 +869,6 @@ function Test-TargetResource
         [System.Boolean]
         $AppsAndServicesIsAppAndServicesTrialEnabled,
 
-        [Parameter()]
-        [System.Boolean]
-        $CustomerLockboxEnabled,
-
         [Parameter()]
         [System.Boolean]
         $DynamicsCustomerVoiceIsRestrictedSurveyAccessEnabled,

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.schema.mof
@@ -26,7 +26,6 @@ class MSFT_O365OrgSettings : OMI_BaseResource
     [Write, Description("To Do - Allow sharing with external users.")] Boolean ToDoIsExternalShareEnabled;
     [Write, Description("To Do - Allow your users to receive push notifications.")] Boolean ToDoIsPushNotificationEnabled;
     [Write, Description("Controls whether or not the Admin Center reports will conceale user, group and site names.")] Boolean AdminCenterReportDisplayConcealedNames;
-    [Write, Description("Determines if the customer lockbox should require approval for all data access requests or not.")] Boolean CustomerLockboxEnabled;
     [Write, Description("Defines how often you want your users to get feature updates for Microsoft 365 apps installed on devices running Windows"), ValueMap{"current","monthlyEnterprise","semiAnnual"}, Values{"current","monthlyEnterprise","semiAnnual"}] String InstallationOptionsUpdateChannel;
     [Write, Description("Defines the apps users can install on Windows and mobile devices."), ValueMap{"isVisioEnabled","isSkypeForBusinessEnabled","isProjectEnabled","isMicrosoft365AppsEnabled"}, Values{"isVisioEnabled","isSkypeForBusinessEnabled","isProjectEnabled","isMicrosoft365AppsEnabled"}] String InstallationOptionsAppsForWindows[];
     [Write, Description("Defines the apps users can install on Mac devices."), ValueMap{"isSkypeForBusinessEnabled","isMicrosoft365AppsEnabled"}, Values{"isSkypeForBusinessEnabled","isMicrosoft365AppsEnabled"}] String InstallationOptionsAppsForMac[];

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -1771,6 +1771,7 @@ function New-M365DSCConnection
         [System.Boolean]
         $SkipModuleReload = $false
     )
+    $verbosepreference = 'Continue'
     $Global:MaximumFunctionCount = 32767
     if ($Workload -eq 'MicrosoftTeams')
     {