Skip to content

Commit 91322b1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into shannon-dev
2 parents 04c1a28 + 0c8ba7f commit 91322b1

File tree

39 files changed

+216
-46
lines changed

39 files changed

+216
-46
lines changed

articles/active-directory/develop/scenario-web-app-sign-user-sign-in.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ In ASP.NET Core, for Microsoft identity platform applications, the **Sign in** b
5454

5555
# [ASP.NET](#tab/aspnet)
5656

57-
In ASP.NET MVC, the sign-out button is exposed in `Views\Shared\_LoginPartial.cshtml`. It's displayed only when there's an authenticated account. That is, it's displayed when the user has previously signed in.
57+
In ASP.NET MVC, the **Sign in** button is exposed in `Views\Shared\_LoginPartial.cshtml`. It's displayed only when the user isn't authenticated. That is, it's displayed when the user hasn't yet signed in or has signed out.
5858

5959
```html
6060
@if (Request.IsAuthenticated)
@@ -125,7 +125,7 @@ This controller also handles the Azure AD B2C applications.
125125

126126
# [ASP.NET](#tab/aspnet)
127127

128-
In ASP.NET, signing out is triggered from the `SignOut()` method on a controller (for instance, [AccountController.cs#L16-L23](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/a2da310539aa613b77da1f9e1c17585311ab22b7/WebApp/Controllers/AccountController.cs#L16-L23)). This method isn't part of the ASP.NET framework (contrary to what happens in ASP.NET Core). It sends an OpenID sign-in challenge after proposing a redirect URI.
128+
In ASP.NET, Sign in is triggered from the `SignIn()` method on a controller (for instance, [AccountController.cs#L16-L23](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/a2da310539aa613b77da1f9e1c17585311ab22b7/WebApp/Controllers/AccountController.cs#L16-L23)). This method isn't part of the ASP.NET framework (contrary to what happens in ASP.NET Core). It sends an OpenID sign-in challenge after proposing a redirect URI.
129129

130130
```csharp
131131
public void SignIn()

articles/active-directory/develop/troubleshoot-publisher-verification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ Most commonly caused when the verification is being performed via Graph API, and
235235

236236
This feature isn't supported for Microsoft consumer accounts. Only applications registered in Azure AD by an Azure AD user are supported.
237237

238-
Occurs when a consumer account (Hotmail, Messenger, OneDrive, MSN, Xbox Live, or Microsoft 365).
238+
Occurs when a consumer account is used for app registration (Hotmail, Messenger, OneDrive, MSN, Xbox Live, or Microsoft 365).
239239

240240
### InteractionRequired
241241

articles/active-directory/enterprise-users/groups-naming-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can enforce naming policy for groups in two different ways:
3737

3838
### Prefix-suffix naming policy
3939

40-
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings including group name is 53 characters.
40+
The general structure of the naming convention is ‘Prefix[GroupName]Suffix’. While you can define multiple prefixes and suffixes, you can only have one instance of the [GroupName] in the setting. The prefixes or suffixes can be either fixed strings or user attributes such as \[Department\] that are substituted based on the user who is creating the group. The total allowable number of characters for your prefix and suffix strings including group name is 63 characters.
4141

4242
Prefixes and suffixes can contain special characters that are supported in group name and group alias. Any characters in the prefix or suffix that are not supported in the group alias are still applied in the group name, but removed from the group alias. Because of this restriction, the prefixes and suffixes applied to the group name might be different from the ones applied to the group alias.
4343

articles/active-directory/external-identities/reset-redemption-status.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services: active-directory
77
ms.service: active-directory
88
ms.subservice: B2B
99
ms.topic: how-to
10-
ms.date: 06/16/2022
10+
ms.date: 11/11/2022
1111

