Merge pull request #31 from KelvinTegelaar/master

[pull] master from KelvinTegelaar:master

Author: pull[bot]

.github/instructions/cippdb.instructions.md

@@ -119,7 +119,7 @@ Search-CIPPDbData -TenantFilter $Tenant -SearchTerms @('john', 'admin') -Types @
 
 ## Cache types
 
-Available types are defined in `CIPPDBCacheTypes.json`. Each type maps to a `Set-CIPPDBCache*` writer function. Check that file for the current type list — it covers identity, Exchange, security, Intune, compliance, and usage data.
+Available types are defined in `Config\CIPPDBCacheTypes.json`. Each type maps to a `Set-CIPPDBCache*` writer function. Check that file for the current type list — it covers identity, Exchange, security, Intune, compliance, and usage data.
 
 ## Writing a new Set-CIPPDBCache* function
 

.github/workflows/upload_dev.yml

@@ -21,7 +21,7 @@ jobs:
       # Create version.json with version and commit hash
       - name: Create version.json
         run: |
-          VERSION=$(cat version_latest.txt | tr -d '[:space:]')
+          VERSION=$(cat ./version_latest.txt | tr -d '[:space:]')
           SHORT_SHA="${GITHUB_SHA::7}"
           echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > version.json
 

CIPPDBCacheTypes.json Config/CIPPDBCacheTypes.jsonCIPPDBCacheTypes.json renamed to Config/CIPPDBCacheTypes.json

@@ -254,11 +254,26 @@
     "friendlyName": "Mailbox Usage",
     "description": "Exchange Online mailbox usage statistics"
   },
+  {
+    "type": "OneDriveSiteListing",
+    "friendlyName": "OneDrive Site Listing",
+    "description": "OneDrive personal site listing details used for usage reporting"
+  },
   {
     "type": "OneDriveUsage",
     "friendlyName": "OneDrive Usage",
     "description": "OneDrive usage statistics"
   },
+  {
+    "type": "SharePointSiteListing",
+    "friendlyName": "SharePoint Site Listing",
+    "description": "SharePoint site listing details used for usage reporting"
+  },
+  {
+    "type": "SharePointSiteUsage",
+    "friendlyName": "SharePoint Site Usage",
+    "description": "SharePoint site usage statistics"
+  },
   {
     "type": "OfficeActivations",
     "friendlyName": "Office Activations",

CIPPTimers.json Config/CIPPTimers.jsonCIPPTimers.json renamed to Config/CIPPTimers.json

@@ -1,10 +1,19 @@
 {
   "readonly": {
-    "include": ["*.Read"],
-    "exclude": ["CIPP.SuperAdmin.*"]
+    "include": [
+      "*.Read"
+    ],
+    "exclude": [
+      "CIPP.SuperAdmin.*",
+      "CIPP.Admin.*",
+      "CIPP.AppSettings.*"
+    ]
   },
   "editor": {
-    "include": ["*.Read", "*.ReadWrite"],
+    "include": [
+      "*.Read",
+      "*.ReadWrite"
+    ],
     "exclude": [
       "CIPP.SuperAdmin.*",
       "CIPP.Admin.*",
@@ -13,11 +22,17 @@
     ]
   },
   "admin": {
-    "include": ["*"],
-    "exclude": ["CIPP.SuperAdmin.*"]
+    "include": [
+      "*"
+    ],
+    "exclude": [
+      "CIPP.SuperAdmin.*"
+    ]
   },
   "superadmin": {
-    "include": ["*"],
+    "include": [
+      "*"
+    ],
     "exclude": []
   }
-}
+}

CommunityRepos.json Config/CommunityRepos.jsonCommunityRepos.json renamed to Config/CommunityRepos.json

@@ -0,0 +1 @@
+10.4.2