Skip to content

Commit d5b6420

Browse files
authored
Merge branch 'MicrosoftDocs:main' into v1-migration
2 parents 41eafc3 + 259873e commit d5b6420

File tree

244 files changed

+1413
-766
lines changed

Some content is hidden

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

244 files changed

+1413
-766
lines changed

articles/active-directory/enterprise-users/domains-admin-takeover.md

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ ms.collection: M365-identity-device-management
1818
---
1919
# Take over an unmanaged directory as administrator in Azure Active Directory
2020

21-
This article describes two ways to take over a DNS domain name in an unmanaged directory in Azure Active Directory (Azure AD), part of Microsoft Entra. When a self-service user signs up for a cloud service that uses Azure AD, they are added to an unmanaged Azure AD directory based on their email domain. For more about self-service or "viral" sign-up for a service, see [What is self-service sign-up for Azure Active Directory?](directory-self-service-signup.md)
21+
This article describes two ways to take over a DNS domain name in an unmanaged directory in Azure Active Directory (Azure AD), part of Microsoft Entra. When a self-service user signs up for a cloud service that uses Azure AD, they're added to an unmanaged Azure AD directory based on their email domain. For more about self-service or "viral" sign-up for a service, see [What is self-service sign-up for Azure Active Directory?](directory-self-service-signup.md)
2222

2323

