3.2.1

dobrien23 · Sep 4, 2021 · 58abeeb · 58abeeb
1 parent 95bd8fc
commit 58abeeb
Show file tree

Hide file tree

Showing 37 changed files with 882 additions and 136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 .vs/
 .vscode/
 .git/
-/CloudAPIPowerShellManagement.Log
-/CloudAPIPowerShellManagement.Lo_
-/Documentation/Get-LanguageStrings.ps1
+/*.Log
+/*.Lo_
 /*.csv
 
diff --git a/Core.psm1 b/Core.psm1
@@ -12,7 +12,7 @@ This module handles the WPF UI
 
 function Get-ModuleVersion
 {
-    '3.1.5'
+    '3.1.6'
 }
 
 function Start-CoreApp
@@ -484,7 +484,7 @@ function Show-UpdatesDialog
     $content = Invoke-RestMethod "https://api.github.com/repos/Micke-K/IntuneManagement/contents/ReleaseNotes.md"
     if($content)
     {
-        $txt = [System.Text.Encoding]::ASCII.GetString(([System.Convert]::FromBase64String($content.content)))
+        $txt = [System.Text.Encoding]::UTF8.GetString(([System.Convert]::FromBase64String($content.content)))
         Set-XamlProperty $script:dlgUpdates "txtReleaseNotes" "Text" $txt
 
         if($content.sha -ne $curHash.Hash)
@@ -1528,8 +1528,8 @@ function Get-JWTtoken
     while ($payload.Length % 4) { $payload += "=" } # Add padding to match required length
 
     return (New-Object PSObject -Property @{
-        Header=(([System.Text.Encoding]::ASCII.GetString(([System.Convert]::FromBase64String($header)))) | ConvertFrom-Json)
-        Payload=(([System.Text.Encoding]::ASCII.GetString(([System.Convert]::FromBase64String($payload)))) | ConvertFrom-Json)
+        Header=(([System.Text.Encoding]::UTF8.GetString(([System.Convert]::FromBase64String($header)))) | ConvertFrom-Json)
+        Payload=(([System.Text.Encoding]::UTF8.GetString(([System.Convert]::FromBase64String($payload)))) | ConvertFrom-Json)
     })
 }
 #endregion

diff --git a/Documentation.md b/Documentation.md
@@ -109,7 +109,7 @@ These files will have to be re-generated when new functionality is released in I
 
 **Scripts for Generated Files**
 
-The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time. 
+The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
 
 ## Extending The Documentation
 
@@ -130,7 +130,7 @@ The priority order for object documentation is:
 
 **Documentation Provider**
 
-The documentation provider takes care of the collection information about the object. The `DocumentationCustom.psm1`file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
+The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1`file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
 
 Documentation providers has a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 

diff --git a/Documentation/ObjectInfo/#Applications.json b/Documentation/ObjectInfo/#Applications.json
@@ -351,6 +351,22 @@
             ]
         }
     },
+    {
+        "nameResourceKey":  "OfficeSuiteAppsTab.xmlConfigurationLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "MSAppsConfigXml",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.officeSuiteApp"
+                }
+            ]
+        }                
+    },
     {
         "nameResourceKey":  "OfficeSuiteAppsTab.appsToBeInstalledLabel",
         "descriptionResourceKey":  "OfficeSuiteAppsTab.selectOfficeAppsTooltip",
@@ -393,7 +409,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -419,7 +440,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -433,7 +459,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -459,7 +490,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -497,7 +533,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -513,7 +554,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -529,7 +575,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -543,7 +594,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -559,7 +615,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -575,7 +636,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -591,7 +657,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -607,7 +678,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -660,7 +736,12 @@
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",
         "unconfiguredValue": "os-default",
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"

diff --git a/Documentation/ObjectInfo/#microsoft.graph.deviceHealthScript.json b/Documentation/ObjectInfo/#microsoft.graph.deviceHealthScript.json
@@ -0,0 +1,41 @@
+[
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.DetectionScriptMultiLineTextBox.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "detectionScriptAdded",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RemediationScriptMultiLineTextBox.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "remediationScriptAdded",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.LoggedOnCredentialsOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "useLoggedOnCredentials",
+        "dataType":  0,
+        "booleanActions":  109
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.EnforceScriptSignatureCheckOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "enforceSignatureCheck",
+        "dataType":  0,
+        "booleanActions":  109
+
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RunIn64BitPSOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "runAs32Bit",
+        "dataType":  0,
+        "booleanActions":  110
+
+    }
+]
diff --git a/Documentation/Strings-cs.json b/Documentation/Strings-cs.json
diff --git a/Documentation/Strings-de.json b/Documentation/Strings-de.json
diff --git a/Documentation/Strings-en.json b/Documentation/Strings-en.json
diff --git a/Documentation/Strings-es.json b/Documentation/Strings-es.json
diff --git a/Documentation/Strings-fr.json b/Documentation/Strings-fr.json
diff --git a/Documentation/Strings-hu.json b/Documentation/Strings-hu.json
diff --git a/Documentation/Strings-it.json b/Documentation/Strings-it.json
diff --git a/Documentation/Strings-ja.json b/Documentation/Strings-ja.json
diff --git a/Documentation/Strings-ko.json b/Documentation/Strings-ko.json
diff --git a/Documentation/Strings-nl.json b/Documentation/Strings-nl.json
diff --git a/Documentation/Strings-pl.json b/Documentation/Strings-pl.json
diff --git a/Documentation/Strings-pt.json b/Documentation/Strings-pt.json
diff --git a/Documentation/Strings-ru.json b/Documentation/Strings-ru.json
diff --git a/Documentation/Strings-sv.json b/Documentation/Strings-sv.json
diff --git a/Documentation/Strings-tr.json b/Documentation/Strings-tr.json
diff --git a/Documentation/Strings-zh-chs.json b/Documentation/Strings-zh-chs.json
diff --git a/Documentation/Strings-zh-cht.json b/Documentation/Strings-zh-cht.json
diff --git a/Documentation/Strings-zh-hans.json b/Documentation/Strings-zh-hans.json
diff --git a/Documentation/Strings-zh-hant.json b/Documentation/Strings-zh-hant.json
diff --git a/Documentation/Strings-zh.json b/Documentation/Strings-zh.json
diff --git a/Extensions/Compare.psm1 b/Extensions/Compare.psm1
@@ -11,7 +11,7 @@ Objects can be compared based on Properties or Documentatation info.
 
 function Get-ModuleVersion
 {
-    '1.0.6'
+    '1.0.7'
 }
 
 function Invoke-InitializeModule
@@ -399,8 +399,9 @@ function Invoke-BulkCompareNamedObjects
             }
             else
             {
-                # Add objects that are exported but deleted
-                Write-Log "Object '$((Get-GraphObjectName $graphObj.Object $graphObj.ObjectType))' with id $($graphObj.Object.Id) has no matching object with the compate pattern" 2
+                $sourceObj = Get-GraphObject $graphObj.Object $graphObj.ObjectType 
+                # Add objects that are exported but deleted/not imported etc.
+                Write-Log "Object '$((Get-GraphObjectName $graphObj.Object $graphObj.ObjectType))' with id $($graphObj.Object.Id) has no matching object with the compare pattern" 2
                 $compareProperties = @([PSCustomObject]@{
                         Object1Value = (Get-GraphObjectName $graphObj.Object $graphObj.ObjectType)
                         Object2Value = $null
@@ -828,7 +829,15 @@ function Compare-Objects
 
     $script:compareProperties = @()
 
-    if($global:cbCompareType.SelectedItem.Compare)
+    if($obj1.'@OData.Type' -eq "#microsoft.graph.deviceManagementConfigurationPolicy" -or 
+        $obj1.'@OData.Type' -eq "#microsoft.graph.deviceManagementIntent" -or 
+        $obj1.'@OData.Type' -eq "#microsoft.graph.groupPolicyConfiguration")
+    {
+        # Always use documentation for Settings Catalog, Endpoint Security and Administrative Template policies
+        # These use Graph API for docummentation and all properties will be documented
+        $compareResult = Compare-ObjectsBasedonDocumentation $obj1 $obj2 $objectType
+    }
+    elseif($global:cbCompareType.SelectedItem.Compare)
     {
         $compareResult = & $global:cbCompareType.SelectedItem.Compare $obj1 $obj2 $objectType
     }