Skip to content

Commit c95e452

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-js
2 parents 03c0046 + 7a98515 commit c95e452

File tree

159 files changed

+3258
-415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+3258
-415
lines changed

articles/active-directory-domain-services/faqs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ sections:
164164
How are Windows Updates applied in Azure AD Domain Services?
165165
answer: |
166166
Domain controllers in a managed domain automatically apply required Windows updates. There's nothing for you to configure or administer here. Make sure you don't create network security group rules that block outbound traffic to Windows Updates. For your own VMs joined to the managed domain, you are responsible for configuring and applying any required OS and application updates.
167+
168+
- question: |
169+
Why do my domain controllers change names?
170+
answer: |
171+
It is possible that during the maintenance of domain controllers there is a change in their names. To avoid problems with this type of change, it is recommended to not use the names of the domain controllers hardcoded in applications and/or other domain resources, but the FQDN of the domain. This way, no matter what the names of the domain controllers are, you won't need to reconfigure anything after a name change.
167172
168173
- name: Billing and availability
169174
questions:

articles/active-directory/authentication/how-to-migrate-mfa-server-to-azure-mfa-with-federation.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,28 @@ Run the following PowerShell cmdlet:
113113
The command returns your current additional authentication rules for your relying party trust. Append the following rules to your current claim rules:
114114

115115
```console
116-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
117-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
116+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
117+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
118118
Value = "AzureMfaAuthentication");
119-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
119+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
120120
Value=="YourGroupSid"]) => issue(Type =
121-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
121+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
122122
"AzureMfaServerAuthentication");'
123123
```
124124

125125
The following example assumes your current claim rules are configured to prompt for MFA when users connect from outside your network. This example includes the additional rules that you need to append.
126126

127127
```PowerShell
128128
Set-AdfsAdditionalAuthenticationRule -AdditionalAuthenticationRules 'c:[type ==
129-
"https://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
130-
"https://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
131-
"https://schemas.microsoft.com/claims/multipleauthn" );
132-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
133-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
129+
"http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
130+
"http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
131+
"http://schemas.microsoft.com/claims/multipleauthn" );
132+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
133+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
134134
Value = "AzureMfaAuthentication");
135-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
135+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
136136
Value=="YourGroupSid"]) => issue(Type =
137-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
137+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
138138
"AzureMfaServerAuthentication");'
139139
```
140140

