Merge branch 'KelvinTegelaar:master' into master

AntoJUICT · Sep 27, 2023 · 8f8e95f · 8f8e95f
2 parents 74aff98 + 7c16c74
commit 8f8e95f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/EditGroup/run.ps1 b/EditGroup/run.ps1
@@ -18,7 +18,8 @@ if ($AddMembers) {
     $AddMembers | ForEach-Object {
         try {
             $member = $_
-            $MemberIDs = "https://graph.microsoft.com/v1.0/directoryObjects/" + (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($_)" -tenantid $Userobj.tenantid).id 
+            if ($member -like '*#EXT#*') { $member = [System.Web.HttpUtility]::UrlEncode($member) }
+            $MemberIDs = "https://graph.microsoft.com/v1.0/directoryObjects/" + (New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users/$($member)" -tenantid $Userobj.tenantid).id 
             $addmemberbody = "{ `"[email protected]`": $(ConvertTo-Json @($MemberIDs)) }"
             if ($userobj.groupType -eq "Distribution list" -or $userobj.groupType -eq "Mail-Enabled Security") {
                 $Params = @{ Identity = $userobj.groupid; Member = $member; BypassSecurityGroupManagerCheck = $true }
@@ -47,11 +48,12 @@ if ($AddContacts) {
                 New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Add-DistributionGroupMember" -cmdParams $params  -UseSystemMailbox $true
                 Write-LogMessage -API $APINAME -tenant $Userobj.tenantid -user $request.headers.'x-ms-client-principal' -message "Added $member to $($userobj.groupid) group" -Sev "Info"
                 $body = $results.add("Success. $member has been added")
-        } else {
-            Write-LogMessage -API $APINAME -tenant $Userobj.tenantid -user $request.headers.'x-ms-client-principal' -message "You cannot add a contact to a security group" -Sev "Error"
-            $body = $results.add("You cannot add a contact to a security group")
+            }
+            else {
+                Write-LogMessage -API $APINAME -tenant $Userobj.tenantid -user $request.headers.'x-ms-client-principal' -message "You cannot add a contact to a security group" -Sev "Error"
+                $body = $results.add("You cannot add a contact to a security group")
+            }
         }
-    }
         catch {
             $body = $results.add("Failed to add member $member to $($userobj.Groupid): $($_.Exception.Message)")
         }
@@ -149,16 +151,16 @@ if ($userobj.allowExternal -eq 'true') {
 
 if ($userobj.sendCopies -eq 'true') {
     try {
-            $Params = @{ Identity = $userobj.Groupid; subscriptionEnabled = $true; AutoSubscribeNewMembers = $true }
-            New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Set-UnifiedGroup" -cmdParams $params -useSystemMailbox $true
+        $Params = @{ Identity = $userobj.Groupid; subscriptionEnabled = $true; AutoSubscribeNewMembers = $true }
+        New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Set-UnifiedGroup" -cmdParams $params -useSystemMailbox $true
 
-            $MemberParams = @{ Identity = $userobj.Groupid; LinkType = "members" }
-            $Members = New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Get-UnifiedGrouplinks" -cmdParams $MemberParams
+        $MemberParams = @{ Identity = $userobj.Groupid; LinkType = "members" }
+        $Members = New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Get-UnifiedGrouplinks" -cmdParams $MemberParams
 
-            $MemberSmtpAddresses = $Members | ForEach-Object { $_.PrimarySmtpAddress }
+        $MemberSmtpAddresses = $Members | ForEach-Object { $_.PrimarySmtpAddress }
 
-            $subscriberParams = @{ Identity = $userobj.Groupid; LinkType = "subscribers"; Links = @($MemberSmtpAddresses) }
-            New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Add-UnifiedGrouplinks" -cmdParams $subscriberParams -Anchor $userobj.mail
+        $subscriberParams = @{ Identity = $userobj.Groupid; LinkType = "subscribers"; Links = @($MemberSmtpAddresses) }
+        New-ExoRequest -tenantid $Userobj.tenantid -cmdlet "Add-UnifiedGrouplinks" -cmdParams $subscriberParams -Anchor $userobj.mail
 
 
         $body = $results.add("Send Copies of team emails and events to team members inboxes for $($userobj.mail) enabled.")

diff --git a/GetCippAlerts/run.ps1 b/GetCippAlerts/run.ps1
@@ -16,7 +16,7 @@ $APIVersion = Get-Content "version_latest.txt" | Out-String
 $CIPPVersion = $request.query.localversion
 
 $RemoteAPIVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP-API/master/version_latest.txt"
-$RemoteCIPPVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP/master/version_latest.txt"
+$RemoteCIPPVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP/master/public/version_latest.txt"
 
 $version = [PSCustomObject]@{
     LocalCIPPVersion     = $CIPPVersion

diff --git a/GetVersion/run.ps1 b/GetVersion/run.ps1
@@ -10,7 +10,7 @@ $APIVersion = Get-Content "version_latest.txt" | Out-String
 $CIPPVersion = $request.query.localversion
 
 $RemoteAPIVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP-API/master/version_latest.txt"
-$RemoteCIPPVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP/master/version_latest.txt"
+$RemoteCIPPVersion = Invoke-RestMethod -Uri "https://raw.githubusercontent.com/KelvinTegelaar/CIPP/master/public/version_latest.txt"
 
 $version = [PSCustomObject]@{
     LocalCIPPVersion     = $CIPPVersion

diff --git a/GraphHelper.psm1 b/GraphHelper.psm1
@@ -552,7 +552,7 @@ function Remove-CIPPCache {
 function New-ExoRequest ($tenantid, $cmdlet, $cmdParams, $useSystemMailbox, $Anchor, $NoAuthCheck) {
     if ((Get-AuthorisedRequest -TenantID $tenantid) -or $NoAuthCheck -eq $True) {
         $token = Get-ClassicAPIToken -resource 'https://outlook.office365.com' -Tenantid $tenantid
-        $tenant = (get-tenants | Where-Object -Property defaultDomainName -EQ $tenantid).customerId
+        $tenant = (get-tenants -IncludeErrors | Where-Object -Property defaultDomainName -EQ $tenantid).customerId
         if ($cmdParams) {
             $Params = $cmdParams
         }

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-4.3.0
+4.3.1