Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into updateEncryptionPortal

Author: roygara

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-claims-mapping.md",
+      "redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/configure-token-lifetimes.md",
+      "redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/authentication/how-to-mfa-microsoft-managed.md",
       "redirect_url": "/azure/active-directory/authentication/concept-authentication-default-enablement",

articles/active-directory/develop/TOC.yml

@@ -124,14 +124,10 @@
               href: active-directory-optional-claims.md
             - name: Configure role claim
               href: active-directory-enterprise-app-role-management.md
-            - name: Configure token lifetimes
-              href: configure-token-lifetimes.md
             - name: Customize JWT claims
               href: active-directory-jwt-claims-customization.md
             - name: Customize SAML claims
               href: active-directory-saml-claims-customization.md
-            - name: Customize claims using PowerShell
-              href: active-directory-claims-mapping.md
             - name: Directory extension attributes
               href: active-directory-schema-extensions.md
             - name: SAML app multi-instancing

articles/active-directory/develop/active-directory-claims-mapping.md

@@ -36,13 +36,28 @@ To configure directory settings to disable automatic writeback of newly created
 - PowerShell: Use the [Microsoft Graph PowerShell SDK](/powershell/microsoftgraph/installation?view=graph-powershell-1.0&preserve-view=true). For example: 
 
   ```PowerShell 
-    # Import Module
-    Import-Module Microsoft.Graph.Identity.DirectoryManagement
-
-    #Connect to MgGraph with necessary scope and select the Beta API Version
-    Connect-MgGraph -Scopes Directory.ReadWrite.All
-    Select-MgProfile -Name beta
-
+  # Import Module
+  Import-Module Microsoft.Graph.Identity.DirectoryManagement
+
+  #Connect to MgGraph with necessary scope and select the Beta API Version
+  Connect-MgGraph -Scopes Directory.ReadWrite.All
+  Select-MgProfile -Name beta
+
+  # Verify if "Group.Unified" directory settings exist
+  $DirectorySetting = Get-MgDirectorySetting | Where-Object {$_.DisplayName -eq "Group.Unified"}
+
+  # If "Group.Unified" directory settings exist, update the value for new unified group writeback default
+  if ($DirectorySetting) {
+    $DirectorySetting.Values | ForEach-Object {
+        if ($_.Name -eq "NewUnifiedGroupWritebackDefault") {
+            $_.Value = "false"
+        }
+    }
+    Update-MgDirectorySetting -DirectorySettingId $DirectorySetting.Id -BodyParameter $DirectorySetting
+  }
+  else
+  {
+    # In case the directory setting doesn't exist, create a new "Group.Unified" directory setting
     # Import "Group.Unified" template values to a hashtable
     $Template = Get-MgDirectorySettingTemplate | Where-Object {$_.DisplayName -eq "Group.Unified"}
     $TemplateValues = @{}
@@ -52,6 +67,7 @@ To configure directory settings to disable automatic writeback of newly created
 
     # Update the value for new unified group writeback default
     $TemplateValues["NewUnifiedGroupWritebackDefault"] = "false"
+    
     # Create a directory setting using the Template values hashtable including the updated value
     $params = @{}
     $params.Add("TemplateId", $Template.Id)
@@ -60,6 +76,7 @@ To configure directory settings to disable automatic writeback of newly created
         $params.Values += @(@{Name = $_; Value = $TemplateValues[$_]})
     }
     New-MgDirectorySetting -BodyParameter $params
+  }
   ``` 
 
 > [!NOTE]     

articles/active-directory/develop/configure-token-lifetimes.md

@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/29/2019
+ms.date: 01/19/2023
 ms.subservice: hybrid
 ms.author: billmath
 ms.custom: seohack1

articles/active-directory/hybrid/how-to-connect-modify-group-writeback.md

@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 07/18/2017
+ms.date: 01/19/2023
 ms.subservice: hybrid
 ms.author: billmath
 ms.custom: seohack1

articles/active-directory/hybrid/plan-hybrid-identity-design-considerations-data-protection-strategy.md

@@ -11,7 +11,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/29/2019
+ms.date: 01/19/2023
 ms.subservice: hybrid
 ms.author: billmath
 ms.custom: seohack1

articles/active-directory/hybrid/plan-hybrid-identity-design-considerations-directory-sync-requirements.md

@@ -11,7 +11,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 05/30/2018
+ms.date: 01/19/2023
 ms.subservice: hybrid
 ms.author: billmath
 ms.custom: seohack1

articles/active-directory/hybrid/plan-hybrid-identity-design-considerations-hybrid-id-management-tasks.md

@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 07/18/2017
+ms.date: 01/19/2023
 ms.subservice: hybrid
 ms.author: billmath
 ms.custom: seohack1