[pull] master from KelvinTegelaar:master

.env.example

@@ -0,0 +1,7 @@
+FUNCTIONS_WORKER_RUNTIME='powershell'
+FUNCTIONS_WORKER_RUNTIME_VERSION='7.4'
+AzureWebJobsStorage='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNoBnZf6KgBVU4=;BlobEndpoint=http://azurite:10000/devstoreaccount1;QueueEndpoint=http://azurite:10001/devstoreaccount1;TableEndpoint=http://azurite:10002/devstoreaccount1;'
+DEV_SKIP_BPA_TIMER='true'
+DEV_SKIP_DOMAIN_TIMER='true'
+FUNCTIONS_EXTENSION_VERSION='4'
+NonLocalHostAzurite='true'

AddChocoApp/Choco.App.xml

@@ -1,15 +1,15 @@
 <ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
-  <Name>Install.ps1</Name>
-  <UnencryptedContentSize>28319</UnencryptedContentSize>
+  <Name>install.ps1</Name>
+  <UnencryptedContentSize>1154</UnencryptedContentSize>
   <FileName>IntunePackage.intunewin</FileName>
-  <SetupFile>Install.ps1</SetupFile>
+  <SetupFile>install.ps1</SetupFile>
   <EncryptionInfo>
-    <EncryptionKey>bmoyHXFtIws7JrnXNDV4rjzap+Be+4ZJEDJkTfbVIL8=</EncryptionKey>
-    <MacKey>xNh8ZUZ6TLsAtihUEAU/NHiRfutDzz+eSgEdpaXUo9Q=</MacKey>
-    <InitializationVector>3aQFPhO8ywEC4Ojby1lR0w==</InitializationVector>
-    <Mac>PXX+hj3DXEpzMEMYBDXmAIlSyDIGuAwmAHIQpZIt8hU=</Mac>
+    <EncryptionKey>v8i9okyqxp8xlw3/r2QXMNnXcuGwrBkD54QQ7F/UJbc=</EncryptionKey>
+    <MacKey>XjT9kWc7gQRKRdEQ/PA/lbQDDH8kFjnuPFILxAldRTI=</MacKey>
+    <InitializationVector>iyAbM3kIYqA4AlWP89S5oA==</InitializationVector>
+    <Mac>w+2KMctRWmJzYjKcMTAKCLz15K559SgZ3pnQuQD3P/I=</Mac>
     <ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
-    <FileDigest>fx41h3rGZYZO3Jux7JnPgatlmpMc2ZFIZS8ipF5VDDw=</FileDigest>
+    <FileDigest>tyjBbJZ+Zj9AqD7UjEfQfe/HojN/q1+zFPidXWbiVuE=</FileDigest>
     <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
   </EncryptionInfo>
 </ApplicationInfo>

AddChocoApp/IntunePackage/Install.ps1

@@ -12,6 +12,10 @@ param (
     [string]
     $CustomRepo,
 
+    [Parameter()]
+    [string]
+    $CustomArguments,
+
     [Parameter()]
     [switch]
     $Trace
@@ -36,13 +40,23 @@ try {
     try {
         $localprograms = & "$chocoPath" list --localonly
         $CustomRepoString = if ($CustomRepo) { "--source $customrepo" } else { $null }
+        $CustomArgsArray = if ($CustomArguments) { $CustomArguments -split '\s+' } else { @() }
+
         if ($localprograms -like "*$Packagename*" ) {
             Write-Host "Upgrading $packagename"
-            & "$chocoPath" upgrade $Packagename $CustomRepoString
+            if ($CustomArgsArray.Count -gt 0) {
+                & "$chocoPath" upgrade $Packagename $CustomRepoString $CustomArgsArray
+            } else {
+                & "$chocoPath" upgrade $Packagename $CustomRepoString
+            }
         }
         else {
             Write-Host "Installing $packagename"
-            & "$chocoPath" install $Packagename -y $CustomRepoString
+            if ($CustomArgsArray.Count -gt 0) {
+                & "$chocoPath" install $Packagename -y $CustomRepoString $CustomArgsArray
+            } else {
+                & "$chocoPath" install $Packagename -y $CustomRepoString
+            }
         }
         Write-Host 'Completed.'
     }

CIPP-Permissions.json

@@ -425,6 +425,11 @@
         "Name": "UserAuthenticationMethod.ReadWrite",
         "Description": "Allows the app to read and write your authentication methods, including phone numbers and Authenticator app settings.This does not allow the app to see secret information like your passwords, or to sign-in or otherwise use your authentication methods."
       },
+      {
+        "Id": "424b07a8-1209-4d17-9fe4-9018a93a1024",
+        "Name": "TeamsTelephoneNumber.ReadWrite.All",
+        "Description": "Allows the app to read and modify your tenant's acquired telephone number details on behalf of the signed-in admin user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc."
+      },
       {
         "Id": "b7887744-6746-4312-813d-72daeaee7e2d",
         "Name": "UserAuthenticationMethod.ReadWrite.All",
@@ -697,6 +702,11 @@
         "Name": "User.ReadWrite.All",
         "Description": "Allows the app to read and update user profiles without a signed in user."
       },
+      {
+        "Id": "0a42382f-155c-4eb1-9bdc-21548ccaa387",
+        "Name": "TeamsTelephoneNumber.ReadWrite.All",
+        "Description": "Allows the app to read your tenant's acquired telephone number details, without a signed-in user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc."
+      },
       {
         "Id": "50483e42-d915-4231-9639-7fdb7fd190e5",
         "Name": "UserAuthenticationMethod.ReadWrite.All",

CIPPTimers.json

@@ -105,6 +105,14 @@
     "Priority": 5,
     "RunOnProcessor": true
   },
+  {
+    "Id": "0967c860-3a57-4860-8f33-e5136eae7b4e",
+    "Command": "Start-TenantDynamicGroupOrchestrator",
+    "Description": "Orchestrator to update dynamic tenant groups",
+    "Cron": "0 0 */4 * * *",
+    "Priority": 6,
+    "RunOnProcessor": true
+  },
   {
     "Id": "4ca242d0-8dc8-4256-b0ed-186599f4233f",
     "Command": "Start-UpdateTokensTimer",
@@ -206,4 +214,4 @@
     "RunOnProcessor": true,
     "IsSystem": true
   }
-]
+]