@@ -145,15 +145,15 @@ This example modifies claim rules on a specific relying party trust (application
145145

146146
```PowerShell
147147
Set-AdfsRelyingPartyTrust -TargetName AppA -AdditionalAuthenticationRules 'c:[type ==
148-
"https://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
149-
"https://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
150-
"https://schemas.microsoft.com/claims/multipleauthn" );
151-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
152-
"YourGroupSID"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
148+
"http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork", value == "false"] => issue(type =
149+
"http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod", value =
150+
"http://schemas.microsoft.com/claims/multipleauthn" );
151+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
152+
"YourGroupSID"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
153153
Value = "AzureMfaAuthentication");
154-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
154+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
155155
Value=="YourGroupSid"]) => issue(Type =
156-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
156+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
157157
"AzureMfaServerAuthentication");'
158158
```
159159

@@ -379,12 +379,12 @@ For example, remove the following from the rule(s):
379379

380380

381381
```console
382-
c:[Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
383-
"**YourGroupSID**"] => issue(Type = "https://schemas.microsoft.com/claims/authnmethodsproviders",
382+
c:[Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid", Value ==
383+
"**YourGroupSID**"] => issue(Type = "http://schemas.microsoft.com/claims/authnmethodsproviders",
384384
Value = "AzureMfaAuthentication");
385-
not exists([Type == "https://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
385+
not exists([Type == "http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid",
386386
Value=="YourGroupSid"]) => issue(Type =
387-
"https://schemas.microsoft.com/claims/authnmethodsproviders", Value =
387+
"http://schemas.microsoft.com/claims/authnmethodsproviders", Value =
388388
"AzureMfaServerAuthentication");'
389389
```
390390

articles/active-directory/develop/includes/console-app/quickstart-nodejs.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.subservice: develop
99
ms.topic: include
10-
ms.date: 01/10/2022
10+
ms.date: 09/09/2022
1111
ms.author: marsma
1212
#Customer intent: As an application developer, I want to learn how my Node.js app can get an access token and call an API that is protected by a Microsoft identity platform endpoint using client credentials flow.
1313
ms.custom: mode-other
@@ -60,17 +60,20 @@ To register your application and add the app's registration information to your
6060
- `Enter_the_Application_Id_Here` - is the **Application (client) ID** of the application you registered earlier. Find this ID on the app registration's **Overview** pane in the Azure portal.
6161
- `Enter_the_Tenant_Id_Here` - replace this value with the **Tenant ID** or **Tenant name** (for example, contoso.microsoft.com). Find these values on the app registration's **Overview** pane in the Azure portal.
6262
- `Enter_the_Client_Secret_Here` - replace this value with the client secret you created earlier. To generate a new key, use **Certificates & secrets** in the app registration settings in the Azure portal.
63+
64+
Using a plaintext secret in the source code poses an increased security risk for your application. Although the sample in this quickstart uses a plaintext client secret, it's only for simplicity. We recommend using [certificate credentials](../../active-directory-certificate-credentials.md) instead of client secrets in your confidential client applications, especially those apps you intend to deploy to production.
6365

64-
> [!WARNING]
65-
> Any plaintext secret in source code poses an increased security risk. This article uses a plaintext client secret for simplicity only. Use [certificate credentials](../../active-directory-certificate-credentials.md) instead of client secrets in your confidential client applications, especially those apps you intend to deploy to production.
66+
3. Edit *.env* and replace the Azure AD and Microsoft Graph endpoints with the following values:
67+
- For the Azure AD endpoint, replace `Enter_the_Cloud_Instance_Id_Here` with `https://login.microsoftonline.com`.
68+
- For the Microsoft Graph endpoint, replace `Enter_the_Graph_Endpoint_Here` with `https://graph.microsoft.com/`.
6669

6770
#### Step 4: Admin consent
6871

6972
If you try to run the application at this point, you'll receive *HTTP 403 - Forbidden* error: `Insufficient privileges to complete the operation`. This error happens because any *app-only permission* requires **admin consent**: a global administrator of your directory must give consent to your application. Select one of the options below depending on your role:
7073

7174
##### Global tenant administrator
7275

73-
If you are a global tenant administrator, go to **API Permissions** page in the Azure portal's Application Registration and select **Grant admin consent for {Tenant Name}** (where {Tenant Name} is the name of your directory).
76+
If you're a global tenant administrator, go to **API Permissions** page in the Azure portal's Application Registration and select **Grant admin consent for {Tenant Name}** (where {Tenant Name} is the name of your directory).
7477

7578
##### Standard user
7679

@@ -86,7 +89,7 @@ https://login.microsoftonline.com/Enter_the_Tenant_Id_Here/adminconsent?client_i
8689

8790
#### Step 5: Run the application
8891

89-
Locate the sample's root folder (where `package.json` resides) in a command prompt or console. You'll need to install the dependencies of this sample once:
92+
Locate the sample's root folder (where `package.json` resides) in a command prompt or console. You'll need to install the dependencies your sample app requires before running it for the first time:
9093

9194
```console
9295
npm install

articles/active-directory/external-identities/hybrid-cloud-to-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following diagram provides a high-level overview of how Azure AD Application
6666
You can manage the on-premises B2B user objects through lifecycle management policies. For example:
6767

6868
- You can set up multi-factor authentication (MFA) policies for the Guest user so that MFA is used during Application Proxy authentication. For more information, see [Conditional Access for B2B collaboration users](authentication-conditional-access.md).
69-
- Any sponsorships, access reviews, account verifications, etc. that are performed on the cloud B2B user applies to the on-premises users. For example, if the cloud user is deleted through your lifecycle management policies, the on-premises user is also deleted by MIM Sync or through Azure AD Connect sync. For more information, see [Manage guest access with Azure AD access reviews](../governance/manage-guest-access-with-access-reviews.md).
69+
- Any sponsorships, access reviews, account verifications, etc. that are performed on the cloud B2B user applies to the on-premises users. For example, if the cloud user is deleted through your lifecycle management policies, the on-premises user is also deleted by MIM Sync or through the Azure AD B2B script. For more information, see [Manage guest access with Azure AD access reviews](../governance/manage-guest-access-with-access-reviews.md).
7070

7171
### Create B2B guest user objects through an Azure AD B2B script
7272

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ To add an external Azure AD directory or domain as a connected organization, fol
7878

7979
The **Select directories + domains** pane opens.
8080

81-
1. In the search box, enter a domain name to search for the Azure AD directory or domain. Be sure to enter the entire domain name.
81+
1. In the search box, enter a domain name to search for the Azure AD directory or domain. You can also add domains that are not in Azure AD. Be sure to enter the entire domain name.
8282

83-
1. Confirm that the organization name and authentication type are correct. User sign in, prior to being able to access the myaccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, then all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the myaccess portal. Then, after they authenticate with the passcode, the user can make a request.
83+
1. Confirm that the organization name(s) and authentication type(s) are correct. User sign in, prior to being able to access the MyAccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the MyAccess portal. After they authenticate with the passcode, the user can make a request.
8484

8585
![The "Select directories + domains" pane](./media/entitlement-management-organization/organization-select-directories-domains.png)
8686

8787
> [!NOTE]
8888
> Access from some domains could be blocked by the Azure AD business to business (B2B) allow or deny list. For more information, see [Allow or block invitations to B2B users from specific organizations](../external-identities/allow-deny-list.md).
8989
90-
1. Select **Add** to add the Azure AD directory or domain. Currently, you can add only one Azure AD directory or domain per connected organization.
90+
1. Select **Add** to add the Azure AD directory or domain. **You can add multiple Azure AD directories and domains**.
9191

92-
1. After you've added the Azure AD directory or domain, select **Select**.
92+
1. After you've added the Azure AD directories or domains, select **Select**.
9393

94-
The organization appears in the list.
94+
The organization(s) appears in the list.
9595

9696
![The "Directory + domain" pane](./media/entitlement-management-organization/organization-directory-domain.png)
9797

0 commit comments

Comments
 (0)