' + (([System.Web.HttpUtility]::HtmlDecode($LicenseTableHTML) -replace '
', ' | ') -replace ' | ', ' | ') + ''
$TitleLink = "https://$CIPPUrl/tenant/administration/list-licenses?customerId=$($Customer.customerId)"
$LicensesSummaryCardHTML = Get-NinjaOneCard -Title 'Licenses' -Body $LicenseTableHTML -Icon 'fas fa-chart-bar' -TitleLink $TitleLink
@@ -2249,8 +2279,9 @@ function Invoke-NinjaOneTenantSync {
$Token = Get-NinjaOneToken -configuration $Configuration
-
- $Result = Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/$($MappedTenant.NinjaOne)/custom-fields" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json' -Body ($NinjaOrgUpdate | ConvertTo-Json -Depth 100)
+ Write-Host "Ninja Body: $($NinjaOrgUpdate | ConvertTo-Json -Depth 100)"
+ $Result = Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/$($MappedTenant.NinjaOne)/custom-fields" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaOrgUpdate | ConvertTo-Json -Depth 100)
+
Write-Host "Cleaning Users Cache"
if (($ParsedUsers | Measure-Object).count -gt 0) {
@@ -2264,10 +2295,19 @@ function Invoke-NinjaOneTenantSync {
Write-Host "Total Fetch Time: $((New-TimeSpan -Start $StartTime -End $FetchEnd).TotalSeconds)"
Write-Host "Completed Total Time: $((New-TimeSpan -Start $StartTime -End (Get-Date)).TotalSeconds)"
- Write-LogMessage -API 'NinjaOneSync' -user 'CIPP' -message "Completed NinjaOne Sync for $($Customer.displayName). Data fetched in $((New-TimeSpan -Start $StartTime -End $FetchEnd).TotalSeconds) seconds. Total time $((New-TimeSpan -Start $StartTime -End (Get-Date)).TotalSeconds) seconds" -Sev 'info'
+
+ # Set Last End Time
+ $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"))) -Force
+ $CurrentItem | Add-Member -NotePropertyName lastStatus -NotePropertyValue 'Completed' -Force
+ Add-CIPPAzDataTableEntity @MappingTable -Entity $CurrentItem -Force
+
+ Write-LogMessage -API 'NinjaOneSync' -user 'NinjaOneSync' -message "Completed NinjaOne Sync for $($Customer.displayName). Queued for $((New-TimeSpan -Start $StartQueueTime -End $StartTime).TotalSeconds) seconds. Data fetched in $((New-TimeSpan -Start $StartTime -End $FetchEnd).TotalSeconds) seconds. Total processing time $((New-TimeSpan -Start $StartTime -End (Get-Date)).TotalSeconds) seconds" -Sev 'info'
} catch {
Write-Error "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)"
- Write-LogMessage -API 'NinjaOneSync' -user 'CIPP' -message "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)" -Sev 'Error'
+ Write-LogMessage -API 'NinjaOneSync' -user 'NinjaOneSync' -message "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)" -Sev 'Error'
+ $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"))) -Force
+ $CurrentItem | Add-Member -NotePropertyName lastStatus -NotePropertyValue 'Failed' -Force
+ Add-CIPPAzDataTableEntity @MappingTable -Entity $CurrentItem -Force
}
-}
\ No newline at end of file
+}
diff --git a/Modules/CippExtensions/Public/Get-ExtensionRateLimit.ps1 b/Modules/CippExtensions/Public/Get-ExtensionRateLimit.ps1
new file mode 100644
index 000000000000..069dec362229
--- /dev/null
+++ b/Modules/CippExtensions/Public/Get-ExtensionRateLimit.ps1
@@ -0,0 +1,33 @@
+function Get-ExtensionRateLimit($ExtensionName, $ExtensionPartitionKey, $RateLimit, $WaitTime) {
+
+ $MappingTable = Get-CIPPTable -TableName CippMapping
+ $CurrentMap = (Get-CIPPAzDataTableEntity @MappingTable -Filter "PartitionKey eq '$ExtensionPartitionKey'")
+ $CurrentMap | ForEach-Object {
+ if ($Null -ne $_.lastEndTime -and $_.lastEndTime -ne ''){
+ $_.lastEndTime = (Get-Date($_.lastEndTime))
+ } else {
+ $_ | Add-Member -NotePropertyName lastEndTime -NotePropertyValue $Null -Force
+ }
+
+ if ($Null -ne $_.lastStartTime -and $_.lastStartTime -ne '') {
+ $_.lastStartTime = (Get-Date($_.lastStartTime))
+ } else {
+ $_ | Add-Member -NotePropertyName lastStartTime -NotePropertyValue $Null -Force
+ }
+ }
+
+ # Check Global Rate Limiting
+ try {
+ $ActiveJobs = $CurrentMap | Where-Object { ($Null -ne $_.lastStartTime) -and ($_.lastStartTime -gt (Get-Date).AddMinutes(-10)) -and ($Null -eq $_.lastEndTime -or $_.lastStartTime -gt $_.lastEndTime) }
+ } catch {
+ $ActiveJobs = 'FirstRun'
+ }
+ if (($ActiveJobs | Measure-Object).count -ge $RateLimit) {
+ Write-Host "Rate Limiting. Currently $($ActiveJobs.count) Active Jobs"
+ Start-Sleep -Seconds $WaitTime
+ $CurrentMap = Get-ExtensionRateLimit -ExtensionName $ExtensionName -ExtensionPartitionKey $ExtensionPartitionKey -RateLimit $RateLimit -WaitTime $WaitTime
+ }
+
+ Return $CurrentMap
+
+}
\ No newline at end of file
diff --git a/Scheduler_Extensions/run.ps1 b/Scheduler_Extensions/run.ps1
index b8d80be6a5bf..c6ce09744cbd 100644
--- a/Scheduler_Extensions/run.ps1
+++ b/Scheduler_Extensions/run.ps1
@@ -15,7 +15,6 @@ if ($Configuration.NinjaOne.Enabled -eq $True) {
$Settings = (Get-AzDataTableEntity @Table)
$TimeSetting = ($Settings | Where-Object { $_.RowKey -eq 'NinjaSyncTime' }).SettingValue
-
if (($TimeSetting | Measure-Object).count -ne 1) {
[int]$TimeSetting = Get-Random -Minimum 1 -Maximum 95
@@ -38,17 +37,18 @@ if ($Configuration.NinjaOne.Enabled -eq $True) {
Write-Host "Current Interval: $CurrentInterval"
+ $CIPPMapping = Get-CIPPTable -TableName CippMapping
+ $Filter = "PartitionKey eq 'NinjaOrgsMapping'"
+ $TenantsToProcess = Get-AzDataTableEntity @CIPPMapping -Filter $Filter | Where-Object { $Null -ne $_.NinjaOne -and $_.NinjaOne -ne '' }
+
if ($Null -eq $LastRunTime -or $LastRunTime -le (Get-Date).addhours(-25) -or $TimeSetting -eq $CurrentInterval) {
Write-Host "Executing"
- $CIPPMapping = Get-CIPPTable -TableName CippMapping
- $Filter = "PartitionKey eq 'NinjaOrgsMapping'"
- $TenantsToProcess = Get-AzDataTableEntity @CIPPMapping -Filter $Filter | Where-Object { $Null -ne $_.NinjaOne -and $_.NinjaOne -ne '' }
-
- foreach ($Tenant in $TenantsToProcess) {
+ foreach ($Tenant in $TenantsToProcess | Sort-Object lastEndTime) {
Push-OutputBinding -Name NinjaProcess -Value @{
'NinjaAction' = 'SyncTenant'
'MappedTenant' = $Tenant
}
+ Start-Sleep -Seconds 1
}
@@ -59,7 +59,36 @@ if ($Configuration.NinjaOne.Enabled -eq $True) {
}
Add-AzDataTableEntity @Table -Entity $AddObject -Force
- Write-LogMessage -API 'NinjaOneAutoMap_Queue' -user 'CIPP' -message "NinjaOne Synchronization Queued for $(($TenantsToProcess | Measure-Object).count) Tenants" -Sev 'Info'
+ Write-LogMessage -API 'NinjaOneSync' -user 'CIPP' -message "NinjaOne Daily Synchronization Queued for $(($TenantsToProcess | Measure-Object).count) Tenants" -Sev 'Info'
+
+ } else {
+ if ($LastRunTime -lt (Get-Date).AddMinutes(-90)) {
+ $TenantsToProcess | ForEach-Object {
+ if ($Null -ne $_.lastEndTime -and $_.lastEndTime -ne '') {
+ $_.lastEndTime = (Get-Date($_.lastEndTime))
+ } else {
+ $_ | Add-Member -NotePropertyName lastEndTime -NotePropertyValue $Null -Force
+ }
+
+ if ($Null -ne $_.lastStartTime -and $_.lastStartTime -ne '') {
+ $_.lastStartTime = (Get-Date($_.lastStartTime))
+ } else {
+ $_ | Add-Member -NotePropertyName lastStartTime -NotePropertyValue $Null -Force
+ }
+ }
+ $CatchupTenants = $TenantsToProcess | where-object { (((($_.lastEndTime -eq $Null) -or ($_.lastStartTime -gt $_.lastEndTime)) -and ($_.lastStartTime -lt (Get-Date).AddMinutes(-30)))) -or ($_.lastStartTime -lt $LastRunTime) }
+ foreach ($Tenant in $CatchupTenants) {
+ Push-OutputBinding -Name NinjaProcess -Value @{
+ 'NinjaAction' = 'SyncTenant'
+ 'MappedTenant' = $Tenant
+ }
+ Start-Sleep -Seconds 1
+ }
+ if (($CatchupTenants | Measure-Object).count -gt 0){
+ Write-LogMessage -API 'NinjaOneSync' -user 'CIPP' -message "NinjaOne Synchronization Catchup Queued for $(($CatchupTenants | Measure-Object).count) Tenants" -Sev 'Info'
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/Scheduler_RenewGraphSubscriptions/function.json b/Scheduler_RenewGraphSubscriptions/function.json
index d2e7f34face4..114e4c0f7aab 100644
--- a/Scheduler_RenewGraphSubscriptions/function.json
+++ b/Scheduler_RenewGraphSubscriptions/function.json
@@ -4,7 +4,7 @@
"name": "Timer",
"type": "timerTrigger",
"direction": "in",
- "schedule": "0 0 0 * * *"
+ "schedule": "0 10 * * * *"
}
]
}
diff --git a/Standards_OrchestrationStarterTimer/function.json b/Scheduler_Standards/function.json
similarity index 58%
rename from Standards_OrchestrationStarterTimer/function.json
rename to Scheduler_Standards/function.json
index 0860d6f56788..88d7d049eb48 100644
--- a/Standards_OrchestrationStarterTimer/function.json
+++ b/Scheduler_Standards/function.json
@@ -7,9 +7,10 @@
"type": "timerTrigger"
},
{
- "name": "starter",
- "type": "durableClient",
- "direction": "in"
+ "type": "queue",
+ "direction": "out",
+ "name": "QueueItem",
+ "queueName": "CIPPGenericQueue"
}
]
-}
\ No newline at end of file
+}
diff --git a/Scheduler_Standards/run.ps1 b/Scheduler_Standards/run.ps1
new file mode 100644
index 000000000000..7466a60f5338
--- /dev/null
+++ b/Scheduler_Standards/run.ps1
@@ -0,0 +1,6 @@
+using namespace System.Net
+
+param($Timer)
+Write-LogMessage -API 'Standards' -message 'Starting Standards Schedule' -sev Info
+Invoke-CIPPStandardsRun -tenantfilter 'allTenants'
+Write-LogMessage -API 'Standards' -message 'Launched all standard jobs' -sev Info
\ No newline at end of file
diff --git a/Standards_ActivityBasedTimeout/function.json b/Standards_ActivityBasedTimeout/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_ActivityBasedTimeout/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_ActivityBasedTimeout/run.ps1 b/Standards_ActivityBasedTimeout/run.ps1
deleted file mode 100644
index 158fa444936d..000000000000
--- a/Standards_ActivityBasedTimeout/run.ps1
+++ /dev/null
@@ -1,18 +0,0 @@
-param($tenant)
-try {
- $State = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/policies/activityBasedTimeoutPolicies" -tenantid $tenant).id
- if (!$State) {
- $body = @"
-{
- "displayName": "DefaultTimeoutPolicy",
- "isOrganizationDefault": true,
- "definition":["{\"ActivityBasedTimeoutPolicy\":{\"Version\":1,\"ApplicationPolicies\":[{\"ApplicationId\":\"default\",\"WebSessionIdleTimeout\":\"01:00:00\"}]}}"]
-}
-"@
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/activityBasedTimeoutPolicies" -Type POST -Body $body -ContentType "application/json")
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled Activity Based Timeout of one hour" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable Activity Based Timeout $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_AddDKIM/function.json b/Standards_AddDKIM/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_AddDKIM/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_AddDKIM/run.ps1 b/Standards_AddDKIM/run.ps1
deleted file mode 100644
index ec4ec1a841de..000000000000
--- a/Standards_AddDKIM/run.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param($tenant)
-
-try {
- $DKIM = (New-ExoRequest -tenantid $tenant -cmdlet "Get-DkimSigningConfig") | Where-Object -Property Enabled -EQ $false | ForEach-Object {
- (New-ExoRequest -tenantid $tenant -cmdlet "New-DkimSigningConfig" -cmdparams @{ KeySize = 2048; DomainName = $_.Identity; Enabled = $true } -useSystemMailbox $true)
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled DKIM Setup" -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable DKIM. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_AnonReportDisable/function.json b/Standards_AnonReportDisable/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_AnonReportDisable/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_AnonReportDisable/run.ps1 b/Standards_AnonReportDisable/run.ps1
deleted file mode 100644
index c04f87b957d3..000000000000
--- a/Standards_AnonReportDisable/run.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-param($tenant)
-
-try {
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/reportSettings" -Type patch -Body '{"displayConcealedNames": false}' -ContentType "application/json" -AsApp $true
- Write-LogMessage -API "Standards" -tenant $tenant -message "Anonymous Reports Disabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable anonymous reports. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_AuditLog/function.json b/Standards_AuditLog/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_AuditLog/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_AuditLog/run.ps1 b/Standards_AuditLog/run.ps1
deleted file mode 100644
index b4f77d268247..000000000000
--- a/Standards_AuditLog/run.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-param($tenant)
-
-$DehydratedTenant = (New-ExoRequest -tenantid $Tenant -cmdlet "Get-OrganizationConfig").IsDehydrated
-if ($DehydratedTenant) {
- New-ExoRequest -tenantid $Tenant -cmdlet "Enable-OrganizationCustomization"
-}
-
-try {
-
- $AuditLogEnabled = (New-ExoRequest -tenantid $Tenant -cmdlet "Get-AdminAuditLogConfig").UnifiedAuditLogIngestionEnabled
- if ($AuditLogEnabled) {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Unified Audit Log already enabled." -sev Info
- }
- else {
- $AdminAuditLogParams = @{
- UnifiedAuditLogIngestionEnabled = $true
- }
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-AdminAuditLogConfig" -cmdParams $AdminAuditLogParams
- Write-LogMessage -API "Standards" -tenant $tenant -message "Unified Audit Log Enabled." -sev Info
- }
-
-}
-catch {
-
- $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Unified Audit Log. Error: $ErrorMessage" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_AutoExpandArchive/function.json b/Standards_AutoExpandArchive/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_AutoExpandArchive/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_AutoExpandArchive/run.ps1 b/Standards_AutoExpandArchive/run.ps1
deleted file mode 100644
index 2f7232f981d7..000000000000
--- a/Standards_AutoExpandArchive/run.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-param($tenant)
-
-try {
-
- $CurrentState = (New-ExoRequest -tenantid $Tenant -cmdlet "Get-OrganizationConfig").AutoExpandingArchiveEnabled
- if (!$currentstate) {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-OrganizationConfig" -cmdParams @{AutoExpandingArchive = $true }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Added Auto Expanding Archive." -sev Info
- }
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Auto Expanding Archives Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_AzurePortal/function.json b/Standards_AzurePortal/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_AzurePortal/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_AzurePortal/run.ps1 b/Standards_AzurePortal/run.ps1
deleted file mode 100644
index d047e8c27ae1..000000000000
--- a/Standards_AzurePortal/run.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-param($tenant)
-
-Write-LogMessage -API "Standards" -tenant $tenant -message "Azure Portal disablement is no longer functional. Please remove this standard." -sev Error
diff --git a/Standards_ConditionalAccess/function.json b/Standards_ConditionalAccess/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_ConditionalAccess/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_ConditionalAccess/run.ps1 b/Standards_ConditionalAccess/run.ps1
deleted file mode 100644
index 0730b41371da..000000000000
--- a/Standards_ConditionalAccess/run.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.ConditionalAccess
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.ConditionalAccess
-}
-
-$APINAME = "Standards"
-
-foreach ($Template in $Setting.TemplateList) {
- try {
- $Table = Get-CippTable -tablename 'templates'
- $Filter = "PartitionKey eq 'CATemplate' and RowKey eq '$($Template.value)'"
- $JSONObj = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).JSON
- $CAPolicy = New-CIPPCAPolicy -TenantFilter $tenant -state $request.body.NewState -RawJSON $JSONObj -Overwrite $true -APIName $APIName -ExecutingUser $request.headers.'x-ms-client-principal'
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to create or update conditional access rule $($JSONObj.displayName): $($_.exception.message)" -sev "Error"
- }
-}
-
-
diff --git a/Standards_DelegateSentItems/function.json b/Standards_DelegateSentItems/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DelegateSentItems/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DelegateSentItems/run.ps1 b/Standards_DelegateSentItems/run.ps1
deleted file mode 100644
index 55dcb4b3b023..000000000000
--- a/Standards_DelegateSentItems/run.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-param($tenant)
-
-try {
- $Mailboxes = New-ExoRequest -tenantid $Tenant -cmdlet "Get-Mailbox" -cmdParams @{ RecipientTypeDetails = @("UserMailbox", "SharedMailbox") } | Where-Object { $_.MessageCopyForSendOnBehalfEnabled -eq $false -or $_.MessageCopyForSentAsEnabled -eq $false } | ForEach-Object {
- try {
- $username = $_.UserPrincipalName
- New-ExoRequest -tenantid $Tenant -cmdlet "set-mailbox" -cmdParams @{Identity = $_.GUID ; MessageCopyForSendOnBehalfEnabled = $True; MessageCopyForSentAsEnabled = $True } -anchor $username
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not enable delegate sent item style for $($username): $($_.Exception.message)" -sev Warn
- }
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Delegate Sent Items Style enabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Delegate Sent Items Style. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DeletedUserRentention/function.json b/Standards_DeletedUserRentention/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_DeletedUserRentention/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DeletedUserRentention/run.ps1 b/Standards_DeletedUserRentention/run.ps1
deleted file mode 100644
index e4b6e31f2842..000000000000
--- a/Standards_DeletedUserRentention/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"deletedUserPersonalSiteRetentionPeriodInDays": 365}'
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type PATCH -Body $body -ContentType "application/json"
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set deleted user rentention of OneDrive to 1 year" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set deleted user rentention of OneDrive to 1 year: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableAddShortcutsToOneDrive/function.json b/Standards_DisableAddShortcutsToOneDrive/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_DisableAddShortcutsToOneDrive/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableAddShortcutsToOneDrive/run.ps1 b/Standards_DisableAddShortcutsToOneDrive/run.ps1
deleted file mode 100644
index 65c215683680..000000000000
--- a/Standards_DisableAddShortcutsToOneDrive/run.ps1
+++ /dev/null
@@ -1,89 +0,0 @@
-param($tenant)
-
-function GetTenantRequestXml {
- return @"
-
-
-
-
-
-
-
-
-
-
-
-
-
-"@
-}
-
-function GetDisableAddShortcutsToOneDriveXml {
- param(
- [string]$identity
- )
-
- # the json object gives us a space and a newline :(
- $identity = $identity.Replace(" ", "")
- $identity = $identity.Replace("`n", "
")
- return @"
-
-
-
- true
-
-
-
-
-
-
-"@
-}
-
-$log = @{
- API = "Standards"
- tenant = $tenant
- message = ""
- sev = "Info"
-}
-
-try {
- $OnMicrosoft = (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/domains?$top=999' -tenantid $tenant |
- Where-Object -Property isInitial -EQ $true).id.split('.') | Select-Object -First 1
- $AdminUrl = "https://$($OnMicrosoft)-admin.sharepoint.com"
- $graphRequest = @{
- "scope" = "$AdminURL/.default"
- "tenantid" = $tenant
- "uri" = "$AdminURL/_vti_bin/client.svc/ProcessQuery"
- "type" = "POST"
- "body" = GetTenantRequestXml
- "ContentType" = "text/xml"
- }
-
- $response = New-GraphPostRequest @graphRequest
- if (!$response.ErrorInfo.ErrorMessage) {
- $log.message = "Received Tenant from Sharepoint"
- Write-LogMessage @log
- }
-
- $graphRequest.Body = GetDisableAddShortcutsToOneDriveXml -identity $response._ObjectIdentity_
- $response = New-GraphPostRequest @graphRequest
-
- if (!$response.ErrorInfo.ErrorMessage) {
- $log.message = "Set DisableAddShortcutsToOneDrive to True on $tenant"
- }
- else {
- $log.message = "Unable to set DisableAddShortcutsToOneDrive to True `
- on $($tenant): $($response.ErrorInfo.ErrorMessage)"
- }
-}
-catch {
- $log.message = "Failed to set OneDrive shortcut: $($_.Exception.Message)"
- $log.sev = "Error"
-}
-
-Write-LogMessage @log
\ No newline at end of file
diff --git a/Standards_DisableBasicAuth/function.json b/Standards_DisableBasicAuth/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableBasicAuth/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableBasicAuth/run.ps1 b/Standards_DisableBasicAuth/run.ps1
deleted file mode 100644
index beab79e449d7..000000000000
--- a/Standards_DisableBasicAuth/run.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-param($tenant)
-Write-LogMessage -API "Standards" -tenant $tenant -message "Basic Authentication is disabled by default. SMTP authentication is still allowed. Please use the standard 'Disable SMTP Basic Authentication' to disable" -sev Info
diff --git a/Standards_DisableBasicAuthSMTP/function.json b/Standards_DisableBasicAuthSMTP/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableBasicAuthSMTP/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableBasicAuthSMTP/run.ps1 b/Standards_DisableBasicAuthSMTP/run.ps1
deleted file mode 100644
index 8bef6658e5cd..000000000000
--- a/Standards_DisableBasicAuthSMTP/run.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-param($tenant)
-
-try {
- $Request = New-ExoRequest -tenantid $Tenant -cmdlet "Set-TransportConfig" -cmdParams @{ SmtpClientAuthenticationDisabled = $true }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled SMTP Basic Authentication" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable SMTP Basic Authentication: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableGuestDirectory/function.json b/Standards_DisableGuestDirectory/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableGuestDirectory/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableGuestDirectory/run.ps1 b/Standards_DisableGuestDirectory/run.ps1
deleted file mode 100644
index cc81ded587a3..000000000000
--- a/Standards_DisableGuestDirectory/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-
-try {
- $body = '{guestUserRoleId: "2af84b1e-32c8-42b7-82bc-daa82404023b"}'
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled Guest access to directory information." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable Guest access to directory information.: $($_.exception.message)" -sev "Error"
-}
diff --git a/Standards_DisableGuests/function.json b/Standards_DisableGuests/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_DisableGuests/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableGuests/run.ps1 b/Standards_DisableGuests/run.ps1
deleted file mode 100644
index abf43e7bfb11..000000000000
--- a/Standards_DisableGuests/run.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-param($tenant)
-
-try {
- $lookup = (Get-Date).AddDays(-90).ToUniversalTime().ToString('o')
- $GraphRequest = New-GraphgetRequest -uri "https://graph.microsoft.com/beta/users?`$filter=(signInActivity/lastSignInDateTime le $lookup)&`$select=id,UserPrincipalName,signInActivity,mail,userType,accountEnabled" -scope "https://graph.microsoft.com/.default" -tenantid $Tenant | Where-Object { $_.userType -EQ 'Guest' -and $_.AccountEnabled -EQ $true }
- foreach ($guest in $GraphRequest) {
- New-GraphPostRequest -type Patch -tenantid $tenant -uri "https://graph.microsoft.com/beta/users/$($guest.id)" -body '{"accountEnabled":"false"}'
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabling guest $($guest.UserPrincipalName) ($($guest.id))" -sev Info
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled guests accounts with a login longer than 90 days ago." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable guests older than 90 days: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableM365GroupUsers/function.json b/Standards_DisableM365GroupUsers/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableM365GroupUsers/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableM365GroupUsers/run.ps1 b/Standards_DisableM365GroupUsers/run.ps1
deleted file mode 100644
index 54dc6199d3fa..000000000000
--- a/Standards_DisableM365GroupUsers/run.ps1
+++ /dev/null
@@ -1,18 +0,0 @@
-param($tenant)
-
-try {
- $CurrentState = (New-GraphGetRequest -asApp $true -Uri "https://graph.microsoft.com/beta/settings" -tenantid $tenant) | Where-Object -Property displayname -EQ 'Group.unified'
- if (!$CurrentState) {
- #if no current configuration is found, we set it to the default template supplied by MS.
- $CurrentState = '{"id":"","displayName":"Group.Unified","templateId":"62375ab9-6b52-47ed-826b-58e47e0e304b","values":[{"name":"NewUnifiedGroupWritebackDefault","value":"true"},{"name":"EnableMIPLabels","value":"false"},{"name":"CustomBlockedWordsList","value":""},{"name":"EnableMSStandardBlockedWords","value":"false"},{"name":"ClassificationDescriptions","value":""},{"name":"DefaultClassification","value":""},{"name":"PrefixSuffixNamingRequirement","value":""},{"name":"AllowGuestsToBeGroupOwner","value":"false"},{"name":"AllowGuestsToAccessGroups","value":"true"},{"name":"GuestUsageGuidelinesUrl","value":""},{"name":"GroupCreationAllowedGroupId","value":""},{"name":"AllowToAddGuests","value":"true"},{"name":"UsageGuidelinesUrl","value":""},{"name":"ClassificationList","value":""},{"name":"EnableGroupCreation","value":"true"}]}'
- (New-GraphPostRequest -AsApp $true -tenantid $tenant -Uri "https://graph.microsoft.com/beta/settings/$($CurrentState.id)" -Type POST -Body $CurrentState -ContentType "application/json")
- $CurrentState = (New-GraphGetRequest -asApp $true -Uri "https://graph.microsoft.com/beta/settings" -tenantid $tenant) | Where-Object -Property displayname -EQ 'Group.unified'
- }
- ($CurrentState.values | Where-Object { $_.name -eq 'EnableGroupCreation' }).value = "false"
- $body = "{values : $($CurrentState.values | ConvertTo-Json -Compress)}"
- (New-GraphPostRequest -AsApp $true -tenantid $tenant -Uri "https://graph.microsoft.com/beta/settings/$($CurrentState.id)" -Type patch -Body $body -ContentType "application/json")
- Write-LogMessage -API "Standards" -tenant $tenant -message "Standards API: Disabled users from creating M365 Groups." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable users from creating M365 Groups: $($_.exception.message)" -sev "Error"
-}
diff --git a/Standards_DisableReshare/function.json b/Standards_DisableReshare/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_DisableReshare/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableReshare/run.ps1 b/Standards_DisableReshare/run.ps1
deleted file mode 100644
index c1757dee151f..000000000000
--- a/Standards_DisableReshare/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"isResharingByExternalUsersEnabled": "False"}'
- $Request = New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body $body -ContentType "application/json"
- Write-Host ($Request | ConvertTo-Json)
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled guests from resharing files" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable guests from resharing files: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableSecurityGroupUsers/function.json b/Standards_DisableSecurityGroupUsers/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableSecurityGroupUsers/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableSecurityGroupUsers/run.ps1 b/Standards_DisableSecurityGroupUsers/run.ps1
deleted file mode 100644
index 459c82c2d72a..000000000000
--- a/Standards_DisableSecurityGroupUsers/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"defaultUserRolePermissions":{"allowedToCreateSecurityGroups":false}}'
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Standards API: Disabled users from creating Security Groups." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable users from creating Security Groups: $($_.exception.message)" -sev "Error"
-}
diff --git a/Standards_DisableSelfServiceLicenses/function.json b/Standards_DisableSelfServiceLicenses/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableSelfServiceLicenses/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableSelfServiceLicenses/run.ps1 b/Standards_DisableSelfServiceLicenses/run.ps1
deleted file mode 100644
index 3a6960cdd678..000000000000
--- a/Standards_DisableSelfServiceLicenses/run.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-param($tenant)
-
-try {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable License Buy Self Service: $($_.exception.message)" -sev Error
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable License Buy Self Service: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableSharedMailbox/function.json b/Standards_DisableSharedMailbox/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableSharedMailbox/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableSharedMailbox/run.ps1 b/Standards_DisableSharedMailbox/run.ps1
deleted file mode 100644
index 9b4d6083270a..000000000000
--- a/Standards_DisableSharedMailbox/run.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param($tenant)
-
-try {
- $SharedMailboxList = (New-GraphGetRequest -uri "https://outlook.office365.com/adminapi/beta/$($tenant)/Mailbox" -Tenantid $tenant -scope ExchangeOnline | Where-Object { $_.RecipientTypeDetails -EQ "SharedMailbox" -or $_.RecipientTypeDetails -eq 'SchedulingMailbox' }) | ForEach-Object {
- New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/users/$($_.ObjectKey)" -type "PATCH" -body '{"accountEnabled":"false"}' -tenantid $tenant
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "AAD Accounts for shared mailboxes disabled." -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable AAD accounts for shared mailboxes. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableTenantCreation/function.json b/Standards_DisableTenantCreation/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableTenantCreation/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableTenantCreation/run.ps1 b/Standards_DisableTenantCreation/run.ps1
deleted file mode 100644
index 39e4057fea98..000000000000
--- a/Standards_DisableTenantCreation/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"defaultUserRolePermissions":{"allowedToCreateTenants":false}}'
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type patch -Body $body -ContentType "application/json")
- Write-LogMessage -API "Standards" -tenant $tenant -message "Standards API: Disabled users from creating tenants." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable users from creating tenants: $($_.exception.message)" -sev "Error"
-}
diff --git a/Standards_DisableUserSiteCreate/function.json b/Standards_DisableUserSiteCreate/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_DisableUserSiteCreate/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableUserSiteCreate/run.ps1 b/Standards_DisableUserSiteCreate/run.ps1
deleted file mode 100644
index 3cb87b68e47d..000000000000
--- a/Standards_DisableUserSiteCreate/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"isSiteCreationEnabled": false}'
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled standard users from creating sites" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable standard users from creating sites: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_DisableViva/function.json b/Standards_DisableViva/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_DisableViva/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_DisableViva/run.ps1 b/Standards_DisableViva/run.ps1
deleted file mode 100644
index 89b50ec0dd62..000000000000
--- a/Standards_DisableViva/run.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param($tenant)
-
-try {
- $MailboxesNoArchive = (New-ExoRequest -tenantid $tenant -cmdlet "get-mailbox" -cmdparams @{ Filter = 'RecipientTypeDetails -Eq "UserMailbox"' }) | ForEach-Object {
- (New-ExoRequest -tenantid $tenant -cmdlet "Set-UserBriefingConfig" -cmdparams @{ Identity = $_.UserPrincipalName; Enabled = $false })
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disable daily Viva reports" -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable Viva for all users Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_EnableAppConsentRequests/function.json b/Standards_EnableAppConsentRequests/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_EnableAppConsentRequests/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_EnableAppConsentRequests/run.ps1 b/Standards_EnableAppConsentRequests/run.ps1
deleted file mode 100644
index 03d3e12bc621..000000000000
--- a/Standards_EnableAppConsentRequests/run.ps1
+++ /dev/null
@@ -1,66 +0,0 @@
-param($tenant)
-
-try {
-
- $ConfigTable = Get-CippTable -tablename 'standards'
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.EnableAppConsentRequests
- if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.EnableAppConsentRequests
- }
-
- # Get current state
- $CurrentInfo = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/adminConsentRequestPolicy' -tenantid $Tenant
-
- # Change state to enabled with default settings
- $CurrentInfo.isEnabled = 'true'
- $CurrentInfo.notifyReviewers = 'true'
- $CurrentInfo.remindersEnabled = 'true'
- $CurrentInfo.requestDurationInDays = 30
-
- # Roles from standards table
- $RolesToAdd = $Setting.ReviewerRoles.value
- $RoleNames = $Setting.ReviewerRoles.label -join ', '
-
- # Set default if no roles are selected
- if (!$RolesToAdd) {
- $RolesToAdd = @('62e90394-69f5-4237-9190-012177145e10')
- $RoleNames = '(Default) Global Administrator'
- }
-
- $NewReviewers = foreach ($Role in $RolesToAdd) {
- @{
- query = "/beta/roleManagement/directory/roleAssignments?`$filter=roleDefinitionId eq '$Role'"
- queryType = 'MicrosoftGraph'
- queryRoot = 'null'
- }
- }
-
- # Add existing reviewers
- $Reviewers = [System.Collections.Generic.List[object]]::new()
- foreach ($Reviewer in $CurrentInfo.reviewers) {
- $RoleFound = $false
- foreach ($Role in $RolesToAdd) {
- if ($Reviewer.query -match $Role -or $Reviewers.query -contains $Reviewer.query) {
- $RoleFound = $true
- }
- }
- if (!$RoleFound) {
- $Reviewers.add($Reviewer)
- }
- }
-
- # Add new reviewer roles
- foreach ($NewReviewer in $NewReviewers) {
- $Reviewers.add($NewReviewer)
- }
-
- # Update reviewer list
- $CurrentInfo.reviewers = @($Reviewers)
- $body = (ConvertTo-Json -Compress -Depth 10 -InputObject $CurrentInfo)
-
- New-GraphPostRequest -tenantid $tenant -Uri 'https://graph.microsoft.com/beta/policies/adminConsentRequestPolicy' -Type put -Body $body -ContentType 'application/json'
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Enabled App consent admin requests for the following roles: $RoleNames" -sev Info
-
-} catch {
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to enable App consent admin requests. Error: $($_.exception.message)" -sev Error
-}
diff --git a/Standards_EnableFIDO2/function.json b/Standards_EnableFIDO2/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_EnableFIDO2/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_EnableFIDO2/run.ps1 b/Standards_EnableFIDO2/run.ps1
deleted file mode 100644
index 5618871add43..000000000000
--- a/Standards_EnableFIDO2/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"@odata.type":"#microsoft.graph.fido2AuthenticationMethodConfiguration","id":"Fido2","includeTargets":[{"id":"all_users","isRegistrationRequired":false,"targetType":"group","displayName":"All users"}],"excludeTargets":[],"isAttestationEnforced":true,"isSelfServiceRegistrationAllowed":true,"keyRestrictions":{"aaGuids":[],"enforcementType":"block","isEnforced":false},"state":"enabled"}'
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationmethodspolicy/authenticationMethodConfigurations/Fido2" -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled FIDO2 Support" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable FIDO2 Support: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_EnableOnlineArchiving/function.json b/Standards_EnableOnlineArchiving/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_EnableOnlineArchiving/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_EnableOnlineArchiving/run.ps1 b/Standards_EnableOnlineArchiving/run.ps1
deleted file mode 100644
index b8634b7ca07f..000000000000
--- a/Standards_EnableOnlineArchiving/run.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param($tenant)
-
-try {
- $MailboxesNoArchive = (New-ExoRequest -tenantid $tenant -cmdlet "get-mailbox" -cmdparams @{ Filter = 'ArchiveGuid -Eq "00000000-0000-0000-0000-000000000000" -AND RecipientTypeDetails -Eq "UserMailbox"' }) | ForEach-Object {
- (New-ExoRequest -tenantid $tenant -cmdlet "enable-Mailbox" -cmdparams @{ Identity = $_.UserPrincipalName; Archive = $true })
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled Online Archiving for all accounts" -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to Enable Online Archiving for all accounts Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_ExConnector/function.json b/Standards_ExConnector/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_ExConnector/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_ExConnector/run.ps1 b/Standards_ExConnector/run.ps1
deleted file mode 100644
index 9250918a0279..000000000000
--- a/Standards_ExConnector/run.ps1
+++ /dev/null
@@ -1,31 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.ExConnector
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.ExConnector
-}
-$APINAME = "Standards"
-foreach ($Template in $Setting.TemplateList) {
- try {
- $Table = Get-CippTable -tablename 'templates'
- $Filter = "PartitionKey eq 'ExConnectorTemplate' and RowKey eq '$($Template.value)'"
- $connectorType = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).direction
- $RequestParams = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
- $Existing = New-ExoRequest -ErrorAction SilentlyContinue -tenantid $Tenant -cmdlet "Get-$($ConnectorType)connector" | Where-Object -Property Identity -EQ $RequestParams.name
- if ($Existing) {
- $RequestParams | Add-Member -NotePropertyValue $Existing.Identity -NotePropertyName Identity -Force
- $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet "Set-$($ConnectorType)connector" -cmdParams $RequestParams -useSystemMailbox $true
- Write-LogMessage -API $APINAME -tenant $Tenant -message "Updated transport rule for $($Tenant)" -sev info
- }
- else {
- $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet "New-$($ConnectorType)connector" -cmdParams $RequestParams -useSystemMailbox $true
- Write-LogMessage -API $APINAME -tenant $Tenant -message "Created transport rule for $($Tenant)" -sev info
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to create or update Exchange Connector Rule: $($_.exception.message)" -sev "Error"
- }
-
-}
-
diff --git a/Standards_ExcludedfileExt/function.json b/Standards_ExcludedfileExt/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_ExcludedfileExt/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_ExcludedfileExt/run.ps1 b/Standards_ExcludedfileExt/run.ps1
deleted file mode 100644
index e8620848f04d..000000000000
--- a/Standards_ExcludedfileExt/run.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-param($tenant)
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.ExcludedfileExt
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.ExcludedfileExt
-}
-
-try {
- $Exts = $Setting.ext -split ','
- $body = ConvertTo-Json -InputObject @{ excludedFileExtensionsForSyncApp = @($Exts) }
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Added $($Setting.ext) to excluded synced files" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to add $($Setting.ext) to excluded synced files: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_GetQueue/function.json b/Standards_GetQueue/function.json
deleted file mode 100644
index b31f1ad21352..000000000000
--- a/Standards_GetQueue/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "name",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_GetQueue/run.ps1 b/Standards_GetQueue/run.ps1
deleted file mode 100644
index 24a4f64dc523..000000000000
--- a/Standards_GetQueue/run.ps1
+++ /dev/null
@@ -1,37 +0,0 @@
-param($name)
-
-Write-Host 'QUEUEQUE'
-$Table = Get-CippTable -tablename 'standards'
-$SkipList = Get-Tenants -SkipList
-$Tenants = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
-
-$object = foreach ($Tenant in $Tenants) {
- $Tenant.standards.psobject.properties.name | ForEach-Object {
- $Standard = $_
- Write-Host "Standard is $Standard"
- if ($Tenant.Tenant -ne 'AllTenants' -and $SkipList.defaultDomainName -notcontains $Tenant.Tenant) {
- Write-Host 'Not all tenants. Single object'
- if ($Standard -ne "OverrideAllTenants") {
- [pscustomobject]@{
- Tenant = $tenant.Tenant
- Standard = $Standard
- }
- }
- }
- elseif ($Tenant.Tenant -eq 'AllTenants') {
- Get-Tenants | ForEach-Object {
- $TenantForStandard = $_
- $TenantStandard = $Tenants | Where-Object { $_.Tenant -eq $TenantForStandard.defaultDomainName }
- Write-Host "Working on all Tenants. Current Tenant is $($Tenant.defaultDomainName) and standard is $Standard"
- if ($TenantStandard.standards.OverrideAllTenants -ne $true) {
- [pscustomobject]@{
- Tenant = $_.defaultDomainName
- Standard = $Standard
- }
- }
- }
- }
- }
-}
-
-$object
\ No newline at end of file
diff --git a/Standards_GroupTemplate/function.json b/Standards_GroupTemplate/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_GroupTemplate/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_GroupTemplate/run.ps1 b/Standards_GroupTemplate/run.ps1
deleted file mode 100644
index 4034f513e5ac..000000000000
--- a/Standards_GroupTemplate/run.ps1
+++ /dev/null
@@ -1,61 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.GroupTemplate
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.GroupTemplate
-}
-
-
-
-foreach ($Template in $Setting.TemplateList) {
- try {
- $Table = Get-CippTable -tablename 'templates'
- $Filter = "PartitionKey eq 'GroupTemplate' and RowKey eq '$($Template.value)'"
- $groupobj = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
- $email = if ($groupobj.domain) { "$($groupobj.username)@$($groupobj.domain)" } else { "$($groupobj.username)@$($tenant)" }
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/groups" -tenantid $tenant | Where-Object -Property displayName -EQ $groupobj.displayname
- if (!$CheckExististing) {
- if ($groupobj.groupType -in "Generic", "azurerole", "dynamic") {
-
- $BodyToship = [pscustomobject] @{
- "displayName" = $groupobj.Displayname
- "description" = $groupobj.Description
- "mailNickname" = $groupobj.username
- mailEnabled = [bool]$false
- securityEnabled = [bool]$true
- isAssignableToRole = [bool]($groupobj | Where-Object -Property groupType -EQ "AzureRole")
-
- }
- if ($groupobj.membershipRules) {
- $BodyToship | Add-Member -NotePropertyName "membershipRule" -NotePropertyValue ($groupobj.membershipRules)
- $BodyToship | Add-Member -NotePropertyName "groupTypes" -NotePropertyValue @("DynamicMembership")
- $BodyToship | Add-Member -NotePropertyName "membershipRuleProcessingState" -NotePropertyValue "On"
- }
- $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/groups" -tenantid $tenant -type POST -body (ConvertTo-Json -InputObject $BodyToship -Depth 10) -verbose
- }
- else {
- $Params = @{
- Name = $groupobj.Displayname
- Alias = $groupobj.username
- Description = $groupobj.Description
- PrimarySmtpAddress = $email
- Type = $groupobj.groupType
- RequireSenderAuthenticationEnabled = [bool]!$groupobj.AllowExternal
- }
- $GraphRequest = New-ExoRequest -tenantid $tenant -cmdlet "New-DistributionGroup" -cmdParams $params
- }
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API "Standards" -tenant $tenant -message "Created group $($groupobj.displayname) with id $($GraphRequest.id) " -Sev "Info"
-
- }
- else {
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API "Standards" -tenant $tenant -message "Group exists $($groupobj.displayname). Did not create" -Sev "Info"
-
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to create group: $($_.exception.message)" -sev "Error"
- }
-}
-
-
diff --git a/Standards_IntuneTemplate/function.json b/Standards_IntuneTemplate/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_IntuneTemplate/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_IntuneTemplate/run.ps1 b/Standards_IntuneTemplate/run.ps1
deleted file mode 100644
index d33febabede5..000000000000
--- a/Standards_IntuneTemplate/run.ps1
+++ /dev/null
@@ -1,88 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.IntuneTemplate
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.IntuneTemplate
-}
-
-$APINAME = "Standards"
-foreach ($Template in $Setting.TemplateList) {
- try {
- $Table = Get-CippTable -tablename 'templates'
- $Filter = "PartitionKey eq 'IntuneTemplate'"
- $Request = @{body = $null }
- $Request.body = (Get-CIPPAzDataTableEntity @Table -Filter $Filter | Where-Object -Property RowKey -Like "$($template.value)*").JSON | ConvertFrom-Json
- $displayname = $request.body.Displayname
- $description = $request.body.Description
- $AssignTo = if ($request.body.Assignto -ne "on") { $request.body.Assignto }
- $RawJSON = $Request.body.RawJSON
-
- switch ($Request.body.Type) {
- "Admin" {
- $TemplateTypeURL = "groupPolicyConfigurations"
- $CreateBody = '{"description":"' + $description + '","displayName":"' + $displayname + '","roleScopeTagIds":["0"]}'
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant
- if ($displayname -in $CheckExististing.displayName) {
- $ExistingID = $CheckExististing | Where-Object -Property displayName -EQ $displayname
- $ExistingData = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($existingId.id)')/definitionValues" -tenantid $tenant
- $DeleteJson = $RawJSON | ConvertFrom-Json -Depth 10
- $DeleteJson.deletedIds = @($ExistingData.id)
- $DeleteJson.added = @()
- $DeleteJson = ConvertTo-Json -Depth 10 -InputObject $DeleteJson
- $DeleteRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($existingId.id)')/updateDefinitionValues" -tenantid $tenant -type POST -body $DeleteJson
- $UpdateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($existingId.id)')/updateDefinitionValues" -tenantid $tenant -type POST -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Updated policy $($Displayname) to template defaults" -Sev "info"
-
- }
- else {
- $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant -type POST -body $CreateBody
- $UpdateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($CreateRequest.id)')/updateDefinitionValues" -tenantid $tenant -type POST -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added policy $($Displayname) to template defaults" -Sev "info"
-
- }
- }
- "Device" {
- $TemplateTypeURL = "deviceConfigurations"
- $PolicyName = ($RawJSON | ConvertFrom-Json).displayName
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant
- if ($PolicyName -in $CheckExististing.displayName) {
- $ExistingID = $CheckExististing | Where-Object -Property displayName -EQ $PolicyName
- $PatchRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL/$($ExistingID.Id)" -tenantid $tenant -type PATCH -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Updated policy $($PolicyName) to template defaults" -Sev "info"
-
- }
- else {
- $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant -type POST -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added policy $($PolicyName) via template" -Sev "info"
-
- }
- }
- "Catalog" {
- $TemplateTypeURL = "configurationPolicies"
- $PolicyName = ($RawJSON | ConvertFrom-Json).Name
- $CheckExististing = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant
- if ($PolicyName -in $CheckExististing.name) {
- $ExistingID = $CheckExististing | Where-Object -Property Name -EQ $PolicyName
- $PUTRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL/$($ExistingID.Id)" -tenantid $tenant -type PUT -body $RawJSON
-
- }
- else {
- $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL" -tenantid $tenant -type POST -body $RawJSON
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added policy $($PolicyName) via template" -Sev "info"
-
- }
- }
-
- }
- if ($AssignTo) {
- $AssignBody = if ($AssignTo -ne "AllDevicesAndUsers") { '{"assignments":[{"id":"","target":{"@odata.type":"#microsoft.graph.' + $($AssignTo) + 'AssignmentTarget"}}]}' } else { '{"assignments":[{"id":"","target":{"@odata.type":"#microsoft.graph.allDevicesAssignmentTarget"}},{"id":"","target":{"@odata.type":"#microsoft.graph.allLicensedUsersAssignmentTarget"}}]}' }
- $assign = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($CreateRequest.id)')/assign" -tenantid $tenant -type POST -body $AssignBody
- Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Assigned policy $($Displayname) to $AssignTo" -Sev "Info"
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Successfully added Intune Template policy for $($Tenant)" -sev "Info"
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to create or update Intune Template: $($_.exception.message)" -sev "Error"
- }
-}
diff --git a/Standards_LegacyMFA/function.json b/Standards_LegacyMFA/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_LegacyMFA/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_LegacyMFA/run.ps1 b/Standards_LegacyMFA/run.ps1
deleted file mode 100644
index c0bdd2f8501c..000000000000
--- a/Standards_LegacyMFA/run.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-param($tenant)
-
-try {
- $AADGraphtoken = (Get-GraphToken -scope 'https://graph.windows.net/.default')
- $tenantid = (Get-Tenants | Where-Object -Property defaultDomainName -EQ $Tenant).customerId
- $TrackingGuid = (New-Guid).GUID
- $LogonPost = @"
-http://provisioning.microsoftonline.com/IProvisioningWebService/MsolConnecturn:uuid:$TrackingGuidhttp://www.w3.org/2005/08/addressing/anonymous$($AADGraphtoken['Authorization'])50afce61-c917-435b-8c6d-60aa5a8b8aa71.2.183.57Version47$($TrackingGuid)https://provisioningapi.microsoftonline.com/provisioningwebservice.svcVersion4
-"@
- $DataBlob = (Invoke-RestMethod -Method POST -Uri 'https://provisioningapi.microsoftonline.com/provisioningwebservice.svc' -ContentType 'application/soap+xml; charset=utf-8' -Body $LogonPost).envelope.header.BecContext.DataBlob.'#text'
- $Users = Get-CIPPMSolUsers -tenant $tenant | Where-Object { ($_.StrongAuthenticationRequirements.StrongAuthenticationRequirement.state -eq $null -and $_.UserPrincipalName -notlike 'Sync_*') }
- foreach ($user in $users) {
- Write-Host $user.UserPrincipalName
- $MSOLXML = @"
-http://provisioning.microsoftonline.com/IProvisioningWebService/SetUserurn:uuid:$TrackingGuidhttp://www.w3.org/2005/08/addressing/anonymous$($AADGraphtoken['Authorization'])$($DataBlob)9450afce61-c917-435b-8c6d-60aa5a8b8aa71.2.183.57Version47$TrackingGuidhttps://provisioningapi.microsoftonline.com/provisioningwebservice.svcVersion16$($tenantid)$($User.ObjectID)*0001-01-01T00:00:00Enabled
-"@
- $SetMFA = (Invoke-RestMethod -Uri 'https://provisioningapi.microsoftonline.com/provisioningwebservice.svc' -Method post -Body $MSOLXML -ContentType 'application/soap+xml; charset=utf-8')
- }
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'Enabled per user MFA.' -sev Info
-
-}
-catch {
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to enable (legacy) per user MFA: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_LegacyMFACleanup/function.json b/Standards_LegacyMFACleanup/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_LegacyMFACleanup/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_LegacyMFACleanup/run.ps1 b/Standards_LegacyMFACleanup/run.ps1
deleted file mode 100644
index ba87338262d1..000000000000
--- a/Standards_LegacyMFACleanup/run.ps1
+++ /dev/null
@@ -1,63 +0,0 @@
-param($tenant)
-
-try {
- $AADGraphtoken = (Get-GraphToken -scope 'https://graph.windows.net/.default')
- $tenantid = (Get-Tenants | Where-Object -Property defaultDomainName -EQ $tenant).customerId
-
- try {
- $SecureDefaultsState = (New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/policies/identitySecurityDefaultsEnforcementPolicy' -tenantid $tenant)
- $SecDefaults = $SecureDefaultsState.IsEnabled
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Security default state: $SecDefaults" -sev Debug
- }
- catch {
- $SecDefaults = $false
- }
-
- if ($SecDefaults -eq $false) {
- try {
- $AllUsersCAPolicy = (New-GraphGetRequest -Uri "https://graph.microsoft.com/v1.0/identity/conditionalAccess/policies?`$filter=(grantControls/builtInControls/any(b:b eq 'mfa') or grantControls/customAuthenticationFactors/any(c:c eq 'RequireDuoMfa')) and state eq 'enabled' and conditions/users/includeUsers/any(u:u eq 'All')&`$count=true" -ComplexFilter -tenantid $tenant).displayName
- Write-LogMessage -API 'Standards' -tenant $tenant -message "All users CA policy: $AllUsersCAPolicy" -sev Debug
-
- if ($AllUsersCAPolicy) {
- $AADPremiumUsers = (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/?`$select=id,userPrincipalName&`$filter=assignedPlans/any(c:c/service eq 'AADPremiumService' and c/capabilityStatus eq 'Enabled')&`$count=true" -tenantid $tenant -ComplexFilter).userPrincipalName
- Write-LogMessage -API 'Standards' -tenant $tenant -message "AAD Premium Users: $($AADPremiumUsers -join ', ')" -sev Debug
- }
- }
- catch {
- $AllUsersCAPolicy = $false
- }
- }
-
- if ($SecDefaults -or $AllUsersCAPolicy) {
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'Tenant meets requirements for Legacy MFA cleanup' -sev Info
- $TrackingGuid = (New-Guid).GUID
- $LogonPost = @"
-http://provisioning.microsoftonline.com/IProvisioningWebService/MsolConnecturn:uuid:$TrackingGuidhttp://www.w3.org/2005/08/addressing/anonymous$($AADGraphtoken['Authorization'])50afce61-c917-435b-8c6d-60aa5a8b8aa71.2.183.57Version47$($TrackingGuid)https://provisioningapi.microsoftonline.com/provisioningwebservice.svcVersion4
-"@
- $DataBlob = (Invoke-RestMethod -Method POST -Uri 'https://provisioningapi.microsoftonline.com/provisioningwebservice.svc' -ContentType 'application/soap+xml; charset=utf-8' -Body $LogonPost).envelope.header.BecContext.DataBlob.'#text'
- $Users = Get-CIPPMSolUsers -tenant $tenant | Where-Object { $_.StrongAuthenticationRequirements.StrongAuthenticationRequirement.State -eq 'Enabled' -or $_.StrongAuthenticationRequirements.StrongAuthenticationRequirement.State -EQ 'Enforced' }
- if (($Users | Measure-Object | Select-Object -ExpandProperty Count) -gt 0) {
- foreach ($user in $users) {
- if ($AllUsersCAPolicy -and $AADPremiumUsers -notcontains $user.UserPrincipalName) {
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Skipping user $($user.UserPrincipalName) does not have AAD Premium" -sev Debug
- continue
- }
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Disabling legacy MFA for $($user.UserPrincipalName)" -sev Info
- $MSOLXML = @"
-http://provisioning.microsoftonline.com/IProvisioningWebService/SetUserurn:uuid:$TrackingGuidhttp://www.w3.org/2005/08/addressing/anonymous$($AADGraphtoken['Authorization'])$($DataBlob)9450afce61-c917-435b-8c6d-60aa5a8b8aa71.2.183.57Version47$TrackingGuidhttps://provisioningapi.microsoftonline.com/provisioningwebservice.svcVersion16$($tenantid)$($User.ObjectID)
-"@
- $SetMFA = (Invoke-RestMethod -Uri 'https://provisioningapi.microsoftonline.com/provisioningwebservice.svc' -Method post -Body $MSOLXML -ContentType 'application/soap+xml; charset=utf-8')
- }
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'Legacy MFA cleanup complete.' -sev Info
- }
- else {
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'No Legacy MFA to cleanup.' -sev Info
- }
- }
- else {
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'Unable to clean up per user MFA, tenant does not have Security Defaults or an all users CA policy requiring MFA' -sev Error
- }
-}
-catch {
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to clean up (legacy) per user MFA: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_MailContacts/function.json b/Standards_MailContacts/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_MailContacts/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_MailContacts/run.ps1 b/Standards_MailContacts/run.ps1
deleted file mode 100644
index 83cbd4bea699..000000000000
--- a/Standards_MailContacts/run.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-param($tenant)
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Contacts = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.MailContacts
-if (!$Contacts) {
- $Contacts = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.MailContacts
-}
-
-try {
- $TenantID = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/organization" -tenantid $tenant)
- $Body = [pscustomobject]@{}
- switch ($Contacts) {
- { $Contacts.marketingcontact.mail } { $body | Add-Member -NotePropertyName marketingNotificationEmails -NotePropertyValue @($Contacts.marketingcontact.mail) }
- { $Contacts.SecurityContact.Mail } { $body | Add-Member -NotePropertyName securityComplianceNotificationMails -NotePropertyValue @($Contacts.SecurityContact.Mail) }
- { $Contacts.TechContact.Mail } { $body | Add-Member -NotePropertyName technicalNotificationMails -NotePropertyValue @($Contacts.TechContact.Mail) }
- { $Contacts.GeneralContact.Mail } { $body | Add-Member -NotePropertyName privacyProfile -NotePropertyValue @{contactEmail = $Contacts.GeneralContact.Mail } }
- }
- Write-Host (ConvertTo-Json -InputObject $body)
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/organization/$($TenantID.id)" -Type patch -Body (ConvertTo-Json -InputObject $body) -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Contact email's set." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set contact emails: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_ModernAuth/function.json b/Standards_ModernAuth/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_ModernAuth/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_ModernAuth/run.ps1 b/Standards_ModernAuth/run.ps1
deleted file mode 100644
index 396045f532bc..000000000000
--- a/Standards_ModernAuth/run.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-param($tenant)
-
-Write-LogMessage -API "Standards" -tenant $tenant -message "Modern Authentication is enabled by default. This standard is no longer required." -sev Info
diff --git a/Standards_NudgeMFA/function.json b/Standards_NudgeMFA/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_NudgeMFA/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_NudgeMFA/run.ps1 b/Standards_NudgeMFA/run.ps1
deleted file mode 100644
index 0ec7b80ef78d..000000000000
--- a/Standards_NudgeMFA/run.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.NudgeMFA
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.NudgeMFA
-}
-Write-Output $setting
-$status = if ($Setting.enable -and $Setting.disable) {
- Write-LogMessage -API "Standards" -tenant $tenant -message "You cannot both enable and disable the Nudge MFA setting" -sev Error
- Exit
-}
-elseif ($setting.enable) { "enabled" } else { "disabled" }
-Write-Output $status
-try {
- $Body = (New-GraphGetRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy")
- $body.registrationEnforcement.authenticationMethodsRegistrationCampaign.state = $status
- $body = ConvertTo-Json -Depth 10 -InputObject ($body | Select-Object registrationEnforcement)
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy" -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Authenticator App Nudge/Registration campaign $status." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to $status Authenticator App Nudge/Registration campaign: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_OauthConsent/function.json b/Standards_OauthConsent/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_OauthConsent/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_OauthConsent/run.ps1 b/Standards_OauthConsent/run.ps1
deleted file mode 100644
index 03479b028411..000000000000
--- a/Standards_OauthConsent/run.ps1
+++ /dev/null
@@ -1,36 +0,0 @@
-param($tenant)
-$ConfigTable = Get-CippTable -tablename 'standards'
-$AllowedAppIdsForTenant = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).Standards.OauthConsent.AllowedApps -split ','
-if (!$AllowedAppIdsForTenant) {
- $AllowedAppIdsForTenant = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).Standards.OauthConsent.AllowedApps -split ','
-}
-try {
- $State = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -tenantid $tenant)
- if ($State.permissionGrantPolicyIdsAssignedToDefaultUserRole -notin @("ManagePermissionGrantsForSelf.cipp-1sent-policy")) {
- Write-Host "Going to set"
-
- $Existing = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/policies/permissionGrantPolicies/" -tenantid $tenant) | Where-Object -Property id -EQ "cipp-consent-policy"
- if (!$Existing) {
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/permissionGrantPolicies" -Type POST -Body '{ "id":"cipp-consent-policy", "displayName":"Application Consent Policy", "description":"This policy controls the current application consent policies."}' -ContentType "application/json"
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/permissionGrantPolicies/cipp-consent-policy/includes" -Type POST -Body '{"permissionClassification":"all","permissionType":"delegated","clientApplicationIds":["d414ee2d-73e5-4e5b-bb16-03ef55fea597"]}' -ContentType "application/json"
- }
- try {
- foreach ($AllowedApp in $AllowedAppIdsForTenant) {
- Write-Host "$AllowedApp"
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/permissionGrantPolicies/cipp-consent-policy/includes" -Type POST -Body ('{"permissionType": "delegated","clientApplicationIds": ["' + $AllowedApp + '"]}') -ContentType "application/json"
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/permissionGrantPolicies/cipp-consent-policy/includes" -Type POST -Body ('{ "permissionType": "Application", "clientApplicationIds": ["' + $AllowedApp + '"] }') -ContentType "application/json"
- }
- }
- catch {
- "Could not add exclusions, probably already exist: $($_)"
- }
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type PATCH -Body '{"permissionGrantPolicyIdsAssignedToDefaultUserRole":["managePermissionGrantsForSelf.cipp-consent-policy"]}' -ContentType "application/json"
- }
- if ($AllowedAppIdsForTenant) {
- }
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Application Consent Mode has been enabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Application Consent Mode Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_OauthConsentLowSec/function.json b/Standards_OauthConsentLowSec/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_OauthConsentLowSec/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_OauthConsentLowSec/run.ps1 b/Standards_OauthConsentLowSec/run.ps1
deleted file mode 100644
index 9e4278f153fd..000000000000
--- a/Standards_OauthConsentLowSec/run.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-param($tenant)
-
-try {
- $State = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -tenantid $tenant)
- if ($State.permissionGrantPolicyIdsAssignedToDefaultUserRole -notin @("managePermissionGrantsForSelf.microsoft-user-default-low")) {
- Write-Host "Going to set"
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type PATCH -Body '{"permissionGrantPolicyIdsAssignedToDefaultUserRole":["managePermissionGrantsForSelf.microsoft-user-default-low"]}' -ContentType "application/json"
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Application Consent Mode(microsoft-user-default-low) has been enabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Application Consent Mode (microsoft-user-default-low) Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_Orchestration/function.json b/Standards_Orchestration/function.json
deleted file mode 100644
index 7326b39c184d..000000000000
--- a/Standards_Orchestration/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "Context",
- "type": "orchestrationTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_Orchestration/run.ps1 b/Standards_Orchestration/run.ps1
deleted file mode 100644
index 5e20d3ed21d4..000000000000
--- a/Standards_Orchestration/run.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-param($Context)
-
-$DurableRetryOptions = @{
- FirstRetryInterval = (New-TimeSpan -Seconds 5)
- MaxNumberOfAttempts = 3
- BackoffCoefficient = 2
-}
-$RetryOptions = New-DurableRetryOptions @DurableRetryOptions
-
-$Batch = Invoke-ActivityFunction -FunctionName 'Standards_GetQueue' -Input 'LetsGo' -ErrorAction Stop
-if ($null -ne $Batch -and ($Batch | Measure-Object).Count -gt 0) {
- $ParallelTasks = foreach ($Item in $Batch) {
- if ($item['Standard']) {
- try {
- Invoke-DurableActivity -FunctionName "Standards_$($item['Standard'])" -Input "$($item['Tenant'])" -NoWait -RetryOptions $RetryOptions -ErrorAction Stop
- } catch {
- Write-LogMessage -API 'Standards' -tenant $tenant -message "Task error: $($_.Exception.Message)" -sev Error
- }
- }
- }
-
- if (($ParallelTasks | Measure-Object).Count -gt 0) {
- try {
- $Outputs = Wait-ActivityFunction -Task $ParallelTasks -ErrorAction Stop
- } catch {
- Write-Information "Standards Wait-ActivityFunction error: $($_.Exception.Message)"
- }
- Write-LogMessage -API 'Standards' -tenant $tenant -message 'Deployment finished.' -sev Info
- }
-} else {
- Write-Information 'No Standards to process'
-}
diff --git a/Standards_OrchestrationStarter/function.json b/Standards_OrchestrationStarter/function.json
deleted file mode 100644
index 14c44f4f0217..000000000000
--- a/Standards_OrchestrationStarter/function.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "bindings": [
- {
- "authLevel": "anonymous",
- "name": "Request",
- "type": "httpTrigger",
- "direction": "in",
- "methods": [
- "post",
- "get"
- ]
- },
- {
- "type": "http",
- "direction": "out",
- "name": "Response"
- },
- {
- "name": "starter",
- "type": "durableClient",
- "direction": "in"
- }
- ]
-}
diff --git a/Standards_OrchestrationStarter/run.ps1 b/Standards_OrchestrationStarter/run.ps1
deleted file mode 100644
index 514c3edf0980..000000000000
--- a/Standards_OrchestrationStarter/run.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-using namespace System.Net
-
-param($Request, $TriggerMetadata)
-if ($CurrentlyRunning) {
- $Results = [pscustomobject]@{"Results" = "Already running. Please wait for the current instance to finish" }
- Write-LogMessage -API "StandardsApply" -message "Attempted to Standards but an instance was already running." -sev Info
-}
-else {
- $InstanceId = Start-NewOrchestration -FunctionName 'Standards_Orchestration'
- Write-Host "Started orchestration with ID = '$InstanceId'"
- $Response = New-OrchestrationCheckStatusResponse -Request $Request -InstanceId $InstanceId
- Write-Host ($Response | ConvertTo-Json)
- Write-LogMessage -API "Standards" -tenant $tenant -message "Started applying the standard templates to tenants." -sev Info
- $Results = [pscustomobject]@{"Results" = "Started Applying Standards" }
-}
-Write-Host ($Orchestrator | ConvertTo-Json)
-
-
-Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
- StatusCode = [HttpStatusCode]::OK
- Body = $results
- })
\ No newline at end of file
diff --git a/Standards_OrchestrationStarterTimer/run.ps1 b/Standards_OrchestrationStarterTimer/run.ps1
deleted file mode 100644
index 4fa90a9e8720..000000000000
--- a/Standards_OrchestrationStarterTimer/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-using namespace System.Net
-
-param($Timer)
-
-$InstanceId = Start-NewOrchestration -FunctionName 'Standards_Orchestration'
-Write-Host "Started orchestration with ID = '$InstanceId'"
-
-$Response = New-OrchestrationCheckStatusResponse -Request $timer -InstanceId $InstanceId
-Write-Host ($Response | ConvertTo-Json)
-Write-LogMessage -API "Standards" -tenant $tenant -message "Started applying the standard templates to tenants." -sev Info
diff --git a/Standards_OutBoundSpamAlert/function.json b/Standards_OutBoundSpamAlert/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_OutBoundSpamAlert/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_OutBoundSpamAlert/run.ps1 b/Standards_OutBoundSpamAlert/run.ps1
deleted file mode 100644
index 68b3b1952e60..000000000000
--- a/Standards_OutBoundSpamAlert/run.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-param($tenant)
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Contacts = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.OutBoundSpamAlert
-if (!$Contacts) {
- $Contacts = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.OutBoundSpamAlert
-}
-
-try {
- New-ExoRequest -tenantid $tenant -cmdlet "Set-HostedOutboundSpamFilterPolicy" -cmdparams @{ Identity = "Default"; NotifyOutboundSpam = $true; NotifyOutboundSpamRecipients = $Contacts.OutboundSpamContact } -useSystemMailbox $true
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set outbound spam filter alert to $($Contacts.OutboundSpamContact)" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set outbound spam contact to $($Contacts.OutboundSpamContact). $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_PWcompanionAppAllowedState/function.json b/Standards_PWcompanionAppAllowedState/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_PWcompanionAppAllowedState/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_PWcompanionAppAllowedState/run.ps1 b/Standards_PWcompanionAppAllowedState/run.ps1
deleted file mode 100644
index ef0dbd2b255f..000000000000
--- a/Standards_PWcompanionAppAllowedState/run.ps1
+++ /dev/null
@@ -1,41 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.PWcompanionAppAllowedState
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.PWcompanionAppAllowedState
-}
-
-try {
-
- # Get current state of microsoftAuthenticator policy
- $authenticatorFeaturesState = (New-GraphGetRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -Type GET)
-
- # Remove number matching from featureSettings because this is now Microsoft enforced and shipping it returns an error
- $authenticatorFeaturesState.featureSettings.PSObject.Properties.Remove('numberMatchingRequiredState')
-
- # Define feature body
- $featureBody = @{
- state = $Setting.state
- includeTarget = [PSCustomObject]@{
- targetType = 'group'
- id = 'all_users'
- }
- excludeTarget = [PSCustomObject]@{
- targetType = 'group'
- id = '00000000-0000-0000-0000-000000000000'
- }
- }
-
- # Set body for companionAppAllowedState
- $authenticatorFeaturesState.featureSettings.companionAppAllowedState = $featureBody
-
- $body = $authenticatorFeaturesState | ConvertTo-Json -Depth 3
-
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled companionAppAllowedState." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable companionAppAllowedState. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_PWdisplayAppInformationRequiredState/function.json b/Standards_PWdisplayAppInformationRequiredState/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_PWdisplayAppInformationRequiredState/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_PWdisplayAppInformationRequiredState/run.ps1 b/Standards_PWdisplayAppInformationRequiredState/run.ps1
deleted file mode 100644
index 3f59c422019e..000000000000
--- a/Standards_PWdisplayAppInformationRequiredState/run.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-param($tenant)
-
-try {
-
- $CurrentInfo = new-graphgetRequest -uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -tenantid $Tenant
- $CurrentInfo.featureSettings.PSObject.Properties.Remove('numberMatchingRequiredState')
- $CurrentInfo.featureSettings.displayAppInformationRequiredState.state = "enabled"
- $CurrentInfo.featureSettings.displayLocationInformationRequiredState.state = "enabled"
- $body = ($CurrentInfo | ConvertTo-Json -depth 10)
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled passwordless with Information and Number Matching." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable passwordless with Information and Number Matching. Error: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_PWnumberMatchingRequiredState/function.json b/Standards_PWnumberMatchingRequiredState/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_PWnumberMatchingRequiredState/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_PWnumberMatchingRequiredState/run.ps1 b/Standards_PWnumberMatchingRequiredState/run.ps1
deleted file mode 100644
index 65f5c3383852..000000000000
--- a/Standards_PWnumberMatchingRequiredState/run.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-param($tenant)
-
-try {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Passwordless with number matching is now enabled by default." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable passwordless with Number Matching. Error: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_PasswordExpireDisabled/function.json b/Standards_PasswordExpireDisabled/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_PasswordExpireDisabled/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_PasswordExpireDisabled/run.ps1 b/Standards_PasswordExpireDisabled/run.ps1
deleted file mode 100644
index 58f5cdb972b7..000000000000
--- a/Standards_PasswordExpireDisabled/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-try {
- $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/domains" -tenantid $Tenant | Where-Object -Property passwordValidityPeriodInDays -NE '2147483647' | ForEach-Object {
- New-GraphPostRequest -type Patch -tenantid $Tenant -uri "https://graph.microsoft.com/beta/domains/$($_.id)" -body '{"passwordValidityPeriodInDays": 2147483647 }'
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled Password Expiration" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable Password Expiration. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_RotateDKIM/function.json b/Standards_RotateDKIM/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_RotateDKIM/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_RotateDKIM/run.ps1 b/Standards_RotateDKIM/run.ps1
deleted file mode 100644
index 6472d8d055c6..000000000000
--- a/Standards_RotateDKIM/run.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-param($tenant)
-
-try {
- $DKIM = (New-ExoRequest -tenantid $tenant -cmdlet "Get-DkimSigningConfig") | Where-Object { $_.Selector1KeySize -EQ 1024 -and $_.Enabled -eq $true } | ForEach-Object {
- (New-ExoRequest -tenantid $tenant -cmdlet "Rotate-DkimSigningConfig" -cmdparams @{ KeySize = 2048; Identity = $_.Identity } -useSystemMailbox $true)
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Rotated DKIM" -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to rotate DKIM Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_SSPR/function.json b/Standards_SSPR/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SSPR/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SSPR/run.ps1 b/Standards_SSPR/run.ps1
deleted file mode 100644
index 3b0bbb7da943..000000000000
--- a/Standards_SSPR/run.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-param($tenant)
-try {
- Write-LogMessage -API "Standards" -tenant $tenant -message "SSPR standard is no longer available" -sev Error
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable SSPR $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_SafeSendersDisable/function.json b/Standards_SafeSendersDisable/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SafeSendersDisable/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SafeSendersDisable/run.ps1 b/Standards_SafeSendersDisable/run.ps1
deleted file mode 100644
index 1c5cb1d0feb1..000000000000
--- a/Standards_SafeSendersDisable/run.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-param($tenant)
-
-try {
- $Mailboxes = New-ExoRequest -tenantid $Tenant -cmdlet "Get-Mailbox" | ForEach-Object {
- try {
- $username = $_.UserPrincipalName
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-MailboxJunkEmailConfiguration" -cmdParams @{Identity = $_.GUID ; TrustedRecipientsAndDomains = $null } -anchor $username
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not disbale SafeSenders list for $($username): $($_.Exception.message)" -sev Warn
- }
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Safe Senders disabled" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable SafeSenders. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_SecurityDefaults/function.json b/Standards_SecurityDefaults/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SecurityDefaults/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SecurityDefaults/run.ps1 b/Standards_SecurityDefaults/run.ps1
deleted file mode 100644
index 09bb20f772e7..000000000000
--- a/Standards_SecurityDefaults/run.ps1
+++ /dev/null
@@ -1,15 +0,0 @@
-param($tenant)
-
-try {
- $SecureDefaultsState = (New-GraphGetRequest -Uri "https://graph.microsoft.com/beta/policies/identitySecurityDefaultsEnforcementPolicy" -tenantid $tenant)
-
- if ($SecureDefaultsState.IsEnabled -ne $true) {
- Write-Host "Secure Defaults is disabled. Enabling for $tenant" -ForegroundColor Yellow
- $body = '{ "isEnabled": true }'
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/identitySecurityDefaultsEnforcementPolicy" -Type patch -Body $body -ContentType "application/json")
- }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Standards API: Security Defaults Enabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable Security Defaults Error: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_SendFromAlias/function.json b/Standards_SendFromAlias/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SendFromAlias/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SendFromAlias/run.ps1 b/Standards_SendFromAlias/run.ps1
deleted file mode 100644
index 1a6e45c06278..000000000000
--- a/Standards_SendFromAlias/run.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-param($tenant)
-
-try {
- $AdminAuditLogParams = @{
- SendFromAliasEnabled = $true
- }
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-OrganizationConfig" -cmdParams $AdminAuditLogParams
- Write-LogMessage -API "Standards" -tenant $tenant -message "Send from alias Enabled." -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to apply Send from Alias Standard. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_SendReceiveLimitTenant/function.json b/Standards_SendReceiveLimitTenant/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SendReceiveLimitTenant/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SendReceiveLimitTenant/run.ps1 b/Standards_SendReceiveLimitTenant/run.ps1
deleted file mode 100644
index 1b86b0756ddc..000000000000
--- a/Standards_SendReceiveLimitTenant/run.ps1
+++ /dev/null
@@ -1,54 +0,0 @@
-param($tenant)
-# Get the tenant standards settings
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Limits = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.SendReceiveLimitTenant.SendReceiveLimit -split ','
-if (!$Limits) {
- $Limits = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.SendReceiveLimitTenant.SendReceiveLimit -split ','
-}
-
-# Parse the send limits and convert to bytes
-if ($Limits[0] -like "*MB*") {
- $MaxSendSize = [int]($Limits[0] -Replace "[a-zA-Z]", "") * 1MB
-}
-elseif ($Limits[0] -like "*KB*") {
- $MaxSendSize = [int]($Limits[0] -Replace "[a-zA-Z]", "") * 1KB
-} # Default to 35MB if invalid input
-else {
- $MaxSendSize = 35MB
-}
-# Test if the send limit is larger allowed and correct if needed
-if ($MaxSendSize -gt 150MB) {
- $MaxSendSize = 150MB
-}
-
-# Parse the receive limits and convert to bytes
-if ($Limits[1] -like "*MB*") {
- $MaxReceiveSize = [int]($Limits[1] -Replace "[a-zA-Z]", "") * 1MB
-}
-elseif ($Limits[1] -like "*KB*") {
- $MaxReceiveSize = [int]($Limits[1] -Replace "[a-zA-Z]", "") * 1KB
-} # Default to 36MB if invalid input
-else {
- $MaxReceiveSize = 36MB
-}
-# Test if the receive limit is larger allowed and correct if needed
-if ($MaxReceiveSize -gt 150MB) {
- $MaxReceiveSize = 150MB
-}
-
-try {
- # Get all mailbox plans
- $AllMailBoxPlans = New-ExoRequest -tenantid $Tenant -cmdlet "Get-MailboxPlan" | Select-Object DisplayName, MaxSendSize, MaxReceiveSize, GUID
-
- # Loop through all mailbox plans and set the send and receive limits for each if needed
- foreach ($MailboxPlan in $AllMailBoxPlans) {
- if ($MailboxPlan.MaxSendSize -ne $MaxSendSize -and $MailboxPlan.MaxReceiveSize -ne $MaxReceiveSize) {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-MailboxPlan" -cmdParams @{Identity = $MailboxPlan.GUID; MaxSendSize = $MaxSendSize; MaxReceiveSize = $MaxReceiveSize } -useSystemMailbox $true
- }
- }
- # Write to log on success
- Write-LogMessage -API "Standards" -tenant $tenant -message "Successfully set the tenant send and receive limits " -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set the tenant send and receive limits. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_SpoofWarn/function.json b/Standards_SpoofWarn/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_SpoofWarn/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_SpoofWarn/run.ps1 b/Standards_SpoofWarn/run.ps1
deleted file mode 100644
index 1fc970fbe231..000000000000
--- a/Standards_SpoofWarn/run.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.spoofwarn
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.spoofwarn
-}
-$status = if ($Setting.enable -and $Setting.disable) {
- Write-LogMessage -API "Standards" -tenant $tenant -message "You cannot both enable and disable the Spoof Warnings setting" -sev Error
- Exit
-}
-elseif ($setting.enable) { $true } else { $false }
-try {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-ExternalInOutlook" -cmdParams @{ Enabled = $status; }
- Write-LogMessage -API "Standards" -tenant $tenant -message "Spoofing warnings set to $status." -sev Info
-
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set spoofing warnings to $status. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_TAP/function.json b/Standards_TAP/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_TAP/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_TAP/run.ps1 b/Standards_TAP/run.ps1
deleted file mode 100644
index b7ca0a778c6e..000000000000
--- a/Standards_TAP/run.ps1
+++ /dev/null
@@ -1,31 +0,0 @@
-param($tenant)
-$ConfigTable = Get-CippTable -tablename 'standards'
-$TAPConfig = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).Standards.TAP.config
-if (!$TAPConfig) {
- $TAPConfig = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).Standards.TAP.config
-}
-if (!$TAPConfig) { $TAPConfig = 'true' }
-try {
- $MinimumLifetime = "60" #Minutes
- $MaximumLifetime = "480" #minutes
- $DefaultLifeTime = "60" #minutes
- $DefaultLength = "8"
- $body = @"
- {"@odata.type":"#microsoft.graph.temporaryAccessPassAuthenticationMethodConfiguration",
- "id":"TemporaryAccessPass",
- "includeTargets":[{"id":"all_users",
- "isRegistrationRequired":false,
- "targetType":"group","displayName":"All users"}],
- "defaultLength":$DefaultLength,
- "defaultLifetimeInMinutes":$DefaultLifeTime,
- "isUsableOnce": $TAPConfig,
- "maximumLifetimeInMinutes":$MaximumLifetime,
- "minimumLifetimeInMinutes":$MinimumLifetime,
- "state":"enabled"}
-"@
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationmethodspolicy/authenticationMethodConfigurations/TemporaryAccessPass" -Type patch -asApp $true -Body $body -ContentType "application/json")
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled Temporary Access Passwords." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable TAP. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_TransportRuleTemplate/function.json b/Standards_TransportRuleTemplate/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_TransportRuleTemplate/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_TransportRuleTemplate/run.ps1 b/Standards_TransportRuleTemplate/run.ps1
deleted file mode 100644
index 5b29a2e6934a..000000000000
--- a/Standards_TransportRuleTemplate/run.ps1
+++ /dev/null
@@ -1,35 +0,0 @@
-param($tenant)
-
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.TransportRuleTemplate
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.TransportRuleTemplate
-}
-
-foreach ($Template in $Setting.TemplateList) {
- $Table = Get-CippTable -tablename 'templates'
- $Filter = "PartitionKey eq 'TransportTemplate' and RowKey eq '$($Template.value)'"
- $RequestParams = (Get-CIPPAzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
- $Existing = New-ExoRequest -ErrorAction SilentlyContinue -tenantid $Tenant -cmdlet "Get-TransportRule" -useSystemMailbox $true | Where-Object -Property Identity -EQ $RequestParams.name
-
-
- try {
- if ($Existing) {
- Write-Host "Found existing"
- $RequestParams | Add-Member -NotePropertyValue $RequestParams.name -NotePropertyName Identity
- $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet "Set-TransportRule" -cmdParams ($RequestParams | Select-Object -Property * -ExcludeProperty UseLegacyRegex) -useSystemMailbox $true
- Write-LogMessage -API "Standards" -tenant $tenant -message "Successfully set transport rule for $tenant" -sev "Info"
- }
- else {
- Write-Host "Creating new"
- $GraphRequest = New-ExoRequest -tenantid $Tenant -cmdlet "New-TransportRule" -cmdParams $RequestParams -useSystemMailbox $true
- Write-LogMessage -API "Standards" -tenant $tenant -message "Successfully created transport rule for $tenant" -sev "Info"
- }
-
- Write-LogMessage -API $APINAME -tenant $Tenant -message "Created transport rule for $($tenantfilter)" -sev "Debug"
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not create transport rule for $($tenantfilter): $($_.Exception.message)" -sev "Error"
- }
-}
\ No newline at end of file
diff --git a/Standards_UndoOauth/function.json b/Standards_UndoOauth/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_UndoOauth/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_UndoOauth/run.ps1 b/Standards_UndoOauth/run.ps1
deleted file mode 100644
index cdf054417241..000000000000
--- a/Standards_UndoOauth/run.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-param($tenant)
-try {
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authorizationPolicy/authorizationPolicy" -Type PATCH -Body '{"permissionGrantPolicyIdsAssignedToDefaultUserRole":["ManagePermissionGrantsForSelf.microsoft-user-default-legacy"]}' -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Application Consent Mode has been disabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set Application Consent Mode to disabled Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_UndoSSPR/function.json b/Standards_UndoSSPR/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_UndoSSPR/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_UndoSSPR/run.ps1 b/Standards_UndoSSPR/run.ps1
deleted file mode 100644
index b6c0c198165a..000000000000
--- a/Standards_UndoSSPR/run.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-param($tenant)
-Write-LogMessage -API "Standards" -tenant $tenant -message "The standard for SSPR is no longer supported." -sev Error
diff --git a/Standards_UserSubmissions/function.json b/Standards_UserSubmissions/function.json
deleted file mode 100644
index e498538b37c5..000000000000
--- a/Standards_UserSubmissions/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
diff --git a/Standards_UserSubmissions/run.ps1 b/Standards_UserSubmissions/run.ps1
deleted file mode 100644
index 70b961c87ea6..000000000000
--- a/Standards_UserSubmissions/run.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.usersubmissions
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.usersubmissions
-}
-if ($Setting.enable -and $Setting.disable) {
- Write-LogMessage -API "Standards" -tenant $tenant -message "You cannot both enable and disable the User Submission policy" -sev Error
- Exit
-}
-elseif ($setting.enable) {
- $status = $true
- try {
- $Policy = New-ExoRequest -tenantid $Tenant -cmdlet "Get-ReportSubmissionPolicy"
- if ($Policy.length -eq 0) {
- New-ExoRequest -tenantid $Tenant -cmdlet "New-ReportSubmissionPolicy"
- Write-LogMessage -API "Standards" -tenant $tenant -message "User Submission policy set to $status." -sev Info
- }
- else {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-ReportSubmissionPolicy" -cmdParams @{ EnableReportToMicrosoft = $status; Identity = $($Policy.Identity); }
- Write-LogMessage -API "Standards" -tenant $tenant -message "User Submission policy set to $status." -sev Info
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set User Submission policy to $status. Error: $($_.exception.message)" -sev Error
- }
-}
-else {
- $status = $false
- try {
- $Policy = New-ExoRequest -tenantid $Tenant -cmdlet "Get-ReportSubmissionPolicy"
- if ($Policy.length -eq 0) {
- Write-LogMessage -API "Standards" -tenant $tenant -message "User Submission policy set to $status." -sev Info
- }
- else {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-ReportSubmissionPolicy" -cmdParams @{ EnableReportToMicrosoft = $status; Identity = $($Policy.Identity); EnableThirdPartyAddress = $status; ReportJunkToCustomizedAddress = $status; ReportNotJunkToCustomizedAddress = $status; ReportPhishToCustomizedAddress = $status; }
- Write-LogMessage -API "Standards" -tenant $tenant -message "User Submission policy set to $status." -sev Info
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set User Submission policy to $status. Error: $($_.exception.message)" -sev Error
- }
-}
\ No newline at end of file
diff --git a/Standards_allowOAuthTokens/function.json b/Standards_allowOAuthTokens/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_allowOAuthTokens/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_allowOAuthTokens/run.ps1 b/Standards_allowOAuthTokens/run.ps1
deleted file mode 100644
index 7b18fd438449..000000000000
--- a/Standards_allowOAuthTokens/run.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-param($tenant)
-
-try {
-
- $CurrentInfo = new-graphgetRequest -uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/softwareOath" -tenantid $Tenant
- $CurrentInfo.state = "enabled"
- $body = ($CurrentInfo | ConvertTo-Json -Depth 10)
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/softwareOath" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled software OTP/oAuth tokens" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable software OTP/oAuth tokens. Error: $($_.exception.message)" -sev "Error"
-}
\ No newline at end of file
diff --git a/Standards_allowOTPTokens/function.json b/Standards_allowOTPTokens/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_allowOTPTokens/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_allowOTPTokens/run.ps1 b/Standards_allowOTPTokens/run.ps1
deleted file mode 100644
index 6344508da742..000000000000
--- a/Standards_allowOTPTokens/run.ps1
+++ /dev/null
@@ -1,15 +0,0 @@
-param($tenant)
-
-try {
-
- $CurrentInfo = new-graphgetRequest -uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -tenantid $Tenant
- $CurrentInfo.featureSettings.PSObject.Properties.Remove('numberMatchingRequiredState')
- $CurrentInfo.isSoftwareOathEnabled = $true
- $body = ($CurrentInfo | ConvertTo-Json -Depth 10)
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy/authenticationMethodConfigurations/microsoftAuthenticator" -Type patch -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled MS authenticator OTP/oAuth tokens" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable MS authenticator OTP/oAuth tokens. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_calDefault/function.json b/Standards_calDefault/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_calDefault/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_calDefault/run.ps1 b/Standards_calDefault/run.ps1
deleted file mode 100644
index f2e54d38773a..000000000000
--- a/Standards_calDefault/run.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.caldefault
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.caldefault
-}
-
-
-$Mailboxes = New-ExoRequest -tenantid $Tenant -cmdlet "get-mailbox"
-foreach ($Mailbox in $Mailboxes) {
- try {
- New-ExoRequest -tenantid $Tenant -cmdlet "Get-MailboxFolderStatistics" -cmdParams @{identity = $Mailbox.UserPrincipalName; FolderScope = 'Calendar' } -Anchor $Mailbox.UserPrincipalName | Where-Object { $_.FolderType -eq 'Calendar' } | ForEach-Object {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-MailboxFolderPermission" -cmdparams @{Identity = "$($Mailbox.UserPrincipalName):$($_.FolderId)"; User = 'Default'; AccessRights = $setting.permissionlevel } -Anchor $Mailbox.UserPrincipalName
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set default folder permission for $($Mailbox.UserPrincipalName):\$($_.Name) to $($setting.permissionlevel)" -sev Info
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set default calendar permissions for $($Mailbox.UserPrincipalName). Error: $($_.exception.message)" -sev Error
- }
-
-}
-Write-LogMessage -API "Standards" -tenant $tenant -message "Done setting default calendar permissions." -sev Info
\ No newline at end of file
diff --git a/Standards_disableMacSync/function.json b/Standards_disableMacSync/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_disableMacSync/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_disableMacSync/run.ps1 b/Standards_disableMacSync/run.ps1
deleted file mode 100644
index 232e6be61387..000000000000
--- a/Standards_disableMacSync/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"isMacSyncAppEnabled": false}'
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled Mac OneDrive Sync" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable Mac OneDrive Sync: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_fwdAdminAlerts/function.json b/Standards_fwdAdminAlerts/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_fwdAdminAlerts/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_fwdAdminAlerts/run.ps1 b/Standards_fwdAdminAlerts/run.ps1
deleted file mode 100644
index fa5add33f029..000000000000
--- a/Standards_fwdAdminAlerts/run.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.caldefault
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.caldefault
-}
-
-
-$Mailboxes = New-ExoRequest -tenantid $Tenant -cmdlet "get-mailbox"
-foreach ($Mailbox in $Mailboxes) {
- try {
- New-ExoRequest -tenantid $Tenant -cmdlet "Get-MailboxFolderStatistics" -cmdParams @{identity = $Mailbox.UserPrincipalName; FolderScope = 'Calendar' } -Anchor $Mailbox.UserPrincipalName | ForEach-Object {
- New-ExoRequest -tenantid $Tenant -cmdlet "Set-MailboxFolderPermission" -cmdparams @{Identity = "$($Mailbox.UserPrincipalName):$($_.FolderId)"; User = 'Default'; AccessRights = $setting.permissionlevel } -Anchor $Mailbox.UserPrincipalName
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set default folder permission for $($Mailbox.UserPrincipalName):\$($_.Name) to $($setting.permissionlevel)" -sev Info
- }
- }
- catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Could not set default calendar permissions for $($Mailbox.UserPrincipalName). Error: $($_.exception.message)" -sev Error
- }
-
-}
-Write-LogMessage -API "Standards" -tenant $tenant -message "Done setting default calendar permissions." -sev Info
\ No newline at end of file
diff --git a/Standards_intuneDeviceReg/function.json b/Standards_intuneDeviceReg/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_intuneDeviceReg/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_intuneDeviceReg/run.ps1 b/Standards_intuneDeviceReg/run.ps1
deleted file mode 100644
index 20cff265909a..000000000000
--- a/Standards_intuneDeviceReg/run.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-param($tenant)
-try {
- $ConfigTable = Get-CippTable -tablename 'standards'
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.intuneDeviceReg
- if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.intuneDeviceReg
- }
- $PreviousSetting = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -tenantid $Tenant
- $PreviousSetting.userDeviceQuota = $Setting.max
- $Newbody = ConvertTo-Json -Compress -InputObject $PreviousSetting
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -Type PUT -Body $NewBody -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set user device quota to $($setting.max)" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set user device quota to $($setting.max) : $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_intuneDeviceRetirementDays/function.json b/Standards_intuneDeviceRetirementDays/function.json
deleted file mode 100644
index 2d4ea9094b24..000000000000
--- a/Standards_intuneDeviceRetirementDays/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "direction": "in",
- "type": "activityTrigger"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_intuneDeviceRetirementDays/run.ps1 b/Standards_intuneDeviceRetirementDays/run.ps1
deleted file mode 100644
index 2ff61cc18f3e..000000000000
--- a/Standards_intuneDeviceRetirementDays/run.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.DeviceInactivityBeforeRetirementInDays
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.DeviceInactivityBeforeRetirementInDays
-}
-
-try {
-
- $body = @{ DeviceInactivityBeforeRetirementInDays = $Setting.days } | ConvertTo-Json
-
- (New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/deviceManagement/managedDeviceCleanupSettings" -Type PATCH -Body $body -ContentType "application/json")
-
- Write-LogMessage -API "Standards" -tenant $tenant -message "Enabled DeviceInactivityBeforeRetirementInDays." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to enable DeviceInactivityBeforeRetirementInDays. Error: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_intuneRequireMFA/function.json b/Standards_intuneRequireMFA/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_intuneRequireMFA/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_intuneRequireMFA/run.ps1 b/Standards_intuneRequireMFA/run.ps1
deleted file mode 100644
index 445ab1fee6ac..000000000000
--- a/Standards_intuneRequireMFA/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-try {
- $PreviousSetting = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -tenantid $Tenant
- $PreviousSetting.multiFactorAuthConfiguration = '1'
- $Newbody = ConvertTo-Json -Compress -InputObject $PreviousSetting
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -Type PUT -Body $NewBody -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set required to use MFA when joining Intune Devices" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set require to use MFA when joining Intune Devices: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_laps/function.json b/Standards_laps/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_laps/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_laps/run.ps1 b/Standards_laps/run.ps1
deleted file mode 100644
index 7aeedfe9124f..000000000000
--- a/Standards_laps/run.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-param($tenant)
-try {
- $PreviousSetting = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -tenantid $Tenant
- $previoussetting.localadminpassword.isEnabled = $true
- $Newbody = ConvertTo-Json -Compress -InputObject $PreviousSetting
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy" -Type PUT -Body $newBody -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "LAPS has been enabled." -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set LAPS: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_sharingCapability/function.json b/Standards_sharingCapability/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_sharingCapability/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_sharingCapability/run.ps1 b/Standards_sharingCapability/run.ps1
deleted file mode 100644
index 746f067723f5..000000000000
--- a/Standards_sharingCapability/run.ps1
+++ /dev/null
@@ -1,15 +0,0 @@
-param($tenant)
-
-$ConfigTable = Get-CippTable -tablename 'standards'
-$Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq '$tenant'").JSON | ConvertFrom-Json).standards.sharingCapability
-if (!$Setting) {
- $Setting = ((Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'standards' and RowKey eq 'AllTenants'").JSON | ConvertFrom-Json).standards.sharingCapability
-}
-
-try {
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body "{`"sharingCapability`":`"$($Setting.Level)`"}" -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Set sharing level to $($Setting.level)" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to set sharing level to $($Setting.level): $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/Standards_unmanagedSync/function.json b/Standards_unmanagedSync/function.json
deleted file mode 100644
index ce713ef7d4f6..000000000000
--- a/Standards_unmanagedSync/function.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bindings": [
- {
- "name": "tenant",
- "type": "activityTrigger",
- "direction": "in"
- }
- ]
-}
\ No newline at end of file
diff --git a/Standards_unmanagedSync/run.ps1 b/Standards_unmanagedSync/run.ps1
deleted file mode 100644
index a46d1bc146f5..000000000000
--- a/Standards_unmanagedSync/run.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-param($tenant)
-
-try {
- $body = '{"isUnmanagedSyncAppForTenantRestricted": false}'
- New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/admin/sharepoint/settings" -AsApp $true -Type patch -Body $body -ContentType "application/json"
- Write-LogMessage -API "Standards" -tenant $tenant -message "Disabled Sync for unmanaged devices" -sev Info
-}
-catch {
- Write-LogMessage -API "Standards" -tenant $tenant -message "Failed to disable Sync for unmanaged devices: $($_.exception.message)" -sev Error
-}
\ No newline at end of file
diff --git a/host.json b/host.json
index c35d7ceb5451..ee3245a61b88 100644
--- a/host.json
+++ b/host.json
@@ -8,8 +8,11 @@
"id": "Microsoft.Azure.Functions.ExtensionBundle",
"version": "[2.*, 3.0.0)"
},
- "extensions": {},
+ "extensions": {
+ "queues": {
+ "maxDequeueCount": 5
+ }},
"logging": {
"fileLoggingMode": "never"
- }
+ }
}
diff --git a/profile.ps1 b/profile.ps1
index 66e78cec4b1c..5b932cfda949 100644
--- a/profile.ps1
+++ b/profile.ps1
@@ -11,15 +11,16 @@
# Authenticate with Azure PowerShell using MSI.
# Remove this if you are not planning on using MSI or Azure PowerShell.
-Import-Module CippCore
-try {
- Import-Module Az.KeyVault -ErrorAction Stop
-} catch { $_.Exception.Message }
-try {
- Import-Module Az.Accounts
-} catch { $_.Exception.Message }
-Import-Module CippExtensions
+# Import modules
+@('CippCore','CippExtensions','Az.KeyVault','Az.Accounts') | ForEach-Object {
+ try {
+ Import-Module -Name $_ -ErrorAction Stop
+ } catch {
+ Write-LogMessage -message "Failed to import module $($_): $_.Exception.Message" -Sev 'CRITICAL'
+ $_.Exception.Message
+ }
+}
try {
Disable-AzContextAutosave -Scope Process | Out-Null
@@ -37,4 +38,4 @@ try {
# Uncomment the next line to enable legacy AzureRm alias in Azure PowerShell.
# Enable-AzureRmAlias
-# You can also define functions or aliases that can be referenced in any of your PowerShell functions.
\ No newline at end of file
+# You can also define functions or aliases that can be referenced in any of your PowerShell functions.
diff --git a/version_latest.txt b/version_latest.txt
index 5ca7df98c441..490375502c2a 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-4.7.4
\ No newline at end of file
+4.8.4
\ No newline at end of file
|