Fixes microsoft#3576

ykuijs · Mar 27, 2024 · 1944546 · 1944546
1 parent e4bfbda
commit 1944546
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,14 +18,14 @@
 * EXOGroupSettings
   * Fixed schema file
 * EXOMailTips
-  * Replaced the Organization parameter with IsSingleInstance (BREAKING)
+  * [BREAKING CHANGE] Replaced the Organization parameter with IsSingleInstance
     FIXES [#4117](https://github.com/microsoft/Microsoft365DSC/issues/4117)
 * EXOMessageClassification
   * Fixed schema file
 * EXOOMEConfiguration
   * Fixed schema file
 * EXOTransportRule
-  * Change data type of Priority from String to Int (BREAKING)
+  * [BREAKING CHANGE] Change data type of Priority from String to Int
     FIXES [[#4136](https://github.com/microsoft/Microsoft365DSC/issues/4136)]
 * IntuneAppConfigurationPolicy
   * Fix comparison in Test-TargetResource
@@ -42,6 +42,17 @@
   * Log both matching and not matching resources and in XML format
 * O365OrgSettings
   * Fixed missing permissions in settings.json
+* SPOAccessControlSettings
+  * [BREAKING CHANGE] Removed CommentsOnSitePagesDisabled parameter, because of
+    duplication in SPOTenantSettings
+    FIXES [#3576](https://github.com/microsoft/Microsoft365DSC/issues/3576)
+  * [BREAKING CHANGE] Moved SocialBarOnSitePagesDisabled parameter to SPOTenantSettings,
+    because it makes more sense there. This has nothing to do with Access Control.
+* SPOTenantSettings
+  * [BREAKING CHANGE] Removed ConditionalAccessPolicy parameter, because of
+    duplication in SPOAccessControlSettings
+    FIXES [#3576](https://github.com/microsoft/Microsoft365DSC/issues/3576)
+  * Added SocialBarOnSitePagesDisabled parameter, moved from SPOAccessControlSettings.
 * TeamsChannelTab
   * Fixed schema file
 * TeamsGroupPolicyAssignment

diff --git a/...osoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 b/...osoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1
@@ -29,14 +29,6 @@ function Get-TargetResource
         [System.UInt32]
         $IPAddressWACTokenLifetime,
 
-        [Parameter()]
-        [System.Boolean]
-        $CommentsOnSitePagesDisabled,
-
-        [Parameter()]
-        [System.Boolean]
-        $SocialBarOnSitePagesDisabled,
-
         [Parameter()]
         [System.Boolean]
         $DisallowInfectedFileDownload,
@@ -127,8 +119,6 @@ function Get-TargetResource
             IPAddressEnforcement         = $SPOAccessControlSettings.IPAddressEnforcement
             IPAddressAllowList           = $SPOAccessControlSettings.IPAddressAllowList
             IPAddressWACTokenLifetime    = $SPOAccessControlSettings.IPAddressWACTokenLifetime
-            CommentsOnSitePagesDisabled  = $SPOAccessControlSettings.CommentsOnSitePagesDisabled
-            SocialBarOnSitePagesDisabled = $SPOAccessControlSettings.SocialBarOnSitePagesDisabled
             DisallowInfectedFileDownload = $SPOAccessControlSettings.DisallowInfectedFileDownload
             ExternalServicesEnabled      = $SPOAccessControlSettings.ExternalServicesEnabled
             EmailAttestationRequired     = $SPOAccessControlSettings.EmailAttestationRequired
@@ -192,14 +182,6 @@ function Set-TargetResource
         [System.UInt32]
         $IPAddressWACTokenLifetime,
 
-        [Parameter()]
-        [System.Boolean]
-        $CommentsOnSitePagesDisabled,
-
-        [Parameter()]
-        [System.Boolean]
-        $SocialBarOnSitePagesDisabled,
-
         [Parameter()]
         [System.Boolean]
         $DisallowInfectedFileDownload,
@@ -329,14 +311,6 @@ function Test-TargetResource
         [System.UInt32]
         $IPAddressWACTokenLifetime,
 
-        [Parameter()]
-        [System.Boolean]
-        $CommentsOnSitePagesDisabled,
-
-        [Parameter()]
-        [System.Boolean]
-        $SocialBarOnSitePagesDisabled,
-
         [Parameter()]
         [System.Boolean]
         $DisallowInfectedFileDownload,
@@ -424,8 +398,6 @@ function Test-TargetResource
             'IPAddressEnforcement', `
             'IPAddressAllowList', `
             'IPAddressWACTokenLifetime', `
-            'CommentsOnSitePagesDisabled', `
-            'SocialBarOnSitePagesDisabled', `
             'DisallowInfectedFileDownload', `
             'ExternalServicesEnabled', `
             'EmailAttestationRequired', `

diff --git a/...65DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof b/...65DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof
@@ -7,8 +7,6 @@ class MSFT_SPOAccessControlSettings : OMI_BaseResource
     [Write, Description("Allows access from network locations that are defined by an administrator.")] boolean IPAddressEnforcement;
     [Write, Description("Configures multiple IP addresses or IP address ranges (IPv4 or IPv6). Use commas to separate multiple IP addresses or IP address ranges.")] string IPAddressAllowList;
     [Write, Description("Office webapps TokenLifeTime in minutes")] uint32 IPAddressWACTokenLifetime;
-    [Write, Description("When this feature is set to true, comments on site pages will be disabled")] boolean CommentsOnSitePagesDisabled;
-    [Write, Description("Disables or enables the Social Bar. It will give users the ability to like a page, see the number of views, likes, and comments on a page, and see the people who have liked a page.")] boolean SocialBarOnSitePagesDisabled;
     [Write, Description("Prevents the Download button from being displayed on the Virus Found warning page.")] boolean DisallowInfectedFileDownload;
     [Write, Description("Enables external services for a tenant. External services are defined as services that are not in the Office 365 datacenters.")] boolean ExternalServicesEnabled;
     [Write, Description("Sets email attestation to required")] boolean EmailAttestationRequired;

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1
@@ -82,11 +82,6 @@ function Get-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
-        [Parameter()]
-        [ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess')]
-        [System.String]
-        $ConditionalAccessPolicy,
-
         [Parameter()]
         [System.Guid[]]
         $DisabledWebPartIds,
@@ -95,6 +90,10 @@ function Get-TargetResource
         [System.Boolean]
         $IsFluidEnabled,
 
+        [Parameter()]
+        [System.Boolean]
+        $SocialBarOnSitePagesDisabled,
+
         [Parameter()]
         [System.Boolean]
         $CommentsOnSitePagesDisabled,
@@ -188,8 +187,8 @@ function Get-TargetResource
             HideDefaultThemes                             = $SPOTenantSettings.HideDefaultThemes
             HideSyncButtonOnTeamSite                      = $SPOTenantSettings.HideSyncButtonOnTeamSite
             MarkNewFilesSensitiveByDefault                = $SPOTenantSettings.MarkNewFilesSensitiveByDefault
-            ConditionalAccessPolicy                       = $SPOTenantSettings.ConditionalAccessPolicy
             DisabledWebPartIds                            = [String[]]$SPOTenantSettings.DisabledWebPartIds
+            SocialBarOnSitePagesDisabled                  = $SPOTenantSettings.SocialBarOnSitePagesDisabled
             CommentsOnSitePagesDisabled                   = $SPOTenantSettings.CommentsOnSitePagesDisabled
             Credential                                    = $Credential
             ApplicationId                                 = $ApplicationId
@@ -302,15 +301,14 @@ function Set-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
-        [Parameter()]
-        [ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess')]
-        [System.String]
-        $ConditionalAccessPolicy,
-
         [Parameter()]
         [System.Guid[]]
         $DisabledWebPartIds,
 
+        [Parameter()]
+        [System.Boolean]
+        $SocialBarOnSitePagesDisabled,
+
         [Parameter()]
         [System.Boolean]
         $CommentsOnSitePagesDisabled,
@@ -473,15 +471,14 @@ function Test-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
-        [Parameter()]
-        [ValidateSet('AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess')]
-        [System.String]
-        $ConditionalAccessPolicy,
-
         [Parameter()]
         [System.Guid[]]
         $DisabledWebPartIds,
 
+        [Parameter()]
+        [System.Boolean]
+        $SocialBarOnSitePagesDisabled,
+
         [Parameter()]
         [System.Boolean]
         $CommentsOnSitePagesDisabled,
@@ -562,8 +559,8 @@ function Test-TargetResource
             'HideDefaultThemes', `
             'HideSyncButtonOnTeamSite', `
             'MarkNewFilesSensitiveByDefault', `
-            'ConditionalAccessPolicy', `
             'DisabledWebPartIds', `
+            'SocialBarOnSitePagesDisabled', `
             'CommentsOnSitePagesDisabled'
     )
 

diff --git a/...les/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof b/...les/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof
@@ -20,8 +20,8 @@ class MSFT_SPOTenantSettings : OMI_BaseResource
     [Write, Description("Defines if the default themes are visible or hidden")] boolean HideDefaultThemes;
     [Write, Description("To enable or disable Sync button on Team sites")] boolean HideSyncButtonOnTeamSite;
     [Write, Description("Allow or block external sharing until at least one Office DLP policy scans the content of the file."), ValueMap{"AllowExternalSharing","BlockExternalSharing"}, Values{"AllowExternalSharing","BlockExternalSharing"}] string MarkNewFilesSensitiveByDefault;
-    [Write, Description("Allow or Block Conditional Access Policy on the SharePoint Tenant"), ValueMap{"AllowFullAccess", "AllowLimitedAccess", "BlockAccess"}, Values{"AllowFullAccess", "AllowLimitedAccess", "BlockAccess"}] string ConditionalAccessPolicy;
     [Write, Description("Provide GUID for the Web Parts that are to be disabled on the Sharepoint Site")] string DisabledWebPartIds[];
+    [Write, Description("Disables or enables the Social Bar. It will give users the ability to like a page, see the number of views, likes, and comments on a page, and see the people who have liked a page.")] boolean SocialBarOnSitePagesDisabled;
     [Write, Description("Set to false to enable a comment section on all site pages, users who have access to the pages can leave comments. Set to true to disable this feature.")] boolean CommentsOnSitePagesDisabled;
     [Write, Description("Only accepted value is 'Present'."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Write, Description("Credentials of the account to authenticate with."), EmbeddedInstance("MSFT_Credential")] string Credential;

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOAccessControlSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOAccessControlSettings.Tests.ps1
@@ -48,7 +48,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     IPAddressEnforcement         = $false
                     #IPAddressAllowList           = "" #would generate an error while writing this resource
                     IPAddressWACTokenLifetime    = 15
-                    CommentsOnSitePagesDisabled  = $false
                     SocialBarOnSitePagesDisabled = $false
                     DisallowInfectedFileDownload = $false
                     ExternalServicesEnabled      = $true
@@ -63,7 +62,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         IPAddressEnforcement         = $false
                         #IPAddressAllowList           = "" #would generate an error while writing this resource
                         IPAddressWACTokenLifetime    = 15
-                        CommentsOnSitePagesDisabled  = $false
                         SocialBarOnSitePagesDisabled = $false
                         DisallowInfectedFileDownload = $false
                         ExternalServicesEnabled      = $true
@@ -79,7 +77,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         IPAddressEnforcement         = $false
                         #IPAddressAllowList           = "" #would generate an error while writing this resource
                         IPAddressWACTokenLifetime    = 20
-                        CommentsOnSitePagesDisabled  = $true
                         SocialBarOnSitePagesDisabled = $false
                         DisallowInfectedFileDownload = $false
                         ExternalServicesEnabled      = $true
@@ -113,7 +110,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         IPAddressEnforcement         = $false
                         #IPAddressAllowList           = "" #would generate an error while writing this resource
                         IPAddressWACTokenLifetime    = 15
-                        CommentsOnSitePagesDisabled  = $false
                         SocialBarOnSitePagesDisabled = $false
                         DisallowInfectedFileDownload = $false
                         ExternalServicesEnabled      = $true