1212
ms.author: mimart
1313
author: msmimart
@@ -28,13 +28,21 @@ In this article, you'll learn how to update the [guest user's](user-properties.m
2828

2929
To manage these scenarios previously, you had to manually delete the guest user’s account from your directory and reinvite the user. Now you can use the Azure portal, PowerShell or the Microsoft Graph invitation API to reset the user's redemption status and reinvite the user while keeping the user's object ID, group memberships, and app assignments. When the user redeems the new invitation, the [UPN](../hybrid/plan-connect-userprincipalname.md#what-is-userprincipalname) of the user doesn't change, but the user's sign-in name changes to the new email. Then the user can sign in using the new email or an email you've added to the `otherMails` property of the user object.
3030

31+
## Required Azure AD roles
32+
33+
To reset a user's redemption status, you'll need one of the following roles:
34+
35+
- [Guest Inviter](../roles/permissions-reference.md#guest-inviter) (least privileged)
36+
- [User Administrator](../roles/permissions-reference.md#user-administrator)
37+
- [Global Administrator](../roles/permissions-reference.md#global-administrator)
38+
3139
## Use the Azure portal to reset redemption status
3240

33-
1. Sign in to the [Azure portal](https://portal.azure.com/) using a Global administrator or User administrator account for the directory.
34-
1. Search for and select **Azure Active Directory**.
35-
1. Select **Users**.
36-
1. In the list, select the user's name to open their user profile.
37-
1. If the user wants to sign in using a different email:
41+
1. Sign in to the [Azure portal](https://portal.azure.com/) using an account that has one of the [required Azure AD roles](#required-azure-ad-roles).
42+
2. Search for and select **Azure Active Directory**.
43+
3. Select **Users**.
44+
4. In the list, select the user's name to open their user profile.
45+
5. If the user wants to sign in using a different email:
3846
- Select **Edit properties**.
3947
- Select the **Contact Information** tab.
4048
- Next to **Email**, type the new email.

articles/active-directory/governance/lifecycle-workflow-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Properties that will trigger the creation of a new version are as follows:
4747

4848

4949

50-
While new versions of these workflows are made as soon as you make the updates in the Azure portal, making a new version of a workflow using the API with Microsoft Graph requires running the workflow creation call again with the changes included. For a step by step guide for updating either tasks, or execution conditions, see: [Manage Workflow Versions](manage-workflow-tasks.md).
50+
While new versions of these workflows are made as soon as you make the updates in the Azure portal, creating a new version of a workflow using the API with Microsoft Graph requires running the createNewVersion method. For a step by step guide for updating either tasks, or execution conditions, see: [Manage Workflow Versions](manage-workflow-tasks.md).
5151

5252
> [!NOTE]
5353
> If the workflow is on-demand, the configure information associated with execution conditions will not be present.

articles/active-directory/hybrid/how-to-connect-create-custom-sync-rule.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services: active-directory
55
documentationcenter: ''
66
author: billmath
77
manager: amycolannino
8-
editor: curtand
98
ms.service: active-directory
109
ms.workload: identity
1110
ms.tgt_pltfrm: na

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services: active-directory
55
documentationcenter: ''
66
author: billmath
77
manager: amycolannino
8-
editor: curtand
98
ms.assetid: c0ff679c-7ed5-4d6e-ac6c-b2b6392e7892
109
ms.service: active-directory
1110
ms.workload: identity

articles/active-directory/hybrid/how-to-connect-fed-compatibility.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services: active-directory
55
documentationcenter: ''
66
author: billmath
77
manager: amycolannino
8-
editor: curtand
98
ms.assetid: 22c8693e-8915-446d-b383-27e9587988ec
109
ms.service: active-directory
1110
ms.workload: identity

articles/active-directory/hybrid/how-to-connect-fed-o365-certs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services: active-directory
55
documentationcenter: ''
66
author: billmath
77
manager: amycolannino
8-
editor: curtand
98
ms.assetid: 543b7dc1-ccc9-407f-85a1-a9944c0ba1be
109
ms.service: active-directory
1110
ms.workload: identity

articles/active-directory/hybrid/how-to-connect-fix-default-rules.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ description: Learn how to fix modified default rules that come with Azure AD Con
44
services: active-directory
55
author: billmath
66
manager: amycolannino
7-
editor: curtand
87
ms.reviewer: darora10
98
ms.service: active-directory
109
ms.workload: identity

0 commit comments

Comments
 (0)