Skip to content

Commit e64d209

Browse files
authored
Merge pull request #244367 from OwenRichards1/final-include
final-includes
2 parents 7419349 + 2f0421f commit e64d209

33 files changed

+37
-37
lines changed
File renamed without changes.

includes/active-directory-develop-guidedsetup-windesktop-test.md renamed to articles/active-directory/develop/includes/guidedsetup-windesktop-test.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ ms.custom: include file
2222

2323
To run your project, in Visual Studio, select **F5**. Your application **MainWindow** is displayed, as shown here:
2424

25-
![Test your application.](./media/develop-guidedsetup-windesktop-test/samplescreenshot.png)
25+
![Test your application.](../media/guidedsetup-windesktop-test/sample-screenshot.png)
2626

2727
The first time that you run the application and select the **Call Microsoft Graph API** button, you're prompted to sign in. Use an Azure Active Directory account (work or school account) or a Microsoft account (live.com, outlook.com) to test it.
2828

29-
![Sign in to the application.](./media/develop-guidedsetup-windesktop-test/signinscreenshot.png)
29+
![Sign in to the application.](../media/guidedsetup-windesktop-test/sign-in-screenshot.png)
3030

3131
### Provide consent for application access
3232

3333
The first time that you sign in to your application, you're also prompted to provide consent to allow the application to access your profile and sign you in, as shown here:
3434

35-
![Provide your consent for application access.](./media/develop-guidedsetup-windesktop-test/consentscreen.png)
35+
![Provide your consent for application access.](../media/guidedsetup-windesktop-test/consent-screen.png)
3636

3737
### View application results
3838

@@ -52,4 +52,4 @@ To access the user's calendars in the context of an application, add the *Calend
5252
>[!NOTE]
5353
>The user might be prompted for additional consents as you increase the number of scopes.
5454
55-
[!INCLUDE [Help and support](../articles/active-directory/develop/includes/error-handling-and-tips/help-support-include.md)]
55+
[!INCLUDE [Help and support](./error-handling-and-tips/help-support-include.md)]

includes/active-directory-develop-quickstart-register-app.md renamed to articles/active-directory/develop/includes/registration/quickstart-register-app.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ Get started with the Microsoft identity platform by registering an application i
2222
The Microsoft identity platform performs identity and access management (IAM) only for registered applications. Whether it's a client application like a web or mobile app, or it's a web API that backs a client app, registering it establishes a trust relationship between your application and the identity provider, the Microsoft identity platform.
2323

2424
> [!TIP]
25-
> To register an application for Azure AD B2C, follow the steps in [Tutorial: Register a web application in Azure AD B2C](../articles/active-directory-b2c/tutorial-register-applications.md).
25+
> To register an application for Azure AD B2C, follow the steps in [Tutorial: Register a web application in Azure AD B2C](../../../../active-directory-b2c/tutorial-register-applications.md).
2626
2727
## Prerequisites
2828

