Skip to content

Commit

Permalink
Merge pull request #4193 from NikCharlebois/Integration
Browse files Browse the repository at this point in the history
Fixes for SPOSharingSettings
  • Loading branch information
NikCharlebois authored Jan 19, 2024
2 parents 3398545 + bda68c7 commit 4c7a1cb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 29 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
* Removed the ability to specify a value of Absent for the Ensure property.
* AADCrossTenantAccessPolicyCOnfigurationDefault
* Removed the ability to specify a value of Absent for the Ensure property.
* SPOSharingSettings
* Fixed an Issue where the MySiteSharingCapability could be returned as an
empty string instead of a null value from the Get method.

# 1.24.117.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,9 @@ function Get-TargetResource
{
$DefaultLinkPermission = $SPOSharingSettings.DefaultLinkPermission
}

return @{
$results = @{
IsSingleInstance = 'Yes'
SharingCapability = $SPOSharingSettings.SharingCapability
MySiteSharingCapability = $MySiteSharingCapability
ShowEveryoneClaim = $SPOSharingSettings.ShowEveryoneClaim
ShowAllUsersClaim = $SPOSharingSettings.ShowAllUsersClaim
ShowEveryoneExceptExternalUsersClaim = $SPOSharingSettings.ShowEveryoneExceptExternalUsersClaim
Expand Down Expand Up @@ -229,6 +227,12 @@ function Get-TargetResource
Managedidentity = $ManagedIdentity.IsPresent
Ensure = 'Present'
}

if (-not [System.String]::IsNullOrEmpty($MySiteSharingCapability))
{
$results.Add('MySiteSharingCapability', $MySiteSharingCapability)
}
return $results
}
catch
{
Expand Down

This file was deleted.

0 comments on commit 4c7a1cb

Please sign in to comment.