Merge branch 'interface-rewrite' into dev

Author: KelvinTegelaar

.github/workflows/interface-rewrite_cippjta72.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippjta72
+
+on:
+  push:
+    branches:
+      - interface-rewrite
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippjta72'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_6472818415124CAB84BCDF49D430C471 }}

.github/workflows/interface-rewrite_cipptulwz.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cipptulwz
+
+on:
+  push:
+    branches:
+      - interface-rewrite
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cipptulwz'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_8DF25C53CFA64C388F9B6AC94A9780B9 }}

.github/workflows/interface-rewrite_cippufcig.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippufcig
+
+on:
+  push:
+    branches:
+      - interface-rewrite
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippufcig'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5A94D19FE6B44070B777EDECF3EF5BFE }}

.github/workflows/publish_prerelease.yml

@@ -0,0 +1,93 @@
+name: Generate Release Notes and Upload
+
+on:
+  push:
+    branches:
+      - pre-release
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    if: github.event.repository.fork == false && github.event_name == 'push'
+    name: Generate Release Notes and Upload to Azure
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the repository
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      # Read and Trim Version
+      - name: Read and Trim Version
+        id: get_version
+        run: |
+          if [ ! -f version_latest.txt ]; then
+            echo "Error: version_latest.txt not found!"
+            exit 1
+          fi
+          VERSION=$(cat version_latest.txt | tr -d '[:space:]')
+          if [ -z "$VERSION" ]; then
+            echo "Error: version_latest.txt is empty after trimming!"
+            exit 1
+          fi
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      # Exit if Tag Already Exists
+      - name: Check if Tag Exists
+        id: tag_check
+        run: |
+          git fetch --tags
+          if git rev-parse "refs/tags/${{ steps.get_version.outputs.version }}" >/dev/null 2>&1; then
+            echo "tag_exists=true" >> $GITHUB_ENV
+            echo "Tag ${{ steps.get_version.outputs.version }} already exists. Exiting workflow successfully."
+          else
+            echo "tag_exists=false" >> $GITHUB_ENV
+          fi
+
+      # Generate Release Notes
+      - name: Generate Release Notes
+        id: changelog
+        if: env.tag_exists == 'false'
+        uses: mikepenz/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Create a new release tag
+      - name: Create GitHub Release
+        if: env.tag_exists == 'false'
+        uses: ncipollo/[email protected]
+        with:
+          tag: ${{ steps.get_version.outputs.version }}
+          name: "v${{ steps.get_version.outputs.version }}"
+          draft: false
+          prerelease: true
+          body: ${{ steps.changelog.outputs.changelog }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Create ZIP File in a New Source Directory
+      - name: Prepare and Zip Release Files
+        if: env.tag_exists == 'false'
+        run: |
+          mkdir -p src/releases
+          zip -r src/releases/release_${{ steps.get_version.outputs.version }}.zip . \
+            --exclude "./src/releases/*" \
+            --exclude ".*" \
+            --exclude ".*/**"
+          zip -r src/releases/beta.zip . \
+            --exclude "./src/releases/*" \
+            --exclude ".*" \
+            --exclude ".*/**"
+
+      # Upload to Azure Blob Storage
+      - name: Azure Blob Upload with Destination folder defined
+        if: env.tag_exists == 'false'
+        uses: LanceMcCarthy/[email protected]
+        with:
+          connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
+          container_name: cipp-api
+          source_folder: src/releases/
+          destination_folder: /
+          delete_if_exists: true

CIPPTimers.json

@@ -1,5 +1,6 @@
 [
   {
+    "Id": "c0c48d71-7918-4828-bc25-0e8c28a171a2",
     "Command": "Start-DurableCleanup",
     "Description": "Timer function to cleanup durable functions",
     "Cron": "0 */15 * * * *",
@@ -8,6 +9,7 @@
     "IsSystem": true
   },
   {
+    "Id": "76dc2e2e-eb89-47f7-bd9f-8aaebfe854c7",
     "Command": "Start-UserTasksOrchestrator",
     "Description": "Orchestrator to process user scheduled tasks",
     "Cron": "0 */15 * * * *",
@@ -16,13 +18,15 @@
     "PreferredProcessor": "usertasks"
   },
   {
+    "Id": "168decf3-7ddd-471e-ab46-8b40be0f18ae",
     "Command": "Start-CIPPProcessorQueue",
     "Description": "Timer to handle user initiated tasks",
     "Cron": "0 */15 * * * *",
     "Priority": 1,
     "RunOnProcessor": true
   },
   {
+    "Id": "44a40668-ed71-403c-8c26-b32e320086ad",
     "Command": "Start-AuditLogOrchestrator",
     "Description": "Orchestrator to process audit logs",
     "Cron": "0 */15 * * * *",
@@ -32,6 +36,7 @@
     "IsSystem": true
   },
   {
+    "Id": "03475c86-4314-4d7b-90f2-5a0639e3899b",
     "Command": "Start-AuditLogSearchCreation",
     "Description": "Timer to create audit log searches",
     "Cron": "0 */30 * * * *",
@@ -41,20 +46,23 @@
     "IsSystem": true
   },
   {
+    "Id": "5ff6c500-e420-4a3b-8532-ace2e4da4f7d",
     "Command": "Start-ApplicationOrchestrator",
     "Description": "Orchestrator to process application uploads",
     "Cron": "0 0 */12 * * *",
     "Priority": 2,
     "RunOnProcessor": true
   },
   {
+    "Id": "5b3bb926-d107-471e-8787-3b22b0d4dbbe",
     "Command": "Start-WebhookOrchestrator",
     "Description": "Orchestrator to process webhooks",
     "Cron": "0 */15 * * * *",
     "Priority": 3,
     "RunOnProcessor": true
   },
   {
+    "Id": "9b0c8e50-f798-49db-9a8b-dbcc0fcadeea",
     "Command": "Start-StandardsOrchestrator",
     "Description": "Orchestrator to process standards",
     "Cron": "0 0 */4 * * *",
@@ -63,27 +71,31 @@
     "PreferredProcessor": "standards"
   },
   {
+    "Id": "5113c66d-c040-42df-9565-39dff90ddd55",
     "Command": "Start-CIPPGraphSubscriptionCleanupTimer",
     "Description": "Orchestrator to cleanup old Graph subscriptions",
     "Cron": "0 0 0 * * *",
     "Priority": 5,
     "RunOnProcessor": true
   },
   {
+    "Id": "97145a1d-28f0-4bb2-b929-5a43517d23cc",
     "Command": "Start-SchedulerOrchestrator",
     "Description": "Orchestrator to process system scheduled tasks",
     "Cron": "0 0 * * * *",
     "Priority": 6,
     "RunOnProcessor": true
   },
   {
+    "Id": "ed7b5241-1cb9-499b-8f5b-1013ba5764b4",
     "Command": "Set-CIPPGDAPInviteGroups",
     "Description": "Orchestrator to map the groups for GDAP invites",
     "Cron": "0 0 */3 * * *",
     "Priority": 5,
     "RunOnProcessor": true
   },
   {
+    "Id": "4ca242d0-8dc8-4256-b0ed-186599f4233f",
     "Command": "Start-UpdateTokensTimer",
     "Description": "Orchestrator to update tokens",
     "Cron": "0 0 0 * * 0",
@@ -92,6 +104,7 @@
     "IsSystem": true
   },
   {
+    "Id": "ebe981b6-4417-406e-a1a5-7b8279058841",
     "Command": "Start-CIPPGraphSubscriptionRenewalTimer",
     "Description": "Orchestrator to renew Graph subscriptions",
     "Cron": "0 15 * * * *",
@@ -100,13 +113,27 @@
     "IsSystem": true
   },
   {
+    "Id": "c2ebde3f-fa35-45aa-8a6b-91c835050b79",
     "Command": "Start-DomainOrchestrator",
     "Description": "Orchestrator to process domains",
     "Cron": "0 0 0 * * *",
     "Priority": 10,
     "RunOnProcessor": true
   },
   {
+    "Id": "f82345da-e370-4b15-8167-be148cfd04af",
+    "Command": "Get-Tenants",
+    "Parameters": {
+      "TriggerRefresh": true
+    },
+    "Description": "Update tenants",
+    "Cron": "0 0 23 * * *",
+    "Priority": 10,
+    "RunOnProcessor": true,
+    "IsSystem": true
+  },
+  {
+    "Id": "d9ff3af4-bd34-40d6-b12a-8fa24463f331",
     "Command": "Start-UpdatePermissionsOrchestrator",
     "Description": "Orchestrator to update CPV permissions",
     "Cron": "0 0 0 * * *",
@@ -115,27 +142,31 @@
     "IsSystem": true
   },
   {
+    "Id": "467787cf-01c5-4d20-8097-c2eef691a20e",
     "Command": "Start-BillingTimer",
     "Description": "Timer to process billing",
     "Cron": "0 0 0 * * *",
     "Priority": 12,
     "RunOnProcessor": true
   },
   {
+    "Id": "80070b4f-95ed-4e5f-be4c-9e339306d4aa",
     "Command": "Start-BPAOrchestrator",
     "Description": "Orchestrator to process BPA reports",
     "Cron": "0 0 3 * * *",
     "Priority": 10,
     "RunOnProcessor": true
   },
   {
+    "Id": "54c39540-fe91-4795-8613-ac4295751a51",
     "Command": "Start-ExtensionOrchestrator",
     "Description": "Orchestrator to process extensions",
     "Cron": "0 0 */2 * * *",
     "Priority": 12,
     "RunOnProcessor": true
   },
   {
+    "Id": "3fb9745b-08c9-411b-bfac-dc48087489d5",
     "Command": "Start-CIPPStatsTimer",
     "Description": "Timer to process CIPP stats",
     "Cron": "0 0 0 * * *",
@@ -144,11 +175,24 @@
     "IsSystem": true
   },
   {
+    "Id": "f74a4540-c811-4037-997c-0d32d7d5742f",
     "Command": "Start-TableCleanup",
     "Description": "Timer to cleanup tables",
     "Cron": "0 0 23 * * *",
     "Priority": 20,
     "RunOnProcessor": true,
     "IsSystem": true
+  },
+  {
+    "Id": "e87db59d-3386-4a51-8274-da9aeb6793e3",
+    "Command": "Get-Tenants",
+    "Parameters": {
+      "CleanOld": true
+    },
+    "Description": "Timer to cleanup old tenants",
+    "Cron": "0 0 0 * * *",
+    "Priority": 20,
+    "RunOnProcessor": true,
+    "IsSystem": true
   }
 ]

Config/59bd753c-4204-4b3a-b84b-850d4b69f494.IntuneTemplate.json

@@ -3,5 +3,5 @@
   "Description": "",
   "RAWJson": "{\r\n  \"name\": \"LAPS\",\r\n  \"description\": \"\",\r\n  \"settings\": [\r\n    {\r\n      \"id\": \"0\",\r\n      \"settingInstance\": {\r\n        \"@odata.type\": \"#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance\",\r\n        \"settingDefinitionId\": \"device_vendor_msft_laps_policies_backupdirectory\",\r\n        \"settingInstanceTemplateReference\": {\r\n          \"settingInstanceTemplateId\": \"a3270f64-e493-499d-8900-90290f61ed8a\"\r\n        },\r\n        \"choiceSettingValue\": {\r\n          \"value\": \"device_vendor_msft_laps_policies_backupdirectory_1\",\r\n          \"settingValueTemplateReference\": {\r\n            \"settingValueTemplateId\": \"4d90f03d-e14c-43c4-86da-681da96a2f92\",\r\n            \"useTemplateDefault\": false\r\n          },\r\n          \"children\": [\r\n            {\r\n              \"@odata.type\": \"#microsoft.graph.deviceManagementConfigurationSimpleSettingInstance\",\r\n              \"settingDefinitionId\": \"device_vendor_msft_laps_policies_passwordagedays_aad\",\r\n              \"settingInstanceTemplateReference\": null,\r\n              \"simpleSettingValue\": {\r\n                \"@odata.type\": \"#microsoft.graph.deviceManagementConfigurationIntegerSettingValue\",\r\n                \"settingValueTemplateReference\": null,\r\n                \"value\": 30\r\n              }\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    },\r\n    {\r\n      \"id\": \"1\",\r\n      \"settingInstance\": {\r\n        \"@odata.type\": \"#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance\",\r\n        \"settingDefinitionId\": \"device_vendor_msft_laps_policies_passwordcomplexity\",\r\n        \"settingInstanceTemplateReference\": {\r\n          \"settingInstanceTemplateId\": \"8a7459e8-1d1c-458a-8906-7b27d216de52\"\r\n        },\r\n        \"choiceSettingValue\": {\r\n          \"value\": \"device_vendor_msft_laps_policies_passwordcomplexity_4\",\r\n          \"settingValueTemplateReference\": {\r\n            \"settingValueTemplateId\": \"aa883ab5-625e-4e3b-b830-a37a4bb8ce01\",\r\n            \"useTemplateDefault\": false\r\n          },\r\n          \"children\": []\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"platforms\": \"windows10\",\r\n  \"technologies\": \"mdm\",\r\n  \"templateReference\": {\r\n    \"templateId\": \"adc46e5a-f4aa-4ff6-aeff-4f27bc525796_1\",\r\n    \"templateFamily\": \"endpointSecurityAccountProtection\",\r\n    \"templateDisplayName\": \"Local admin password solution (Windows LAPS)\",\r\n    \"templateDisplayVersion\": \"Version 1\"\r\n  }\r\n}",
   "Type": "Catalog",
-  "GUID": "59bd753c-4204-4b3a-b84b-850d4b69f494"
+  "GUID": "59bd753c-4204-4b3a-b84b-850d4b69f494.IntuneTemplate.json"
 }

