Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

KelvinTegelaar · KelvinTegelaar · commit aefbb6585144 · 2025-03-14T22:47:05.000+01:00
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1
@@ -44,7 +44,7 @@ Function Push-ExecOnboardTenantQueue {
             @{ Name = 'Cloud App Security Administrator'; Id = '892c5842-a9a6-463a-8041-72aa08ca3cf6' },
             @{ Name = 'Cloud Device Administrator'; Id = '7698a772-787b-4ac8-901f-60d6b08affd2' },
             @{ Name = 'Teams Administrator'; Id = '69091246-20e8-4a56-aa4d-066075b2a7a8' },
-            @{ Name = 'Sharepoint Administrator'; Id = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
+            @{ Name = 'SharePoint Administrator'; Id = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
             @{ Name = 'Authentication Policy Administrator'; Id = '0526716b-113d-4c15-b2c8-68e3c22b9f80' },
             @{ Name = 'Privileged Role Administrator'; Id = 'e8611ab8-c189-46e8-94e1-60213ab1f814' },
             @{ Name = 'Privileged Authentication Administrator'; Id = '7be44c8a-adaf-4e2a-84d6-ab2649e08a13' }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecAddGDAPRole.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecAddGDAPRole.ps1
@@ -22,7 +22,7 @@ Function Invoke-ExecAddGDAPRole {
         @{ label = 'Cloud App Security Administrator'; value = '892c5842-a9a6-463a-8041-72aa08ca3cf6' },
         @{ label = 'Cloud Device Administrator'; value = '7698a772-787b-4ac8-901f-60d6b08affd2' },
         @{ label = 'Teams Administrator'; value = '69091246-20e8-4a56-aa4d-066075b2a7a8' },
-        @{ label = 'Sharepoint Administrator'; value = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
+        @{ label = 'SharePoint Administrator'; value = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
         @{ label = 'Authentication Policy Administrator'; value = '0526716b-113d-4c15-b2c8-68e3c22b9f80' },
         @{ label = 'Privileged Role Administrator'; value = 'e8611ab8-c189-46e8-94e1-60213ab1f814' },
         @{ label = 'Privileged Authentication Administrator'; value = '7be44c8a-adaf-4e2a-84d6-ab2649e08a13' }
diff --git a/Modules/CIPPCore/Public/PermissionsTranslator.json b/Modules/CIPPCore/Public/PermissionsTranslator.json
@@ -5320,7 +5320,7 @@
   },
   {
     "description": "Allows the app to have full control of all site collections on behalf of the signed-in user.",
-    "displayName": "Manage Sharepoint Online",
+    "displayName": "Manage SharePoint Online",
     "id": "56680e0d-d2a3-4ae1-80d8-3c4f2100e3d0",
     "Origin": "Delegated (Office 365 SharePoint Online)",
     "userConsentDescription": "Have full control of all site collections",
diff --git a/Modules/CIPPCore/Public/Set-CIPPSPOTenant.ps1 b/Modules/CIPPCore/Public/Set-CIPPSPOTenant.ps1
@@ -1,10 +1,10 @@
 function Set-CIPPSPOTenant {
     <#
     .SYNOPSIS
-    Set Sharepoint Tenant properties
+    Set SharePoint Tenant properties
 
     .DESCRIPTION
-    Set Sharepoint Tenant properties via SPO API
+    Set SharePoint Tenant properties via SPO API
 
     .PARAMETER TenantFilter
     Tenant to apply settings to
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1
@@ -21,7 +21,7 @@ function Invoke-CIPPStandardIntuneComplianceSettings {
         ADDEDDATE
             2024-11-12
         POWERSHELLEQUIVALENT
-            
+
         RECOMMENDEDBY
         UPDATECOMMENTBLOCK
             Run the Tools\Update-StandardsComments.ps1 script to update this comment block
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardIntuneComplianceSettings {
 
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
-            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'InTune Compliance settings is already applied correctly.' -Sev Info
+            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Intune Compliance settings is already applied correctly.' -Sev Info
         } else {
             try {
                 $GraphRequest = @{
@@ -57,19 +57,19 @@ function Invoke-CIPPStandardIntuneComplianceSettings {
                     } | ConvertTo-Json -Compress
                 }
                 New-GraphPostRequest @GraphRequest
-                Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Successfully updated InTune Compliance settings.' -Sev Info
+                Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Successfully updated Intune Compliance settings.' -Sev Info
             } catch {
                 $ErrorMessage = Get-CippException -Exception $_
-                Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Failed to update InTune Compliance settings.' -Sev Error -LogData $ErrorMessage
+                Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Failed to update Intune Compliance settings.' -Sev Error -LogData $ErrorMessage
             }
         }
     }
 
     if ($Settings.alert -eq $true) {
         if ($StateIsCorrect -eq $true) {
-            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'InTune Compliance settings is enabled.' -Sev Info
+            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Intune Compliance settings is enabled.' -Sev Info
         } else {
-            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'InTune Compliance settings is not enabled.' -Sev Alert
+            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Intune Compliance settings is not enabled.' -Sev Alert
         }
     }
 
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardSPDisallowInfectedFiles {
 
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
-            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are already disallowed.' -Sev Info
+            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are already disallowed.' -Sev Info
         } else {
             $Properties = @{
                 DisallowInfectedFileDownload = $true
@@ -51,16 +51,16 @@ function Invoke-CIPPStandardSPDisallowInfectedFiles {
                 Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Successfully disallowed downloading SharePoint infected files.' -Sev Info
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                Write-LogMessage -API 'Standards' -tenant $tenant -Message "Failed to disallow downloading Sharepoint infected files. Error: $ErrorMessage" -Sev Error
+                Write-LogMessage -API 'Standards' -tenant $tenant -Message "Failed to disallow downloading SharePoint infected files. Error: $ErrorMessage" -Sev Error
             }
         }
     }
 
     if ($Settings.alert -eq $true) {
         if ($StateIsCorrect -eq $true) {
-            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are disallowed.' -Sev Info
+            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are disallowed.' -Sev Info
         } else {
-            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are allowed.' -Sev Alert
+            Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are allowed.' -Sev Alert
         }
     }
 
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1
@@ -42,7 +42,7 @@ function Invoke-CIPPStandardSPEmailAttestation {
 
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
-            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Sharepoint reauthentication with verification code is already restricted.' -Sev Info
+            Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'SharePoint reauthentication with verification code is already restricted.' -Sev Info
         } else {
             $Properties = @{
                 EmailAttestationReAuthDays = $Settings.Days
diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessTenant.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessTenant.ps1
@@ -14,7 +14,7 @@ function Test-CIPPAccessTenant {
         @{ Name = 'Cloud App Security Administrator'; Id = '892c5842-a9a6-463a-8041-72aa08ca3cf6' },
         @{ Name = 'Cloud Device Administrator'; Id = '7698a772-787b-4ac8-901f-60d6b08affd2' },
         @{ Name = 'Teams Administrator'; Id = '69091246-20e8-4a56-aa4d-066075b2a7a8' },
-        @{ Name = 'Sharepoint Administrator'; Id = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
+        @{ Name = 'SharePoint Administrator'; Id = 'f28a1f50-f6e7-4571-818b-6a12f2af6b6c' },
         @{ Name = 'Authentication Policy Administrator'; Id = '0526716b-113d-4c15-b2c8-68e3c22b9f80' },
         @{ Name = 'Privileged Role Administrator'; Id = 'e8611ab8-c189-46e8-94e1-60213ab1f814' },
         @{ Name = 'Privileged Authentication Administrator'; Id = '7be44c8a-adaf-4e2a-84d6-ab2649e08a13' }
diff --git a/Modules/CIPPCore/Public/Test-CIPPGDAPRelationships.ps1 b/Modules/CIPPCore/Public/Test-CIPPGDAPRelationships.ps1
@@ -50,7 +50,7 @@ function Test-CIPPGDAPRelationships {
             'M365 GDAP Cloud App Security Administrator',
             'M365 GDAP Cloud Device Administrator',
             'M365 GDAP Teams Administrator',
-            'M365 GDAP Sharepoint Administrator',
+            'M365 GDAP SharePoint Administrator',
             'M365 GDAP Authentication Policy Administrator',
             'M365 GDAP Privileged Role Administrator',
             'M365 GDAP Privileged Authentication Administrator'
diff --git a/Modules/CippExtensions/Public/Halo/New-HaloPSATicket.ps1 b/Modules/CippExtensions/Public/Halo/New-HaloPSATicket.ps1
@@ -5,7 +5,7 @@ function New-HaloPSATicket {
         $description,
         $client
     )
-    #Get Halo PSA Token based on the config we have.
+    #Get HaloPSA Token based on the config we have.
     $Table = Get-CIPPTable -TableName Extensionsconfig
     $Configuration = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json).HaloPSA
     $TicketTable = Get-CIPPTable -TableName 'PSATickets'
diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1
@@ -1542,7 +1542,7 @@ function Invoke-NinjaOneTenantSync {
                     Icon = 'fas fa-laptop'
                 },
                 @{
-                    Name = 'Sharepoint Admin'
+                    Name = 'SharePoint Admin'
                     Link = "https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=$($Customer.customerId)&CSDEST=SharePoint"
                     Icon = 'fas fa-shapes'
                 },
diff --git a/Modules/MicrosoftTeams/6.4.0/Microsoft.Teams.PowerShell.TeamsCmdlets.xml b/Modules/MicrosoftTeams/6.4.0/Microsoft.Teams.PowerShell.TeamsCmdlets.xml

Original file line number	Diff line number	Diff line change
`@@ -5320,7 +5320,7 @@`
`5320`	`5320`	`},`
`5321`	`5321`	`{`
`5322`	`5322`	`"description": "Allows the app to have full control of all site collections on behalf of the signed-in user.",`
`5323`		`- "displayName": "Manage Sharepoint Online",`
	`5323`	`+ "displayName": "Manage SharePoint Online",`
`5324`	`5324`	`"id": "56680e0d-d2a3-4ae1-80d8-3c4f2100e3d0",`
`5325`	`5325`	`"Origin": "Delegated (Office 365 SharePoint Online)",`
`5326`	`5326`	`"userConsentDescription": "Have full control of all site collections",`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function Invoke-CIPPStandardSPDisallowInfectedFiles {`
`40`	`40`
`41`	`41`	`if ($Settings.remediate -eq $true) {`
`42`	`42`	`if ($StateIsCorrect -eq $true) {`
`43`		`- Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are already disallowed.' -Sev Info`
	`43`	`+ Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are already disallowed.' -Sev Info`
`44`	`44`	`} else {`
`45`	`45`	`$Properties = @{`
`46`	`46`	`DisallowInfectedFileDownload = $true`
`@@ -51,16 +51,16 @@ function Invoke-CIPPStandardSPDisallowInfectedFiles {`
`51`	`51`	`Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Successfully disallowed downloading SharePoint infected files.' -Sev Info`
`52`	`52`	`} catch {`
`53`	`53`	`$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message`
`54`		`- Write-LogMessage -API 'Standards' -tenant $tenant -Message "Failed to disallow downloading Sharepoint infected files. Error: $ErrorMessage" -Sev Error`
	`54`	`+ Write-LogMessage -API 'Standards' -tenant $tenant -Message "Failed to disallow downloading SharePoint infected files. Error: $ErrorMessage" -Sev Error`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ($Settings.alert -eq $true) {`
`60`	`60`	`if ($StateIsCorrect -eq $true) {`
`61`		`- Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are disallowed.' -Sev Info`
	`61`	`+ Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are disallowed.' -Sev Info`
`62`	`62`	`} else {`
`63`		`- Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading Sharepoint infected files are allowed.' -Sev Alert`
	`63`	`+ Write-LogMessage -API 'Standards' -tenant $tenant -Message 'Downloading SharePoint infected files are allowed.' -Sev Alert`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ function New-HaloPSATicket {`
`5`	`5`	`$description,`
`6`	`6`	`$client`
`7`	`7`	`)`
`8`		`- #Get Halo PSA Token based on the config we have.`
	`8`	`+ #Get HaloPSA Token based on the config we have.`
`9`	`9`	`$Table = Get-CIPPTable -TableName Extensionsconfig`
`10`	`10`	`$Configuration = ((Get-CIPPAzDataTableEntity @Table).config \| ConvertFrom-Json).HaloPSA`
`11`	`11`	`$TicketTable = Get-CIPPTable -TableName 'PSATickets'`