From 196c7ab8c63e7d59a703581ecace79362392daf7 Mon Sep 17 00:00:00 2001
From: Raphael Buechi <raphael.buechi@axelion.ch>
Date: Fri, 13 Sep 2024 18:30:22 +0200
Subject: [PATCH] Refactored BPA

---
 ...Template.json => AXE-TENANT-EID.BPATemplate.json} |  2 +-
 ...Template.json => AXE-TENANT-EXO.BPATemplate.json} |  2 +-
 ...plate.json => AXE-TENANT-INTUNE.BPATemplate.json} | 12 ++++++------
 ...Template.json => AXE-TENANT-SPO.BPATemplate.json} |  2 +-
 ...Template.json => AXE-TENANT-TMS.BPATemplate.json} |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename Config/{AXE-TENANT-0-EID.BPATemplate.json => AXE-TENANT-EID.BPATemplate.json} (99%)
 rename Config/{AXE-TENANT-1-EXO.BPATemplate.json => AXE-TENANT-EXO.BPATemplate.json} (98%)
 rename Config/{AXE-TENANT-4-INTUNE.BPATemplate.json => AXE-TENANT-INTUNE.BPATemplate.json} (88%)
 rename Config/{AXE-TENANT-2-SPO.BPATemplate.json => AXE-TENANT-SPO.BPATemplate.json} (99%)
 rename Config/{AXE-TENANT-3-TMS.BPATemplate.json => AXE-TENANT-TMS.BPATemplate.json} (62%)

diff --git a/Config/AXE-TENANT-0-EID.BPATemplate.json b/Config/AXE-TENANT-EID.BPATemplate.json
similarity index 99%
rename from Config/AXE-TENANT-0-EID.BPATemplate.json
rename to Config/AXE-TENANT-EID.BPATemplate.json
index 29d710acc5ee..1a94b296bf77 100644
--- a/Config/AXE-TENANT-0-EID.BPATemplate.json
+++ b/Config/AXE-TENANT-EID.BPATemplate.json
@@ -1,5 +1,5 @@
 {
-  "name": "0 - Entra ID",
+  "name": "Entra ID",
   "style": "Tenant",
   "Fields": [
     {
diff --git a/Config/AXE-TENANT-1-EXO.BPATemplate.json b/Config/AXE-TENANT-EXO.BPATemplate.json
similarity index 98%
rename from Config/AXE-TENANT-1-EXO.BPATemplate.json
rename to Config/AXE-TENANT-EXO.BPATemplate.json
index e897955b61db..e13a702f18cc 100644
--- a/Config/AXE-TENANT-1-EXO.BPATemplate.json
+++ b/Config/AXE-TENANT-EXO.BPATemplate.json
@@ -1,5 +1,5 @@
 {
-  "name": "1 - Exchange Online",
+  "name": "Exchange Online",
   "style": "Tenant",
   "Fields": [
     {
diff --git a/Config/AXE-TENANT-4-INTUNE.BPATemplate.json b/Config/AXE-TENANT-INTUNE.BPATemplate.json
similarity index 88%
rename from Config/AXE-TENANT-4-INTUNE.BPATemplate.json
rename to Config/AXE-TENANT-INTUNE.BPATemplate.json
index 3cb5e519d364..a7a7f2d97fbc 100644
--- a/Config/AXE-TENANT-4-INTUNE.BPATemplate.json
+++ b/Config/AXE-TENANT-INTUNE.BPATemplate.json
@@ -1,22 +1,22 @@
 {
-  "name": "4 - Intune",
+  "name": "Intune",
   "style": "Tenant",
   "Fields": [
     {
-      "name": "AzureADJoinEnableGlobalAdmins",
+      "name": "EntraIdJoinGlobalAdminsAreNotLocalAdmins",
       "API": "Graph",
       "URL": "https://graph.microsoft.com/beta/policies/deviceRegistrationPolicy?$select=azureADJoin",
       "ExtractFields": [
         "azureADJoin"
       ],
-      "where": "$_.azureADJoin.localAdmins.enableGlobalAdmins -eq true",
-      "StoreAs": "JSON",
+      "where": "$_.azureADJoin.localAdmins.enableGlobalAdmins -eq $false",
+      "StoreAs": "bool",
       "FrontendFields": [
         {
           "name": "Global device admins disabled",
           "desc": "Check if Global Admins Group SID gets added to the local administrators group after Entra ID join",
-          "value": "AzureADJoinEnableGlobalAdmins.localAdmins.enableGlobalAdmins",
-          "formatter": "reverseBool"
+          "value": "EntraIdJoinGlobalAdminsAreNotLocalAdmins",
+          "formatter": "bool"
         }
       ]
     },
diff --git a/Config/AXE-TENANT-2-SPO.BPATemplate.json b/Config/AXE-TENANT-SPO.BPATemplate.json
similarity index 99%
rename from Config/AXE-TENANT-2-SPO.BPATemplate.json
rename to Config/AXE-TENANT-SPO.BPATemplate.json
index 69ce59ea335c..80ec873f99c5 100644
--- a/Config/AXE-TENANT-2-SPO.BPATemplate.json
+++ b/Config/AXE-TENANT-SPO.BPATemplate.json
@@ -1,5 +1,5 @@
 {
-  "name": "2 - SharePoint Online",
+  "name": "SharePoint Online",
   "style": "Tenant",
   "Fields": [
     {
diff --git a/Config/AXE-TENANT-3-TMS.BPATemplate.json b/Config/AXE-TENANT-TMS.BPATemplate.json
similarity index 62%
rename from Config/AXE-TENANT-3-TMS.BPATemplate.json
rename to Config/AXE-TENANT-TMS.BPATemplate.json
index e432dcbe85d7..bba6ebf67688 100644
--- a/Config/AXE-TENANT-3-TMS.BPATemplate.json
+++ b/Config/AXE-TENANT-TMS.BPATemplate.json
@@ -1,5 +1,5 @@
 {
-  "name": "3 - Teams",
+  "name": "Teams",
   "style": "Tenant",
   "Fields": []
 }
\ No newline at end of file