2424
> [!VIDEO https://www.youtube.com/embed/GOSpjHtrRsg]
2525
2626
## Decide how you want to take over an unmanaged directory
2727
During the process of admin takeover, you can prove ownership as described in [Add a custom domain name to Azure AD](../fundamentals/add-custom-domain.md). The next sections explain the admin experience in more detail, but here's a summary:
2828

29-
* When you perform an ["internal" admin takeover](#internal-admin-takeover) of an unmanaged Azure directory, you are added as the global administrator of the unmanaged directory. No users, domains, or service plans are migrated to any other directory you administer.
29+
* When you perform an ["internal" admin takeover](#internal-admin-takeover) of an unmanaged Azure directory, you're added as the global administrator of the unmanaged directory. No users, domains, or service plans are migrated to any other directory you administer.
3030

3131
* When you perform an ["external" admin takeover](#external-admin-takeover) of an unmanaged Azure directory, you add the DNS domain name of the unmanaged directory to your managed Azure directory. When you add the domain name, a mapping of users to resources is created in your managed Azure directory so that users can continue to access services without interruption.
3232

3333
## Internal admin takeover
3434

35-
Some products that include SharePoint and OneDrive, such as Microsoft 365, do not support external takeover. If that is your scenario, or if you are an admin and want to take over an unmanaged or "shadow" Azure AD organization create by users who used self-service sign-up, you can do this with an internal admin takeover.
35+
Some products that include SharePoint and OneDrive, such as Microsoft 365, don't support external takeover. If that is your scenario, or if you're an admin and want to take over an unmanaged or "shadow" Azure AD organization create by users who used self-service sign-up, you can do this with an internal admin takeover.
3636

3737
1. Create a user context in the unmanaged organization through signing up for Power BI. For convenience of example, these steps assume that path.
3838

@@ -44,20 +44,20 @@ Some products that include SharePoint and OneDrive, such as Microsoft 365, do no
4444

4545
![first screenshot for Become the Admin](./media/domains-admin-takeover/become-admin-first.png)
4646

47-
5. Add the TXT record to prove that you own the domain name **fourthcoffee.xyz** at your domain name registrar. In this example, it is GoDaddy.com.
47+
5. Add the TXT record to prove that you own the domain name **fourthcoffee.xyz** at your domain name registrar. In this example, it's GoDaddy.com.
4848

4949
![Add a txt record for the domain name](./media/domains-admin-takeover/become-admin-txt-record.png)
5050

5151
When the DNS TXT records are verified at your domain name registrar, you can manage the Azure AD organization.
5252

53-
When you complete the preceding steps, you are now the global administrator of the Fourth Coffee organization in Microsoft 365. To integrate the domain name with your other Azure services, you can remove it from Microsoft 365 and add it to a different managed organization in Azure.
53+
When you complete the preceding steps, you're now the global administrator of the Fourth Coffee organization in Microsoft 365. To integrate the domain name with your other Azure services, you can remove it from Microsoft 365 and add it to a different managed organization in Azure.
5454

5555
### Adding the domain name to a managed organization in Azure AD
5656

5757
[!INCLUDE [portal updates](~/articles/active-directory/includes/portal-update.md)]
5858

5959
1. Open the [Microsoft 365 admin center](https://admin.microsoft.com).
60-
2. Select **Users** tab, and create a new user account with a name like *user\@fourthcoffeexyz.onmicrosoft.com* that does not use the custom domain name.
60+
2. Select **Users** tab, and create a new user account with a name like *user\@fourthcoffeexyz.onmicrosoft.com* that doesn't use the custom domain name.
6161
3. Ensure that the new user account has Global Administrator privileges for the Azure AD organization.
6262
4. Open **Domains** tab in the Microsoft 365 admin center, select the domain name and select **Remove**.
6363

@@ -76,7 +76,7 @@ When you complete the preceding steps, you are now the global administrator of t
7676
7777
## External admin takeover
7878

79-
If you already manage an organization with Azure services or Microsoft 365, you cannot add a custom domain name if it is already verified in another Azure AD organization. However, from your managed organization in Azure AD you can take over an unmanaged organization as an external admin takeover. The general procedure follows the article [Add a custom domain to Azure AD](../fundamentals/add-custom-domain.md).
79+
If you already manage an organization with Azure services or Microsoft 365, you can't add a custom domain name if it's already verified in another Azure AD organization. However, from your managed organization in Azure AD you can take over an unmanaged organization as an external admin takeover. The general procedure follows the article [Add a custom domain to Azure AD](../fundamentals/add-custom-domain.md).
8080

8181
When you verify ownership of the domain name, Azure AD removes the domain name from the unmanaged organization and moves it to your existing organization. External admin takeover of an unmanaged directory requires the same DNS TXT validation process as internal admin takeover. The difference is that the following are also moved over with the domain name:
8282

@@ -98,7 +98,7 @@ The supported service plans include:
9898
- Microsoft Stream
9999
- Dynamics 365 free trial
100100

101-
External admin takeover is not supported for any service that has service plans that include SharePoint, OneDrive, or Skype For Business; for example, through an Office free subscription.
101+
External admin takeover isn't supported for any service that has service plans that include SharePoint, OneDrive, or Skype For Business; for example, through an Office free subscription.
102102

103103
> [!NOTE]
104104
> External admin takeover is not supported cross cloud boundaries (ex. Azure Commercial to Azure Government). In these scenarios it is recommended to perform External admin takeover into another Azure Commercial tenant, and then delete the domain from this tenant so you may verify successfully into the destination Azure Government tenant.
@@ -109,64 +109,67 @@ You can optionally use the [**ForceTakeover** option](#azure-ad-powershell-cmdle
109109

110110
For [RMS for individuals](/azure/information-protection/rms-for-individuals), when the unmanaged organization is in the same region as the organization that you own, the automatically created [Azure Information Protection organization key](/azure/information-protection/plan-implement-tenant-key) and [default protection templates](/azure/information-protection/configure-usage-rights#rights-included-in-the-default-templates) are additionally moved over with the domain name.
111111

112-
The key and templates are not moved over when the unmanaged organization is in a different region. For example, if the unmanaged organization is in Europe and the organization that you own is in North America.
112+
The key and templates aren't moved over when the unmanaged organization is in a different region. For example, if the unmanaged organization is in Europe and the organization that you own is in North America.
113113

114-
Although RMS for individuals is designed to support Azure AD authentication to open protected content, it doesn't prevent users from also protecting content. If users did protect content with the RMS for individuals subscription, and the key and templates were not moved over, that content is not accessible after the domain takeover.
114+
Although RMS for individuals is designed to support Azure AD authentication to open protected content, it doesn't prevent users from also protecting content. If users did protect content with the RMS for individuals subscription, and the key and templates weren't moved over, that content isn't accessible after the domain takeover.
115115

116116
### Azure AD PowerShell cmdlets for the ForceTakeover option
117117
You can see these cmdlets used in [PowerShell example](#powershell-example).
118118

119119
cmdlet | Usage
120120
------- | -------
121-
`connect-msolservice` | When prompted, sign in to your managed organization.
122-
`get-msoldomain` | Shows your domain names associated with the current organization.
123-
`new-msoldomain –name <domainname>` | Adds the domain name to organization as Unverified (no DNS verification has been performed yet).
124-
`get-msoldomain` | The domain name is now included in the list of domain names associated with your managed organization, but is listed as **Unverified**.
125-
`get-msoldomainverificationdns –Domainname <domainname> –Mode DnsTxtRecord` | Provides the information to put into new DNS TXT record for the domain (MS=xxxxx). Verification might not happen immediately because it takes some time for the TXT record to propagate, so wait a few minutes before considering the **-ForceTakeover** option.
126-
`confirm-msoldomain –Domainname <domainname> –ForceTakeover Force` | <li>If your domain name is still not verified, you can proceed with the **-ForceTakeover** option. It verifies that the TXT record was created and kicks off the takeover process.<li>The **-ForceTakeover** option should be added to the cmdlet only when forcing an external admin takeover, such as when the unmanaged organization has Microsoft 365 services blocking the takeover.
127-
`get-msoldomain` | The domain list now shows the domain name as **Verified**.
121+
`connect-mggraph` | When prompted, sign in to your managed organization.
122+
`get-mgdomain` | Shows your domain names associated with the current organization.
123+
`new-mgdomain -BodyParameter @{Id="<your domain name>"; IsDefault="False"}` | Adds the domain name to organization as Unverified (no DNS verification has been performed yet).
124+
`get-mgdomain` | The domain name is now included in the list of domain names associated with your managed organization, but is listed as **Unverified**.
125+
`Get-MgDomainVerificationDnsRecord` | Provides the information to put into new DNS TXT record for the domain (MS=xxxxx). Verification might not happen immediately because it takes some time for the TXT record to propagate, so wait a few minutes before considering the **-ForceTakeover** option.
126+
`confirm-mgdomain –Domainname <domainname>` | - If your domain name is still not verified, you can proceed with the **-ForceTakeover** option. It verifies that the TXT record was created and kicks off the takeover process.<br>- The **-ForceTakeover** option should be added to the cmdlet only when forcing an external admin takeover, such as when the unmanaged organization has Microsoft 365 services blocking the takeover.
127+
`get-mgdomain` | The domain list now shows the domain name as **Verified**.
128128

129129
> [!NOTE]
130130
> The unmanaged Azure AD organization is deleted 10 days after you exercise the external takeover force option.
131131
132132
### PowerShell example
133133

134-
1. Connect to Azure AD using the credentials that were used to respond to the self-service offering:
134+
1. Connect to Microsoft Graph using the credentials that were used to respond to the self-service offering:
135135
```powershell
136-
Install-Module -Name MSOnline
137-
$msolcred = get-credential
138-
139-
connect-msolservice -credential $msolcred
136+
Install-Module -Name Microsoft.Graph
137+
138+
Connect-MgGraph -Scopes "User.ReadWrite.All","Domain.ReadWrite.All"
140139
```
141140
2. Get a list of domains:
142141

143142
```powershell
144-
Get-MsolDomain
143+
Get-MgDomain
145144
```
146-
3. Run the Get-MsolDomainVerificationDns cmdlet to create a challenge:
145+
3. Run the New-MgDomain cmdlet to add a new domain in Azure:
147146
```powershell
148-
Get-MsolDomainVerificationDns –DomainName *your_domain_name* –Mode DnsTxtRecord
147+
New-MgDomain -BodyParameter @{Id="<your domain name>"; IsDefault="False"}
149148
```
150-
For example:
149+
4. Run the Get-MgDomainVerificationDnsRecord cmdlet to view the DNS challenge:
150+
```powershell
151+
(Get-MgDomainVerificationDnsRecord -DomainId "<your domain name>" | ?{$_.recordtype -eq "Txt"}).AdditionalProperties.text
151152
```
152-
Get-MsolDomainVerificationDns –DomainName contoso.com –Mode DnsTxtRecord
153+
For example:
154+
```powershell
155+
(Get-MgDomainVerificationDnsRecord -DomainId "contoso.com" | ?{$_.recordtype -eq "Txt"}).AdditionalProperties.text
153156
```
154157

155158
4. Copy the value (the challenge) that is returned from this command. For example:
156159
```powershell
157-
MS=32DD01B82C05D27151EA9AE93C5890787F0E65D9
160+
MS=ms18939161
158161
```
159162
5. In your public DNS namespace, create a DNS txt record that contains the value that you copied in the previous step. The name for this record is the name of the parent domain, so if you create this resource record by using the DNS role from Windows Server, leave the Record name blank and just paste the value into the Text box.
160-
6. Run the Confirm-MsolDomain cmdlet to verify the challenge:
163+
6. Run the Confirm-MgDomain cmdlet to verify the challenge:
161164

162165
```powershell
163-
Confirm-MsolDomain –DomainName *your_domain_name* –ForceTakeover Force
166+
Confirm-MgDomain -DomainId "<your domain name>"
164167
```
165168

166169
For example:
167170

168171
```powershell
169-
Confirm-MsolDomain –DomainName contoso.com –ForceTakeover Force
172+
Confirm-MgDomain -DomainId "contoso.com"
170173
```
171174

172175
A successful challenge returns you to the prompt without an error.

articles/active-directory/external-identities/b2b-quickstart-invite-powershell.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: In this quickstart, you learn how to use PowerShell to send an invi
44
services: active-directory
55
ms.author: cmulligan
66
author: csmulligan
7-
manager: celestedg
8-
ms.date: 03/21/2023
7+
manager: CelesteDG
8+
ms.date: 07/31/2023
99
ms.topic: quickstart
1010
ms.service: active-directory
1111
ms.subservice: B2B
@@ -83,5 +83,5 @@ Remove-MgUser -UserId '3f80a75e-750b-49aa-a6b0-d9bf6df7b4c6'
8383

8484

8585
## Next steps
86-
In this quickstart, you invited and added a single guest user to your directory using PowerShell. Next, learn how to [invite guest users in bulk using PowerShell](tutorial-bulk-invite.md).
86+
In this quickstart, you invited and added a single guest user to your directory using PowerShell. You can also invite a guest user using the [Azure portal](b2b-quickstart-add-guest-users-portal.md). Additionally you can [invite guest users in bulk using PowerShell](tutorial-bulk-invite.md).
8787

articles/active-directory/external-identities/bulk-invite-powershell.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ services: active-directory
77
ms.service: active-directory
88
ms.subservice: B2B
99
ms.topic: tutorial
10-
ms.date: 11/18/2022
10+
ms.date: 07/31/2023
1111

1212
ms.author: cmulligan
1313
author: csmulligan
14-
manager: celestedg
14+
manager: CelesteDG
1515
ms.custom: engagement-fy23
1616

1717
# Customer intent: As a tenant administrator, I want to send B2B invitations to multiple external users at the same time so that I can avoid having to send individual invitations to each user.
@@ -21,7 +21,7 @@ ms.collection: M365-identity-device-management
2121

2222
# Tutorial: Use PowerShell to bulk invite Azure AD B2B collaboration users
2323

24-
If you use [Azure Active Directory (Azure AD) B2B collaboration](what-is-b2b.md) to work with external partners, you can invite multiple guest users to your organization at the same time [via the portal](tutorial-bulk-invite.md) or via PowerShell. In this tutorial, you learn how to use PowerShell to send bulk invitations to external users. Specifically, you do the following:
24+
If you use Azure Active Directory (Azure AD) B2B collaboration to work with external partners, you can invite multiple guest users to your organization at the same time via the portal or via PowerShell. In this tutorial, you learn how to use PowerShell to send bulk invitations to external users. Specifically, you do the following:
2525

2626
> [!div class="checklist"]
2727
> * Prepare a comma-separated value (.csv) file with the user information
@@ -127,7 +127,7 @@ To verify that the invited users were added to Azure AD, run the following comma
127127
Get-AzureADUser -Filter "UserType eq 'Guest'"
128128
```
129129

130-
You should see the users that you invited listed, with a [user principal name (UPN)](../hybrid/plan-connect-userprincipalname.md#what-is-userprincipalname) in the format *emailaddress*#EXT#\@*domain*. For example, *lstokes_fabrikam.com#EXT#\@contoso.onmicrosoft.com*, where contoso.onmicrosoft.com is the organization from which you sent the invitations.
130+
You should see the users that you invited listed, with a user principal name (UPN) in the format *emailaddress*#EXT#\@*domain*. For example, *msullivan_fabrikam.com#EXT#\@contoso.onmicrosoft.com*, where contoso.onmicrosoft.com is the organization from which you sent the invitations.
131131

132132
## Clean up resources
133133

@@ -137,11 +137,11 @@ When no longer needed, you can delete the test user accounts in the directory. R
137137
Remove-AzureADUser -ObjectId "<UPN>"
138138
```
139139

140-
For example: `Remove-AzureADUser -ObjectId "lstokes_fabrikam.com#EXT#@contoso.onmicrosoft.com"`
140+
For example: `Remove-AzureADUser -ObjectId "msullivan_fabrikam.com#EXT#@contoso.onmicrosoft.com"`
141141

142142
## Next steps
143143

144-
In this tutorial, you sent bulk invitations to guest users outside of your organization. Next, learn how the invitation redemption process works and how to enforce MFA for guest users.
144+
In this tutorial, you sent bulk invitations to guest users outside of your organization. Next, learn how to bulk invite guest users on the portal and how to enforce MFA for them.
145145

146-
- [Learn about the Azure AD B2B collaboration invitation redemption process](redemption-experience.md)
146+
- [Bulk invite guest users via the portal](tutorial-bulk-invite.md)
147147
- [Enforce multi-factor authentication for B2B guest users](b2b-tutorial-require-mfa.md)

articles/active-directory/external-identities/tutorial-bulk-invite.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ services: active-directory
77
ms.service: active-directory
88
ms.subservice: B2B
99
ms.topic: tutorial
10-
ms.date: 07/04/2023
10+
ms.date: 07/31/2023
1111

1212
ms.author: cmulligan
1313
author: csmulligan
14-
manager: celestedg
14+
manager: CelesteDG
1515

1616
# Customer intent: As a tenant administrator, I want to send B2B invitations to multiple external users at the same time so that I can avoid having to send individual invitations to each user.
1717

0 commit comments

Comments
 (0)