CommunityRepos.json

@@ -1,4 +1,22 @@
 [
+  {
+    "Id": "1041442982",
+    "Name": "CISTemplates",
+    "Description": "CIPP CIS Templates",
+    "URL": "https://github.com/CyberDrain/CyberDrain-CIS-Templates",
+    "FullName": "CyberDrain/CyberDrain-CIS-Templates",
+    "Owner": "CyberDrain",
+    "Visibility": "public",
+    "WriteAccess": false,
+    "DefaultBranch": "main",
+    "RepoPermissions": {
+      "admin": false,
+      "maintain": false,
+      "push": false,
+      "triage": false,
+      "pull": true
+    }
+  },
   {
     "Id": "930523724",
     "Name": "CIPP-Templates",
@@ -52,5 +70,23 @@
       "triage": false,
       "pull": true
     }
+  },
+  {
+    "Id": "863076113",
+    "Name": "IntuneBaseLines",
+    "Description": "In this repo, you will find Intune profiles in JSON format, which can be used in setting up your Modern Workplace. All policies were created in Microsoft Intune and exported to share with the community.",
+    "URL": "https://github.com/IntuneAdmin/IntuneBaselines",
+    "FullName": "IntuneAdmin/IntuneBaselines",
+    "Owner": "IntuneAdmin",
+    "Visibility": "public",
+    "WriteAccess": false,
+    "DefaultBranch": "main",
+    "RepoPermissions": {
+      "admin": false,
+      "maintain": false,
+      "push": false,
+      "triage": false,
+      "pull": true
+    }
   }
 ]

Config/SchedulerRateLimits.json

@@ -0,0 +1,10 @@
+[
+  {
+    "Command": "Sync-CIPPExtensionData",
+    "MaxRequests": 50
+  },
+  {
+    "Command": "Push-CIPPExtensionData",
+    "MaxRequests": 30
+  }
+]

Config/schemaDefinitions.json

@@ -1,16 +1,17 @@
 [
-    {
-        "id": "cippUser",
-        "description": "CIPP User Schema",
-        "targetTypes": ["User"],
-        "properties": [
-            { "name": "jitAdminEnabled", "type": "Boolean" },
-            { "name": "jitAdminExpiration", "type": "DateTime" },
-            { "name": "mailboxType", "type": "String" },
-            { "name": "archiveEnabled", "type": "Boolean" },
-            { "name": "autoExpandingArchiveEnabled", "type": "Boolean" },
-            { "name": "perUserMfaState", "type": "String" }
-        ],
-        "status": "Available"
-    }
+  {
+    "id": "cippUser",
+    "description": "CIPP User Schema",
+    "targetTypes": ["User"],
+    "properties": [
+      { "name": "jitAdminEnabled", "type": "Boolean" },
+      { "name": "jitAdminExpiration", "type": "DateTime" },
+      { "name": "jitAdminReason", "type": "String" },
+      { "name": "mailboxType", "type": "String" },
+      { "name": "archiveEnabled", "type": "Boolean" },
+      { "name": "autoExpandingArchiveEnabled", "type": "Boolean" },
+      { "name": "perUserMfaState", "type": "String" }
+    ],
+    "status": "Available"
+  }
 ]