Config/b79d0123-3105-4c5d-9f15-62cc7a7eb7e1.IntuneTemplate.json

@@ -3,5 +3,5 @@
   "Description": "Configures the first profile on a device to always use the e-mail address of the currently logged on user.",
   "RAWJson": "{\"name\":\"Automatic configuration of Outlook\",\"description\":\"\",\"platforms\":\"windows10\",\"technologies\":\"mdm\",\"roleScopeTagIds\":[\"0\"],\"settings\":[{\"@odata.type\":\"#microsoft.graph.deviceManagementConfigurationSetting\",\"settingInstance\":{\"@odata.type\":\"#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance\",\"settingDefinitionId\":\"user_vendor_msft_policy_config_outlk16v2~policy~l_microsoftofficeoutlook~l_toolsaccounts~l_exchangesettings_l_automaticallyconfigureprofilebasedonactiveonce\",\"choiceSettingValue\":{\"@odata.type\":\"#microsoft.graph.deviceManagementConfigurationChoiceSettingValue\",\"value\":\"user_vendor_msft_policy_config_outlk16v2~policy~l_microsoftofficeoutlook~l_toolsaccounts~l_exchangesettings_l_automaticallyconfigureprofilebasedonactiveonce_1\",\"children\":[]}}}]}",
   "Type": "Catalog",
-  "GUID": "b79d0123-3105-4c5d-9f15-62cc7a7eb7e1"
+  "GUID": "b79d0123-3105-4c5d-9f15-62cc7a7eb7e1.IntuneTemplate.json"
 }