Merge pull request #593 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/CippCore.psd1

@@ -69,7 +69,8 @@ function Add-CIPPDelegatedPermission {
         }
     }
 
-    $Translator = Get-Content '.\PermissionsTranslator.json' | ConvertFrom-Json
+    $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
+    $Translator = Get-Content (Join-Path $ModuleBase 'lib\data\PermissionsTranslator.json') | ConvertFrom-Json
     $ServicePrincipalList = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=appId,id,displayName&`$top=999" -tenantid $TenantFilter -skipTokenCache $true -NoAuthCheck $true
     $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property appId -EQ $ApplicationId
     $Results = [System.Collections.Generic.List[string]]::new()

Modules/CIPPCore/Public/Add-CIPPDelegatedPermission.ps1

@@ -22,7 +22,7 @@ function Invoke-ExecExchangeRoleRepair {
         Write-Information "Found $($RoleDefinitions.Count) Exchange role definitions"
 
         $BasePath = Get-Module -Name 'CIPPCore' | Select-Object -ExpandProperty ModuleBase
-        $AllOrgManagementRoles = Get-Content -Path "$BasePath\Public\OrganizationManagementRoles.json" -ErrorAction Stop | ConvertFrom-Json
+        $AllOrgManagementRoles = Get-Content -Path "$BasePath\lib\data\OrganizationManagementRoles.json" -ErrorAction Stop | ConvertFrom-Json
 
         $AvailableRoles = $RoleDefinitions | Where-Object -Property displayName -In $AllOrgManagementRoles | Select-Object -Property displayName, id, description
         Write-Information "Found $($AvailableRoles.Count) available Organization Management roles in Exchange"

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExchangeRoleRepair.ps1

@@ -24,15 +24,15 @@ function Invoke-ExecCreateSAMApp {
                 $state = 'updated'
                 #remove the entire web object from the app registration
                 $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
-                $SamManifestFile = Get-Item (Join-Path $ModuleBase 'Public\SAMManifest.json')
+                $SamManifestFile = Get-Item (Join-Path $ModuleBase 'lib\data\SAMManifest.json')
                 $app = Get-Content $SamManifestFile.FullName | ConvertFrom-Json
                 $app.web.redirectUris = @("$($url)/authredirect")
                 $app = ConvertTo-Json -Depth 15 -Compress -InputObject $app
                 Invoke-RestMethod "https://graph.microsoft.com/v1.0/applications/$($AppId.id)" -Headers @{ authorization = "Bearer $($Token.access_token)" } -Method PATCH -Body $app -ContentType 'application/json'
             } else {
                 $state = 'created'
                 $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
-                $SamManifestFile = Get-Item (Join-Path $ModuleBase 'Public\SAMManifest.json')
+                $SamManifestFile = Get-Item (Join-Path $ModuleBase 'lib\data\SAMManifest.json')
                 $app = Get-Content $SamManifestFile.FullName | ConvertFrom-Json
                 $app.web.redirectUris = @("$($url)/authredirect")
                 $app = $app | ConvertTo-Json -Depth 15

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1

@@ -145,7 +145,7 @@ function Invoke-ExecSAMSetup {
                 if ($PartnerSetup) {
                     #$app = Get-Content '.\Cache_SAMSetup\SAMManifest.json' | ConvertFrom-Json
                     $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
-                    $SamManifestFile = Get-Item (Join-Path $ModuleBase 'Public\SAMManifest.json')
+                    $SamManifestFile = Get-Item (Join-Path $ModuleBase 'lib\data\SAMManifest.json')
                     $app = Get-Content $SamManifestFile.FullName | ConvertFrom-Json
 
                     $App.web.redirectUris = @($App.web.redirectUris + $URL)

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecSAMSetup.ps1

@@ -7,7 +7,8 @@ Function Invoke-ListUsers {
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
-    $ConvertTable = Import-Csv ConversionTable.csv | Sort-Object -Property 'guid' -Unique
+    $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
+    $ConvertTable = Import-Csv (Join-Path $ModuleBase 'lib\data\ConversionTable.csv') | Sort-Object -Property 'guid' -Unique
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter
     $GraphFilter = $Request.Query.graphFilter

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUsers.ps1

@@ -50,8 +50,8 @@ function Get-CIPPLicenseOverview {
         Tenant   = $TenantFilter
         Licenses = $LicRequest
     }
-    Set-Location (Get-Item $PSScriptRoot).FullName
-    $ConvertTable = Import-Csv ConversionTable.csv
+    $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
+    $ConvertTable = Import-Csv (Join-Path $ModuleBase 'lib\data\ConversionTable.csv')
     $LicenseTable = Get-CIPPTable -TableName ExcludedLicenses
     $ExcludedSkuList = Get-CIPPAzDataTableEntity @LicenseTable
 

Modules/CIPPCore/Public/Get-CIPPLicenseOverview.ps1

@@ -9,8 +9,8 @@ function Convert-SKUname {
         $ConvertTable
     )
     if (!$ConvertTable) {
-        Set-Location (Get-Item $PSScriptRoot).Parent.FullName
-        $ConvertTable = Import-Csv ConversionTable.csv
+        $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
+        $ConvertTable = Import-Csv (Join-Path $ModuleBase 'lib\data\ConversionTable.csv')
     }
     if ($SkuName) { $ReturnedName = ($ConvertTable | Where-Object { $_.String_Id -eq $SkuName } | Select-Object -Last 1).'Product_Display_Name' }
     if ($SkuID) { $ReturnedName = ($ConvertTable | Where-Object { $_.guid -eq $SkuID } | Select-Object -Last 1).'Product_Display_Name' }

Modules/CIPPCore/Public/GraphHelper/Convert-SKUName.ps1

@@ -25,8 +25,8 @@ function Get-CippSamPermissions {
 
     if (!$SavedOnly.IsPresent) {
         $ModuleBase = Get-Module -Name CIPPCore | Select-Object -ExpandProperty ModuleBase
-        $SamManifestFile = Get-Item (Join-Path $ModuleBase 'Public\SAMManifest.json')
-        $AdditionalPermissions = Get-Item (Join-Path $ModuleBase 'Public\AdditionalPermissions.json')
+        $SamManifestFile = Get-Item (Join-Path $ModuleBase 'lib\data\SAMManifest.json')
+        $AdditionalPermissions = Get-Item (Join-Path $ModuleBase 'lib\data\AdditionalPermissions.json')
 
         $ServicePrincipalList = New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/servicePrincipals?$top=999&$select=id,appId,displayName' -tenantid $env:TenantID -NoAuthCheck $true
         $SAMManifest = Get-Content -Path $SamManifestFile.FullName | ConvertFrom-Json

Modules/CIPPCore/Public/GraphHelper/Get-CippSamPermissions.ps1

@@ -88,7 +88,9 @@ function New-CIPPBackup {
             }
             $Table = Get-CippTable -tablename 'ScheduledBackup'
             try {
-                $null = Add-CIPPAzDataTableEntity @Table -entity $entity -Force
+                measure-cipptask -TaskName 'ScheduledBackupStorage' -EventName 'CIPP.BackupCompleted' -Script {
+                    $null = Add-CIPPAzDataTableEntity @Table -entity $entity -Force
+                }
                 Write-LogMessage -headers $Headers -API $APINAME -message 'Created backup' -Sev 'Debug'
                 $State = 'Backup finished successfully'
             } catch {