Skip to content

Commit 46d188a

Browse files
huypubhuypub
authored
Merge pull request MicrosoftDocs#66071 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents dff930f + 6764208 commit 46d188a

30 files changed

+78
-58
lines changed

‎.openpublishing.redirection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17356,12 +17356,12 @@
1735617356
},
1735717357
{
1735817358
"source_path": "articles/active-directory/active-directory-reporting-api-audit-reference.md",
17359-
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/directoryaudit",
17359+
"redirect_url": "https://docs.microsoft.com/graph/api/resources/directoryaudit?view=graph-rest-beta",
1736017360
"redirect_document_id": false
1736117361
},
1736217362
{
1736317363
"source_path": "articles/active-directory/active-directory-reporting-api-sign-in-activity-reference.md",
17364-
"redirect_url": "https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/signin",
17364+
"redirect_url": "https://docs.microsoft.com/graph/api/resources/signin?view=graph-rest-beta",
1736517365
"redirect_document_id": false
1736617366
},
1736717367
{

‎articles/active-directory-b2c/user-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@ When you add a new work account, you need to consider the following configuratio
4343
You can use the following information to create a new work account:
4444

4545
- [Azure portal](../active-directory/fundamentals/add-users-azure-active-directory.md)
46-
- [Microsoft Graph](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/api/user_post_users)
46+
- [Microsoft Graph](https://docs.microsoft.com/graph/api/user-post-users?view=graph-rest-1.0)
4747

4848
### Update a user profile
4949

5050
You can use the following information to update the profile of a user:
5151

5252
- [Azure portal](../active-directory/fundamentals/active-directory-users-profile-azure-portal.md)
53-
- [Microsoft Graph](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/api/user_update)
53+
- [Microsoft Graph](https://docs.microsoft.com/graph/api/user-update?view=graph-rest-1.0)
5454

5555
### Reset a password for a user
5656

5757
You can use the following information to reset the password of a user:
5858

5959
- [Azure portal](../active-directory/fundamentals/active-directory-users-reset-password-azure-portal.md)
60-
- [Microsoft Graph](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/api/user_update)
60+
- [Microsoft Graph](https://docs.microsoft.com/graph/api/user-update?view=graph-rest-1.0)
6161

6262
## Guest user
6363

6464
You can invite external users to your tenant as a guest user. A typical scenario for inviting a guest user to your Azure AD B2C tenant is to share administration responsibilities. For an example of using a guest account, see [Properties of an Azure Active Directory B2B collaboration user](../active-directory/b2b/user-properties.md).
6565

6666
When you invite a guest user to your tenant, you provide the email address of the recipient and a message describing the invitation. The invitation link takes the user to the consent page where the **Get Started** button is selected and the review of permissions is accepted. If an inbox isn't attached to the email address, the user can navigate to the consent page by going to a Microsoft page using the invited credentials. The user is then forced to redeem the invitation the same way as clicking on the link in the email. For example: `https://myapps.microsoft.com/B2CTENANTNAME`.
6767

68-
You can also use the [Microsoft Graph API](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/api/invitation_post) to invite a guest user.
68+
You can also use the [Microsoft Graph API](https://docs.microsoft.com/graph/api/invitation-post?view=graph-rest-beta) to invite a guest user.
6969

7070
## Consumer user
7171

‎articles/active-directory/develop/active-directory-graph-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.custom: aaddev
2424
> [!IMPORTANT]
2525
> We strongly recommend that you use [Microsoft Graph](https://developer.microsoft.com/graph/) instead of Azure AD Graph API to access Azure Active Directory resources. Our development efforts are now concentrated on Microsoft Graph and no further enhancements are planned for Azure AD Graph API. There are a very limited number of scenarios for which Azure AD Graph API might still be appropriate; for more information, see the [Microsoft Graph or the Azure AD Graph](https://dev.office.com/blogs/microsoft-graph-or-azure-ad-graph) blog post in the Office Dev Center.
2626
27-
This article applies to Azure AD Graph API. For similar info related to Microsoft Graph API, see [Use the Microsoft Graph API](https://developer.microsoft.com/en-us/graph/docs/concepts/use_the_api).
27+
This article applies to Azure AD Graph API. For similar info related to Microsoft Graph API, see [Use the Microsoft Graph API](https://docs.microsoft.com/graph/use-the-api).
2828

2929
The Azure Active Directory Graph API provides programmatic access to Azure AD through REST API endpoints. Applications can use Azure AD Graph API to perform create, read, update, and delete (CRUD) operations on directory data and objects. For example, Azure AD Graph API supports the following common operations for a user object:
3030

‎articles/active-directory/develop/quickstart-v1-update-azure-ad-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ For more info on application manifest concepts in general, see [Azure AD app man
141141

142142
As mentioned earlier, in addition to exposing/accessing APIs for your own applications, you can register your client application to access APIs exposed by Microsoft resources. The Microsoft Graph API, referred to as “Microsoft Graph” in the portal's resource/API list, is available to all applications that are registered with Azure AD. If you are registering your client application in a tenant containing accounts that have signed up for an Office 365 subscription, you can also access the scopes exposed by the various Office 365 resources.
143143

144-
For a complete discussion on scopes exposed by Microsoft Graph API, see the [Microsoft Graph permissions reference](https://developer.microsoft.com/en-us/graph/docs/concepts/permissions_reference) article.
144+
For a complete discussion on scopes exposed by Microsoft Graph API, see the [Microsoft Graph permissions reference](https://docs.microsoft.com/graph/permissions-reference) article.
145145

146146
> [!NOTE]
147147
> Due to a current limitation, native client applications can only call into the Azure AD Graph API if they use the “Access your organization's directory” permission. This restriction does not apply for web applications.

‎articles/active-directory/develop/v1-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.custom: aaddev
2121

2222
# About v1.0
2323

24-
Azure Active Directory (Azure AD) is a cloud identity service that allows developers to build apps that securely sign in users with a Microsoft work or school account. Azure AD supports developers building both single-tenant, line-of-business (LOB) apps, as well as developers looking to develop multi-tenant apps. In addition to basic sign in, Azure AD also lets apps call both Microsoft APIs like [Microsoft Graph](https://developer.microsoft.com/en-us/graph/docs/concepts/overview) and custom APIs that are built on the Azure AD platform. This documentation shows you how to add Azure AD support to your application by using industry standard protocols like OAuth2.0 and OpenID Connect.
24+
Azure Active Directory (Azure AD) is a cloud identity service that allows developers to build apps that securely sign in users with a Microsoft work or school account. Azure AD supports developers building both single-tenant, line-of-business (LOB) apps, as well as developers looking to develop multi-tenant apps. In addition to basic sign in, Azure AD also lets apps call both Microsoft APIs like [Microsoft Graph](https://docs.microsoft.com/graph/overview) and custom APIs that are built on the Azure AD platform. This documentation shows you how to add Azure AD support to your application by using industry standard protocols like OAuth2.0 and OpenID Connect.
2525

2626
> [!NOTE]
2727
> Most of the content on this page focuses on the v1.0 endpoint and platform, which supports only Microsoft work or school accounts. If you want to sign in consumer or personal Microsoft accounts, see the information on the [v2.0 endpoint and platform](v2-overview.md). The v2.0 endpoint offers a unified developer experience for apps that want to sign in all Microsoft identities.

‎articles/active-directory/governance/create-access-review.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Based on your selections in Upon completion settings, auto-apply will be execute
110110

111111
## Create reviews via APIs
112112

113-
You can also create access reviews using APIs. What you do to manage access reviews of groups and application users in the Azure portal can also be done using Microsoft Graph APIs. For more information, see the [Azure AD Access Reviews API reference](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/accessreviews_root). For a code sample, see [Example of retrieving Azure AD Access Reviews via Microsoft Graph](https://techcommunity.microsoft.com/t5/Azure-Active-Directory/Example-of-retrieving-Azure-AD-access-reviews-via-Microsoft/m-p/236096).
113+
You can also create access reviews using APIs. What you do to manage access reviews of groups and application users in the Azure portal can also be done using Microsoft Graph APIs. For more information, see the [Azure AD Access Reviews API reference](https://docs.microsoft.com/graph/api/resources/accessreviews-root?view=graph-rest-beta). For a code sample, see [Example of retrieving Azure AD Access Reviews via Microsoft Graph](https://techcommunity.microsoft.com/t5/Azure-Active-Directory/Example-of-retrieving-Azure-AD-access-reviews-via-Microsoft/m-p/236096).
114114

115115
## Next steps
116116

‎articles/active-directory/identity-protection/graph-get-started.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ ms.custom: seohack1
2323

2424
Microsoft Graph is the Microsoft unified API endpoint and the home of [Azure Active Directory Identity Protection](../active-directory-identityprotection.md) APIs. There are three APIs that expose information about risky users and sign-ins. The first API, **identityRiskEvents**, allows you to query Microsoft Graph for a list of [risk events](../reports-monitoring/concept-risk-events.md) and associated information. The second API, **riskyUsers**, allows you to query Microsoft Graph for information about users Identity Protection detected as risk. The third API, **signIn**, allows you to query Microsoft Graph for information on Azure AD sign-ins with specific properties related to risk state, detail, and level. This article gets you started with [connecting to the Microsoft Graph](#Connect-to-Microsoft-Graph) and [querying these APIs](#Query-the-APIs). For an in-depth introduction, full documentation, and access to the Graph Explorer, see the [Microsoft Graph site](https://graph.microsoft.io/) or the specific reference documentation for these APIs:
2525

26-
* [identityRiskEvents API](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/identityriskevent)
27-
* [riskyUsers API](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/riskyuser)
28-
* [signIn API](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/signin)
26+
* [identityRiskEvents API](https://docs.microsoft.com/graph/api/resources/identityriskevent?view=graph-rest-beta)
27+
* [riskyUsers API](https://docs.microsoft.com/graph/api/resources/riskyuser?view=graph-rest-beta)
28+
* [signIn API](https://docs.microsoft.com/graph/api/resources/signin?view=graph-rest-beta)
2929

3030

3131
## Connect to Microsoft graph
@@ -212,7 +212,7 @@ Just add your client ID, the secret key, and the tenant domain.
212212

213213
## Query the APIs
214214

215-
These three APIs provide a multitude of opportunities to retrieve information about risky users and sign-ins in your organization. Below are some common use cases for these APIs and the associated sample requests. You can run these queries using the sample code above or by using [Graph Explorer](https://developer.microsoft.com/en-us/graph/graph-explorer).
215+
These three APIs provide a multitude of opportunities to retrieve information about risky users and sign-ins in your organization. Below are some common use cases for these APIs and the associated sample requests. You can run these queries using the sample code above or by using [Graph Explorer](https://developer.microsoft.com/graph/graph-explorer).
216216

217217
### Get the high-risk and medium-risk events (identityRiskEvents API)
218218

@@ -246,7 +246,7 @@ Congratulations, you just made your first call to Microsoft Graph!
246246
Now you can query identity risk events and use the data however you see fit.
247247

248248

249-
To learn more about Microsoft Graph and how to build applications using the Graph API, check out the [documentation](https://docs.microsoft.com/graph/overview) and much more on the [Microsoft Graph site](https://developer.microsoft.com/en-us/graph).
249+
To learn more about Microsoft Graph and how to build applications using the Graph API, check out the [documentation](https://docs.microsoft.com/graph/overview) and much more on the [Microsoft Graph site](https://developer.microsoft.com/graph).
250250

251251

252252
For related information, see:

‎articles/active-directory/manage-apps/application-provisioning-config-problem-scim-compatibility.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Yes. If you are already using this application instance for single sign-on, and
5757
1. Sign into the Azure portal at https://portal.azure.com.
5858
2. In the **Azure Active Directory > Enterprise Applications** section of the Azure portal, locate and select your existing SCIM application.
5959
3. In the **Properties** section of your existing SCIM app, copy the **Object ID**.
60-
4. In a new web browser window, go to https://developer.microsoft.com/en-us/graph/graph-explorer
60+
4. In a new web browser window, go to https://developer.microsoft.com/graph/graph-explorer
6161
and sign in as the administrator for the Azure AD tenant where your app is added.
6262
5. In the Graph Explorer, run the command below to locate the ID of your provisioning job. Replace "[object-id]" with the service principal ID (object ID) copied from the third step.
6363

@@ -98,7 +98,7 @@ Yes. If you had coded an application to the old behavior that existed prior to t
9898
1. Sign into the Azure portal at https://portal.azure.com.
9999
2. in the **Azure Active Directory > Enterprise Applications > Create application** section of the Azure portal, create a new **Non-gallery** application.
100100
3. In the **Properties** section of your new custom app, copy the **Object ID**.
101-
4. In a new web browser window, go to https://developer.microsoft.com/en-us/graph/graph-explorer
101+
4. In a new web browser window, go to https://developer.microsoft.com/graph/graph-explorer
102102
and sign in as the administrator for the Azure AD tenant where your app is added.
103103
5. In the Graph Explorer, run the command below to initialize the provisioning configuration for your app.
104104
Replace "[object-id]" with the service principal ID (object ID) copied from the third step.

‎articles/active-directory/manage-apps/howto-saml-token-encryption.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ Encrypting the SAML assertions between Azure AD and the application provides add
2929

3030
Even without token encryption, Azure AD SAML tokens are never passed on the network in the clear. Azure AD requires token request/response exchanges to take place over encrypted HTTPS/TLS channels so that communications between the IDP, browser, and application take place over encrypted links. Consider the value of token encryption for your situation compared with the overhead of managing additional certificates.
3131

32-
To configure token encryption, you need to upload an X509 certificate file that contains the public key to the Azure AD application object that represents the application. To obtain the X509 certificate, you can download it from the application itself, or get it from the application vendor in cases where the application vendor provides encryption keys or in cases where the application expects you to provide a private key, it can be created using cryptography tools, the private key portion uploaded to the application’s key store and the matching public key certificate uploaded to Azure AD.
32+
To configure token encryption, you need to upload an X.509 certificate file that contains the public key to the Azure AD application object that represents the application. To obtain the X.509 certificate, you can download it from the application itself, or get it from the application vendor in cases where the application vendor provides encryption keys or in cases where the application expects you to provide a private key, it can be created using cryptography tools, the private key portion uploaded to the application’s key store and the matching public key certificate uploaded to Azure AD.
3333

3434
Azure AD uses AES-256 to encrypt the SAML assertion data.
3535

3636
## Configure SAML token encryption
3737

38-
To configure SAML token encryption, follow these steps.
38+
To configure SAML token encryption, follow these steps:
3939

4040
1. Obtain a public key certificate that matches a private key that's configured in the application.
4141

42-
Create an asymmetric key pair to use for encryption. Or, if the application supplies a public key to use for encryption, follow the application's instructions to download the X509 certificate.
42+
Create an asymmetric key pair to use for encryption. Or, if the application supplies a public key to use for encryption, follow the application's instructions to download the X.509 certificate.
4343

44-
The public key should be stored in an X509 certificate file in .cer format.
44+
The public key should be stored in an X.509 certificate file in .cer format.
4545

4646
If the application uses a key that you create for your instance, follow the instructions provided by your application for installing the private key that the application will use to decrypt tokens from your Azure AD tenant.
4747

@@ -62,9 +62,9 @@ You can add the public cert to your application configuration within the Azure p
6262
> [!NOTE]
6363
> The **Token encryption** option is only available for SAML applications that have been set up from the **Enterprise applications** blade in the Azure portal, either from the Application Gallery or a Non-Gallery app. For other applications, this menu option is disabled. For applications registered through the **App registrations** experience in the Azure portal, you can configure encryption for SAML tokens using the application manifest, through Microsoft Graph or through PowerShell.
6464
65-
1. On the **Token encryption** page, select **Import Certificate** to import the .cer file that contains your public X509 certificate.
65+
1. On the **Token encryption** page, select **Import Certificate** to import the .cer file that contains your public X.509 certificate.
6666

67-
![Import the .cer file that contains the X509 certificate](./media/howto-saml-token-encryption/import-certificate-small.png)
67+
![Import the .cer file that contains the X.509 certificate](./media/howto-saml-token-encryption/import-certificate-small.png)
6868

6969
1. Once the certificate is imported, and the private key is configured for use on the application side, activate encryption by selecting the **...** next to the thumbprint status, and then select **Activate token encryption** from the options in the dropdown menu.
7070

@@ -90,7 +90,7 @@ When you configure a keyCredential using Graph, PowerShell, or in the applicatio
9090

9191
### To configure token encryption using Microsoft Graph
9292

93-
1. Update the application's `keyCredentials` with an X509 certificate for encryption. The following example shows how to do this.
93+
1. Update the application's `keyCredentials` with an X.509 certificate for encryption. The following example shows how to do this.
9494

9595
```
9696
Patch https://graph.microsoft.com/beta/applications/<application objectid>

0 commit comments

Comments
 (0)