Skip to content

Commit 93779c3

Browse files
committed
Merge branch 'main' into release-preview-mswb
2 parents c977026 + acad56b commit 93779c3

File tree

56 files changed

+1503
-549
lines changed

Some content is hidden

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

56 files changed

+1503
-549
lines changed

articles/active-directory/app-provisioning/user-provisioning-sync-attributes-for-mapping.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Next, if one or more of the users that will need access to the application do no
4343
The following sections outline how to create extension attributes for a tenant with cloud only users, and for a tenant with Active Directory users.
4444

4545
## Create an extension attribute in a tenant with cloud only users
46-
You can use Microsoft Graph and PowerShell to extend the user schema for users in Azure AD. This is necessary if you do not have any users who need that attribute and originate in on-premises Active Directory. (If you do have Active Directory, then continue reading below in the section on how to [use the Azure AD Connect directory extension feature to synchronize the attribute to Azure AD](#create-an-extension-attribute-using-azure-ad-connect).)
46+
You can use Microsoft Graph and PowerShell to extend the user schema for users in Azure AD. This is necessary if you have any users who need that attribute and do not originate in on-premises Active Directory. (If you do have Active Directory, then continue reading below in the section on how to [use the Azure AD Connect directory extension feature to synchronize the attribute to Azure AD](#create-an-extension-attribute-using-azure-ad-connect).)
4747

4848
Once schema extensions are created, these extension attributes are automatically discovered when you next visit the provisioning page in the Azure portal, in most cases.
4949

@@ -82,7 +82,7 @@ Content-type: application/json
8282
"extension_inputAppId_extensionName": "extensionValue"
8383
}
8484
```
85-
Finally, verify the attribute for the user. To learn more, see [Get a user](/graph/api/user-get).
85+
Finally, verify the attribute for the user. To learn more, see [Get a user](/graph/api/user-get). Note that the Graph v1.0 does not by default return any of a user's directory extension attributes, unless the attributes are specified in the request as one of the properties to return.
8686

8787
```json
8888
GET https://graph.microsoft.com/v1.0/users/{id}?$select=displayName,extension_inputAppId_extensionName

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.subservice: conditional-access
88
ms.custom: has-azure-ad-ps-ref
99
ms.topic: conceptual
1010

11-
ms.date: 08/25/2023
11+
ms.date: 08/31/2023
1212

1313
ms.author: joflore
1414
author: MicrosoftGuyJFlo
@@ -185,7 +185,7 @@ User actions are tasks that can be performed by a user. Currently, Conditional A
185185

186186
## Traffic forwarding profiles
187187

188-
Traffic forwarding profiles in Global Secure Access enable administrators to define and control how traffic is routed through Microsoft Entra Internet Access and Microsoft Entra Private Access. Traffic forwarding profiles can be assigned to devices and remote networks. For an example of how to configure these traffic profiles in Conditional Access policy, see the article [How to require a compliant network check](../../global-secure-access/how-to-compliant-network.md).
188+
Traffic forwarding profiles in Global Secure Access enable administrators to define and control how traffic is routed through Microsoft Entra Internet Access and Microsoft Entra Private Access. Traffic forwarding profiles can be assigned to devices and remote networks. For an example of how to apply a Conditional Access policy to these traffic profiles, see the article [How to apply Conditional Access policies to the Microsoft 365 traffic profile](../../global-secure-access/how-to-target-resource-microsoft-365-profile.md).
189189

190190
For more information about these profiles, see the article [Global Secure Access traffic forwarding profiles](../../global-secure-access/concept-traffic-forwarding.md).
191191

articles/active-directory/develop/tutorial-v2-aspnet-daemon-web-app.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ In this tutorial:
2828
> * Get an access token to call the Microsoft Graph API
2929
> * Call the Microsoft Graph API.
3030
31-
If you dont have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
31+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
3232

3333
## Prerequisites
3434

3535
- [Visual Studio 2017 or 2019](https://visualstudio.microsoft.com/downloads/).
3636
- An Azure AD tenant. For more information, see [How to get an Azure AD tenant](quickstart-create-new-tenant.md).
37-
- One or more user accounts in your Azure AD tenant. This sample won't work with a Microsoft account. If you signed in to the [Azure portal](https://portal.azure.com) with a Microsoft account and have never created a user account in your directory, do that now.
37+
- One or more user accounts in your tenant. This sample won't work with a Microsoft account. If you signed in with a Microsoft account and have never created a user account in your directory, do that now.
3838

3939
## Scenario
4040

@@ -62,7 +62,7 @@ Or [download the sample in a zip file](https://github.com/Azure-Samples/ms-ident
6262

6363
This sample has one project. To register the application with your Azure AD tenant, you can either:
6464

65-
- Follow the steps in [Register the sample with your Azure Active Directory tenant](#register-the-client-app-dotnet-web-daemon-v2) and [Configure the sample to use your Azure AD tenant](#choose-the-azure-ad-tenant).
65+
- Follow the steps in [Choose the tenant](#choose-the-tenant) and [Configure the sample to use your tenant](#configure-the-sample-to-use-your-tenant).
6666
- Use PowerShell scripts that:
6767
- *Automatically* create the Azure AD applications and related objects (passwords, permissions, dependencies) for you.
6868
- Modify the Visual Studio projects' configuration files.
@@ -88,18 +88,14 @@ If you want to use the automation:
8888

8989
If you don't want to use the automation, use the steps in the following sections.
9090

91-
### Choose the Azure AD tenant
91+
### Choose the tenant
9292

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

95-
1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
96-
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="./media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
97-
98-
99-
### Register the client app (dotnet-web-daemon-v2)
100-
101-
1. Search for and select **Azure Active Directory**.
102-
1. Under **Manage**, select **App registrations** > **New registration**.
95+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
96+
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
97+
1. Browse to **Identity** > **Applications** > **App registrations**.
98+
1. Select **New registration**.
10399
1. Enter a **Name** for your application, for example `dotnet-web-daemon-v2`. Users of your app might see this name, and you can change it later.
104100
1. In the **Supported account types** section, select **Accounts in any organizational directory**.
105101
1. In the **Redirect URI (optional)** section, select **Web** in the combo box and enter `https://localhost:44316/` and `https://localhost:44316/Account/GrantPermissions` as Redirect URIs.
@@ -121,7 +117,7 @@ If you don't want to use the automation, use the steps in the following sections
121117
1. In the **Application permissions** section, ensure that the right permissions are selected: **User.Read.All**.
122118
1. Select **Add permissions**.
123119

124-
## Configure the sample to use your Azure AD tenant
120+
## Configure the sample to use your tenant
125121

126122
In the following steps, **ClientID** is the same as "application ID" or **AppId**.
127123

@@ -132,8 +128,8 @@ Open the solution in Visual Studio to configure the projects.
132128
If you used the setup scripts, the following changes will have been applied for you.
133129

134130
1. Open the **UserSync\Web.Config** file.
135-
1. Find the app key **ida:ClientId**. Replace the existing value with the application ID of the **dotnet-web-daemon-v2** application copied from the Azure portal.
136-
1. Find the app key **ida:ClientSecret**. Replace the existing value with the key that you saved during the creation of the **dotnet-web-daemon-v2** app in the Azure portal.
131+
1. Find the app key **ida:ClientId**. Replace the existing value with the application ID of the **dotnet-web-daemon-v2** application that was previously recorded.
132+
1. Find the app key **ida:ClientSecret**. Replace the existing value with the key that you saved during the creation of the **dotnet-web-daemon-v2** app.
137133

138134
## Run the sample
139135

@@ -223,9 +219,7 @@ Visual Studio will publish the project and automatically open a browser to the p
223219

224220
### Update the Azure AD tenant application registration for dotnet-web-daemon-v2
225221

226-
1. Go back to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
227-
1. In the left pane, select the **Azure Active Directory** service, and then select **App registrations**.
228-
1. Select the **dotnet-web-daemon-v2** application.
222+
1. Go back to the Microsoft Entra admin center, and then select the **dotnet-web-daemon-v2** application in **App registrations**.
229223
1. On the **Authentication** page for your application, update the **Front-channel logout URL** fields with the address of your service. For example, use `https://dotnet-web-daemon-v2-contoso.azurewebsites.net/Account/EndSession`.
230224
1. From the **Branding** menu, update the **Home page URL** to the address of your service. For example, use `https://dotnet-web-daemon-v2-contoso.azurewebsites.net`.
231225
1. Save the configuration.

articles/active-directory/develop/tutorial-v2-ios.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ In this tutorial:
2424
> [!div class="checklist"]
2525
>
2626
> - Create an iOS or macOS app project in _Xcode_
27-
> - Register the app in the Azure portal
27+
> - Register the app in the Microsoft Entra admin center
2828
> - Add code to support user sign-in and sign-out
2929
> - Add code to call the Microsoft Graph API
3030
> - Test the app
@@ -63,14 +63,14 @@ If you'd like to download a completed version of the app you build in this tutor
6363
5. Set the **Language** to **Swift** and select **Next**.
6464
6. Select a folder to create your app and select **Create**.
6565

66-
## Register your application
66+
## Register the application
6767

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

70-
1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
71-
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="./media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
72-
1. Search for and select **Azure Active Directory**.
73-
1. Under **Manage**, select **App registrations** > **New registration**.
70+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
71+
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
72+
1. Browse to **Identity** > **Applications** > **App registrations**.
73+
1. Select **New registration**.
7474
1. Enter a **Name** for your application. Users of your app might see this name, and you can change it later.
7575
1. Select **Accounts in any organizational directory (Any Azure AD directory - Multitenant) and personal Microsoft accounts (e.g. Skype, Xbox)** under **Supported account types**.
7676
1. Select **Register**.
@@ -125,7 +125,7 @@ carthage update --platform macOS
125125

126126
You can also use Git Submodule, or check out the latest release to use as a framework in your application.
127127

128-
## Add your app registration
128+
## Add the app registration
129129

130130
Next, we add your app registration to your code.
131131

@@ -138,7 +138,7 @@ import MSAL
138138
Next, add the following code to _ViewController.swift_ before to `viewDidLoad()`:
139139

140140
```swift
141-
// Update the below to your client ID you received in the portal. The below is for running the demo only
141+
// Update the below to your client ID. The below is for running the demo only
142142
let kClientID = "Your_Application_Id_Here"
143143
let kGraphEndpoint = "https://graph.microsoft.com/" // the Microsoft Graph endpoint
144144
let kAuthority = "https://login.microsoftonline.com/common" // this authority allows a personal Microsoft account and a work or school account in any organization's Azure AD tenant to sign in
@@ -151,7 +151,7 @@ var webViewParameters : MSALWebviewParameters?
151151
var currentAccount: MSALAccount?
152152
```
153153

154-
The only value you modify is the value assigned to `kClientID` to be your [Application ID](./developer-glossary.md#application-client-id). This value is part of the MSAL Configuration data that you saved during the step at the beginning of this tutorial to register the application in the Azure portal.
154+
The only value you modify is the value assigned to `kClientID` to be your [Application ID](./developer-glossary.md#application-client-id). This value is part of the MSAL Configuration data that you saved during the step at the beginning of this tutorial to register the application.
155155

156156
## Configure Xcode project settings
157157

@@ -163,7 +163,7 @@ Add a new keychain group to your project **Signing & Capabilities**. The keychai
163163

164164
In this step, you'll register `CFBundleURLSchemes` so that the user can be redirected back to the app after sign in. By the way, `LSApplicationQueriesSchemes` also allows your app to make use of Microsoft Authenticator.
165165

166-
In Xcode, open _Info.plist_ as a source code file, and add the following inside of the `<dict>` section. Replace `[BUNDLE_ID]` with the value you used in the Azure portal. If you downloaded the code, the bundle identifier is `com.microsoft.identitysample.MSALiOS`. If you're creating your own project, select your project in Xcode and open the **General** tab. The bundle identifier appears in the **Identity** section.
166+
In Xcode, open _Info.plist_ as a source code file, and add the following inside of the `<dict>` section. Replace `[BUNDLE_ID]` with the value you previously used. If you downloaded the code, the bundle identifier is `com.microsoft.identitysample.MSALiOS`. If you're creating your own project, select your project in Xcode and open the **General** tab. The bundle identifier appears in the **Identity** section.
167167

168168
```xml
169169
<key>CFBundleURLTypes</key>
@@ -846,7 +846,7 @@ This app is built for a single account scenario. MSAL also supports multi-accoun
846846

847847
Build and deploy the app to a test device or simulator. You should be able to sign in and get tokens for Azure AD or personal Microsoft accounts.
848848

849-
The first time a user signs into your app, they'll be prompted by Microsoft identity to consent to the permissions requested. While most users are capable of consenting, some Azure AD tenants have disabled user consent, which requires admins to consent on behalf of all users. To support this scenario, register your app's scopes in the Azure portal.
849+
The first time a user signs into your app, they'll be prompted by Microsoft identity to consent to the permissions requested. While most users are capable of consenting, some Azure AD tenants have disabled user consent, which requires admins to consent on behalf of all users. To support this scenario, register your app's scopes.
850850

851851
After you sign in, the app will display the data returned from the Microsoft Graph `/me` endpoint.
852852

0 commit comments

Comments
 (0)