Merge pull request #946 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

CommunityRepos.json

@@ -1,6 +1,7 @@
 [
   {
     "Id": "1041442982",
+    "BuiltIn": true,
     "Name": "CISTemplates",
     "Description": "CIPP CIS Templates",
     "URL": "https://github.com/CyberDrain/CyberDrain-CIS-Templates",
@@ -19,6 +20,7 @@
   },
   {
     "Id": "930523724",
+    "BuiltIn": true,
     "Name": "CIPP-Templates",
     "Description": "CIPP Community Templates",
     "URL": "https://github.com/CyberDrain/CIPP-Templates",
@@ -37,6 +39,7 @@
   },
   {
     "Id": "784230225",
+    "BuiltIn": true,
     "Name": "ConditionalAccessBaseline",
     "Description": "",
     "URL": "https://github.com/j0eyv/ConditionalAccessBaseline",
@@ -55,6 +58,7 @@
   },
   {
     "Id": "493403016",
+    "BuiltIn": true,
     "Name": "OpenIntuneBaseline",
     "Description": "Community-driven baseline to accelerate Intune adoption and learning.",
     "URL": "https://github.com/SkipToTheEndpoint/OpenIntuneBaseline",
@@ -73,6 +77,7 @@
   },
   {
     "Id": "863076113",
+    "BuiltIn": true,
     "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",

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Tools/GitHub/Invoke-ListCommunityRepos.ps1

@@ -23,16 +23,16 @@ function Invoke-ListCommunityRepos {
     $Repos = Get-CIPPAzDataTableEntity @Table -Filter $Filter
 
     if (!$Request.Query.WriteAccess) {
-        $CIPPRoot = (Get-Item (Get-Module -Name CIPPCore).ModuleBase).Parent.Parent.FullName
-        $CommunityRepos = Join-Path -Path $CIPPRoot -ChildPath 'CommunityRepos.json'
+        $CommunityRepos = Join-Path $env:CIPPRootPath 'CommunityRepos.json'
         $DefaultCommunityRepos = [System.IO.File]::ReadAllText($CommunityRepos) | ConvertFrom-Json
 
         $DefaultsMissing = $false
         foreach ($Repo in $DefaultCommunityRepos) {
-            if ($Repos.Url -notcontains $Repo.Url) {
+            if ($Repos.Url -notcontains $Repo.Url -or $Repos.Buitin -notcontains $Repo.BuiltIn) {
                 $Entity = [PSCustomObject]@{
                     PartitionKey  = 'CommunityRepos'
                     RowKey        = $Repo.Id
+                    BuiltIn       = $Repo.BuiltIn
                     Name          = $Repo.Name
                     Description   = $Repo.Description
                     URL           = $Repo.URL
@@ -44,7 +44,7 @@ function Invoke-ListCommunityRepos {
                     UploadBranch  = $Repo.DefaultBranch
                     Permissions   = [string]($Repo.RepoPermissions | ConvertTo-Json -ErrorAction SilentlyContinue -Compress)
                 }
-                Add-CIPPAzDataTableEntity @Table -Entity $Entity
+                Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
                 $DefaultsMissing = $true
             }
         }
@@ -56,6 +56,7 @@ function Invoke-ListCommunityRepos {
     $Repos = $Repos | ForEach-Object {
         [pscustomobject]@{
             Id              = $_.RowKey
+            BuiltIn         = $_.BuiltIn
             Name            = $_.Name
             Description     = $_.Description
             URL             = $_.URL