Merge branch 'KelvinTegelaar:master' into master

AntoJUICT · Mar 15, 2024 · f5a4483 · f5a4483
2 parents 7544454 + 4e0a100
commit f5a4483
Show file tree

Hide file tree

Showing 75 changed files with 956 additions and 951 deletions.
diff --git a/.github/workflows/dev_cippckdtz.yml b/.github/workflows/dev_cippckdtz.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 - cippckdtz
+
+on:
+  push:
+    branches:
+      - dev
+  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: 'cippckdtz'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_2101C7175BFB47E58240ABD1E72E81C2 }}
diff --git a/ExecExtensionNinjaOneQueue/function.json b/ExecExtensionNinjaOneQueue/function.json
diff --git a/ExecExtensionNinjaOneQueue/run.ps1 b/ExecExtensionNinjaOneQueue/run.ps1
diff --git a/ExecGDAPInviteApproved_Timer/function.json b/ExecGDAPInviteApproved_Timer/function.json
@@ -7,10 +7,9 @@
       "schedule": "0 0 */3 * * *"
     },
     {
-      "type": "queue",
-      "direction": "out",
-      "name": "gdapinvitequeue",
-      "queueName": "gdapinvitequeue"
+      "name": "starter",
+      "type": "durableClient",
+      "direction": "in"
     }
   ]
 }
diff --git a/ExecGDAPInviteQueue/function.json b/ExecGDAPInviteQueue/function.json
diff --git a/ExecGDAPInviteQueue/run.ps1 b/ExecGDAPInviteQueue/run.ps1
diff --git a/ExecScheduledCommand/function.json b/ExecScheduledCommand/function.json
diff --git a/ExecScheduledCommand/run.ps1 b/ExecScheduledCommand/run.ps1
diff --git a/ListLicensesAllTenants/function.json b/ListLicensesAllTenants/function.json
diff --git a/ListLicensesAllTenants/run.ps1 b/ListLicensesAllTenants/run.ps1
diff --git a/ListMFAUsersAllTenants/function.json b/ListMFAUsersAllTenants/function.json
diff --git a/ListMFAUsersAllTenants/run.ps1 b/ListMFAUsersAllTenants/run.ps1
diff --git a/ListMailboxRulesAllTenants/function.json b/ListMailboxRulesAllTenants/function.json
diff --git a/MailProviders/Mesh.json b/MailProviders/Mesh.json
diff --git a/Modules/CIPPCore/Public/Add-CIPPGroupMember.ps1 b/Modules/CIPPCore/Public/Add-CIPPGroupMember.ps1
@@ -16,7 +16,7 @@ function Add-CIPPGroupMember(
         } else {
             New-GraphPostRequest -uri "https://graph.microsoft.com/beta/groups/$($GroupId)" -tenantid $TenantFilter -type patch -body $addmemberbody -Verbose
         }
-        $Message = "Successfully added user $($Member) to $GroupId."
+        $Message = "Successfully added user $($Member) to $($GroupId)."
         Write-LogMessage -user $ExecutingUser -API $APIName -tenant $TenantFilter -message $Message -Sev 'Info'
         return $message
         return

diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-AddUser.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-AddUser.ps1
@@ -59,6 +59,7 @@ Function Invoke-AddUser {
     } catch {
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($userobj.tenantid) -message "Failed to create user. Error:$($_.Exception.Message)" -Sev 'Error'
         $body = $results.add("Failed to create user. $($_.Exception.Message)" )
+        exit 1
     }
 
     try {
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,6 +59,7 @@ Function Invoke-AddUser { @@
         } catch {
             Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($userobj.tenantid) -message "Failed to create user. Error:$($_.Exception.Message)" -Sev 'Error'
             $body = $results.add("Failed to create user. $($_.Exception.Message)" )
+            exit 1
         }
         try {
@@ Expand Down @@