2929
- An Azure account that has an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3030
- The Azure account must have permission to manage applications in Azure Active Directory (Azure AD). Any of the following Azure AD roles include the required permissions:
31-
- [Application administrator](../articles/active-directory/roles/permissions-reference.md#application-administrator)
32-
- [Application developer](../articles/active-directory/roles/permissions-reference.md#application-developer)
33-
- [Cloud application administrator](../articles/active-directory/roles/permissions-reference.md#cloud-application-administrator)
34-
- Completion of the [Set up a tenant](../articles/active-directory/develop/quickstart-create-new-tenant.md) quickstart.
31+
- [Application administrator](../../../../active-directory/roles/permissions-reference.md#application-administrator)
32+
- [Application developer](../../../../active-directory/roles/permissions-reference.md#application-developer)
33+
- [Cloud application administrator](../../../../active-directory/roles/permissions-reference.md#cloud-application-administrator)
34+
- Completion of the [Set up a tenant](../../../../active-directory/develop/quickstart-create-new-tenant.md) quickstart.
3535

3636
## Register an application
3737

@@ -101,24 +101,24 @@ To configure application settings based on the platform or device you're targeti
101101

102102
### Redirect URI restrictions
103103

104-
There are some restrictions on the format of the redirect URIs you add to an app registration. For details about these restrictions, see [Redirect URI (reply URL) restrictions and limitations](../articles/active-directory/develop/reply-url.md).
104+
There are some restrictions on the format of the redirect URIs you add to an app registration. For details about these restrictions, see [Redirect URI (reply URL) restrictions and limitations](../../reply-url.md).
105105

106106
## Add credentials
107107

108-
Credentials are used by [confidential client applications](../articles/active-directory/develop/msal-client-applications.md) that access a web API. Examples of confidential clients are web apps, other web APIs, or service-type and daemon-type applications. Credentials allow your application to authenticate as itself, requiring no interaction from a user at runtime.
108+
Credentials are used by [confidential client applications](../../msal-client-applications.md) that access a web API. Examples of confidential clients are web apps, other web APIs, or service-type and daemon-type applications. Credentials allow your application to authenticate as itself, requiring no interaction from a user at runtime.
109109

110110
You can add certificates, client secrets (a string), or federated identity credentials as credentials to your confidential client app registration.
111111

112112
:::image type="content" source="/azure/active-directory/develop/media/quickstart-register-app/portal-05-app-reg-04-credentials.png" alt-text="Screenshot of the Azure portal, showing the Certificates and secrets pane in an app registration.":::
113113

114114
### Add a certificate
115115

116-
Sometimes called a _public key_, a certificate is the recommended credential type because they're considered more secure than client secrets. For more information about using a certificate as an authentication method in your application, see [Microsoft identity platform application authentication certificate credentials](../articles/active-directory/develop/active-directory-certificate-credentials.md).
116+
Sometimes called a _public key_, a certificate is the recommended credential type because they're considered more secure than client secrets. For more information about using a certificate as an authentication method in your application, see [Microsoft identity platform application authentication certificate credentials](../../certificate-credentials.md).
117117

118118
1. In the Azure portal, in **App registrations**, select your application.
119-
1. Select **Certificates & secrets** > **Certificates** > **Upload certificate**.
120-
1. Select the file you want to upload. It must be one of the following file types: _.cer_, _.pem_, _.crt_.
121-
1. Select **Add**.
119+
2. Select **Certificates & secrets** > **Certificates** > **Upload certificate**.
120+
3. Select the file you want to upload. It must be one of the following file types: _.cer_, _.pem_, _.crt_.
121+
4. Select **Add**.
122122

123123
### Add a client secret
124124

@@ -135,7 +135,7 @@ Client secrets are considered less secure than certificate credentials. Applicat
135135
1. Select **Add**.
136136
1. _Record the secret's value_ for use in your client application code. This secret value is _never displayed again_ after you leave this page.
137137

138-
For application security recommendations, see [Microsoft identity platform best practices and recommendations](../articles/active-directory/develop/identity-platform-integration-checklist.md#security).
138+
For application security recommendations, see [Microsoft identity platform best practices and recommendations](../../identity-platform-integration-checklist.md#security).
139139

140140
If you're using an Azure DevOps service connection that automatically creates a service principal, you need to update the client secret from the Azure DevOps portal site instead of directly updating the client secret. Refer to this document on how to update the client secret from the Azure DevOps portal site:
141141
[Troubleshoot Azure Resource Manager service connections](/azure/devops/pipelines/release/azure-rm-endpoint#service-principals-token-expired).
@@ -151,9 +151,9 @@ To add a federated credential, follow these steps:
151151
1. In the **Federated credential scenario** drop-down box, select one of the supported scenarios, and follow the corresponding guidance to complete the configuration.
152152

153153
- **Customer managed keys** for encrypt data in your tenant using Azure Key Vault in another tenant.
154-
- **GitHub actions deploying Azure resources** to [configure a GitHub workflow](../articles/active-directory/develop/workload-identity-federation-create-trust.md#github-actions) to get tokens for your application and deploy assets to Azure.
155-
- **Kubernetes accessing Azure resources** to configure a [Kubernetes service account](../articles/active-directory/develop/workload-identity-federation-create-trust.md#kubernetes) to get tokens for your application and access Azure resources.
156-
- **Other issuer** to configure an identity managed by an external [OpenID Connect provider](../articles/active-directory/develop/workload-identity-federation-create-trust.md#other-identity-providers) to get tokens for your application and access Azure resources.
154+
- **GitHub actions deploying Azure resources** to [configure a GitHub workflow](../../../workload-identities/workload-identity-federation-create-trust.md#github-actions) to get tokens for your application and deploy assets to Azure.
155+
- **Kubernetes accessing Azure resources** to configure a [Kubernetes service account](../../../workload-identities/workload-identity-federation-create-trust.md#kubernetes) to get tokens for your application and access Azure resources.
156+
- **Other issuer** to configure an identity managed by an external [OpenID Connect provider](../../../workload-identities/workload-identity-federation-create-trust.md#other-identity-providers) to get tokens for your application and access Azure resources.
157157

158158

159-
For more information, how to get an access token with a federated credential, check out the [Microsoft identity platform and the OAuth 2.0 client credentials flow](../articles/active-directory/develop/v2-oauth2-client-creds-grant-flow.md#third-case-access-token-request-with-a-federated-credential) article.
159+
For more information, how to get an access token with a federated credential, check out the [Microsoft identity platform and the OAuth 2.0 client credentials flow](../../v2-oauth2-client-creds-grant-flow.md#third-case-access-token-request-with-a-federated-credential) article.

0 commit comments

Comments
 (0)