Skip to content

Commit 3cccde6

Browse files
committed
fixing merge conflict
2 parents 871297a + 6bc43cb commit 3cccde6

File tree

72 files changed

+833
-543
lines changed

Some content is hidden

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

72 files changed

+833
-543
lines changed

articles/active-directory/develop/configure-token-lifetimes.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,30 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 04/08/2021
12+
ms.date: 10/17/2022
1313
ms.author: ryanwi
14-
ms.custom: aaddev, contperf-fy21q1
14+
ms.custom: identityplatformtop40, contperf-fy21q2, engagement-fy23
1515
ms.reviewer: ludwignick, jlu, annaba
1616
---
1717
# Configure token lifetime policies (preview)
18-
You can specify the lifetime of an access, SAML, or ID token issued by Microsoft identity platform. You can set token lifetimes for all apps in your organization, for a multi-tenant (multi-organization) application, or for a specific service principal in your organization. For more info, read [configurable token lifetimes](active-directory-configurable-token-lifetimes.md).
1918

20-
In this section, we walk through a common policy scenario that can help you impose new rules for token lifetime. In the example, you learn how to create a policy that requires users to authenticate more frequently in your web app.
19+
In the following steps, you'll implement a common policy scenario that imposes new rules for token lifetime. It's possible to specify the lifetime of an access, SAML, or ID token issued by the Microsoft identity platform. This can be set for all apps in your organization or for a specific service principal. They can also be set for multi-organizations (multi-tenant application).
20+
21+
For more information, see [configurable token lifetimes](active-directory-configurable-token-lifetimes.md).
2122

2223
## Get started
2324

2425
To get started, download the latest [Azure AD PowerShell Module Public Preview release](https://www.powershellgallery.com/packages/AzureADPreview).
2526

26-
Next, run the `Connect` command to sign in to your Azure AD admin account. Run this command each time you start a new session.
27+
Next, run the `Connect-AzureAD` command to sign in to your Azure Active Directory (Azure AD) admin account. Run this command each time you start a new session.
2728

2829
```powershell
2930
Connect-AzureAD -Confirm
3031
```
3132

3233
## Create a policy for web sign-in
3334

34-
In this example, you create a policy that requires users to authenticate more frequently in your web app. This policy sets the lifetime of the access/ID tokens to the service principal of your web app.
35+
In the following steps, you'll create a policy that requires users to authenticate more frequently in your web app. This policy sets the lifetime of the access/ID tokens to the service principal of your web app.
3536

3637
1. Create a token lifetime policy.
3738

@@ -73,7 +74,7 @@ To see all policies that have been created in your organization, run the [Get-Az
7374
Get-AzureADPolicy -All $true
7475
```
7576

76-
To see which apps and service principals are linked to a specific policy you identified run the following [Get-AzureADPolicyAppliedObject](/powershell/module/azuread/get-azureadpolicyappliedobject?view=azureadps-2.0-preview&preserve-view=true) cmdlet by replacing **1a37dad8-5da7-4cc8-87c7-efbc0326cf20** with any of your policy IDs. Then you can decide whether to configure Conditional Access sign-in frequency or remain with the Azure AD defaults.
77+
To see which apps and service principals are linked to a specific policy that you identified, run the following [`Get-AzureADPolicyAppliedObject`](/powershell/module/azuread/get-azureadpolicyappliedobject?view=azureadps-2.0-preview&preserve-view=true) cmdlet by replacing `1a37dad8-5da7-4cc8-87c7-efbc0326cf20` with any of your policy IDs. Then you can decide whether to configure Conditional Access sign-in frequency or remain with the Azure AD defaults.
7778

7879
```powershell
7980
Get-AzureADPolicyAppliedObject -id 1a37dad8-5da7-4cc8-87c7-efbc0326cf20
@@ -82,7 +83,7 @@ Get-AzureADPolicyAppliedObject -id 1a37dad8-5da7-4cc8-87c7-efbc0326cf20
8283
If your tenant has policies which define custom values for the refresh and session token configuration properties, Microsoft recommends you update those policies to values that reflect the defaults described above. If no changes are made, Azure AD will automatically honor the default values.
8384

8485
### Troubleshooting
85-
Some users have reported a `Get-AzureADPolicy : The term 'Get-AzureADPolicy' is not recognized` error after running the `Get-AzureADPolicy` cmdlet. As a workaround, run the following to uninstall/re-install the AzureAD module and then install the AzureADPreview module:
86+
Some users have reported a `Get-AzureADPolicy : The term 'Get-AzureADPolicy' is not recognized` error after running the `Get-AzureADPolicy` cmdlet. As a workaround, run the following to uninstall/re-install the AzureAD module, and then install the AzureADPreview module:
8687

8788
```powershell
8889
# Uninstall the AzureAD Module

articles/active-directory/develop/howto-create-self-signed-certificate.md

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 08/10/2021
12+
ms.date: 10/17/2022
1313
ms.author: henrymbugua
1414
ms.reviewer: jmprieur, saeeda, sureshja, ludwignick
15-
ms.custom: scenarios:getting-started
15+
ms.custom: scenarios:getting-started, engagement-fy23
1616
#Customer intent: As an application developer, I want to understand the basic concepts of authentication and authorization in the Microsoft identity platform.
1717
---
1818

1919
# Create a self-signed public certificate to authenticate your application
2020

21-
Azure Active Directory (Azure AD) supports two types of authentication for service principals: **password-based authentication** (app secret) and **certificate-based authentication**. While app secrets can easily be created in the Azure portal, it's recommended that your application uses a certificate.
21+
Azure Active Directory (Azure AD) supports two types of authentication for service principals: **password-based authentication** (app secret) and **certificate-based authentication**. While app secrets can easily be created in the Azure portal, they're long-lived, and not as secure as certificates. It's therefore recommended that your application uses a certificate rather than a secret.
2222

23-
For testing, you can use a self-signed public certificate instead of a Certificate Authority (CA)-signed certificate. This article shows you how to use Windows PowerShell to create and export a self-signed certificate.
23+
For testing, you can use a self-signed public certificate instead of a Certificate Authority (CA)-signed certificate. In this how-to, you'll use Windows PowerShell to create and export a self-signed certificate.
2424

2525
> [!CAUTION]
2626
> Self-signed certificates are not trusted by default and they can be difficult to maintain. Also, they may use outdated hash and cipher suites that may not be strong. For better security, purchase a certificate signed by a well-known certificate authority.
2727
28-
You configure various parameters for the certificate. For example, the cryptographic and hash algorithms, the certificate validity period, and your domain name. Then export the certificate with or without its private key depending on your application needs.
28+
While creating the certificate using PowerShell, you can specify parameters like cryptographic and hash algorithms, certificate validity period, and domain name. The certificate can then be exported with or without its private key depending on your application needs.
2929

30-
The application that initiates the authentication session requires the private key while the application that confirms the authentication requires the public key. So, if you're authenticating from your PowerShell desktop app to Azure AD, you only export the public key (`.cer` file) and upload it to the Azure portal. Your PowerShell app uses the private key from your local certificate store to initiate authentication and obtain access tokens for Microsoft Graph.
30+
The application that initiates the authentication session requires the private key while the application that confirms the authentication requires the public key. So, if you're authenticating from your PowerShell desktop app to Azure AD, you only export the public key (*.cer* file) and upload it to the Azure portal. The PowerShell app uses the private key from your local certificate store to initiate authentication and obtain access tokens for Microsoft Graph.
3131

32-
Your application may also be running from another machine, such as Azure Automation. In this scenario, you export the public and private key pair from your local certificate store, upload the public key to the Azure portal, and the private key (a `.pfx` file) to Azure Automation. Your application running in Azure Automation will use the private key to initiate authentication and obtain access tokens for Microsoft Graph.
32+
Your application may also be running from another machine, such as Azure Automation. In this scenario, you export the public and private key pair from your local certificate store, upload the public key to the Azure portal, and the private key (a *.pfx* file) to Azure Automation. Your application running in Azure Automation will use the private key to initiate authentication and obtain access tokens for Microsoft Graph.
3333

3434
This article uses the `New-SelfSignedCertificate` PowerShell cmdlet to create the self-signed certificate and the `Export-Certificate` cmdlet to export it to a location that is easily accessible. These cmdlets are built-in to modern versions of Windows (Windows 8.1 and greater, and Windows Server 2012R2 and greater). The self-signed certificate will have the following configuration:
3535

@@ -39,11 +39,10 @@ This article uses the `New-SelfSignedCertificate` PowerShell cmdlet to create th
3939
+ The certificate is valid for only one year.
4040
+ The certificate is supported for use for both client and server authentication.
4141

42-
> [!NOTE]
43-
> To customize the start and expiry date as well as other properties of the certificate, see the [`New-SelfSignedCertificate` reference](/powershell/module/pki/new-selfsignedcertificate?view=windowsserver2019-ps&preserve-view=true).
42+
To customize the start and expiry date and other properties of the certificate, refer to [New-SelfSignedCertificate](/powershell/module/pki/new-selfsignedcertificate?view=windowsserver2019-ps&preserve-view=true).
4443

4544

46-
## Option 1: Create and export your public certificate without a private key
45+
## Create and export your public certificate
4746

4847
Use the certificate you create using this method to authenticate from an application running from your machine. For example, authenticate from Windows PowerShell.
4948

@@ -55,7 +54,7 @@ $cert = New-SelfSignedCertificate -Subject "CN=$certname" -CertStoreLocation "Ce
5554
5655
```
5756

58-
The **$cert** variable in the previous command stores your certificate in the current session and allows you to export it. The command below exports the certificate in `.cer` format. You can also export it in other formats supported on the Azure portal including `.pem` and `.crt`.
57+
The `$cert` variable in the previous command stores your certificate in the current session and allows you to export it. The command below exports the certificate in *.cer* format. You can also export it in other formats supported on the Azure portal including *.pem* and *.crt*.
5958

6059
```powershell
6160
@@ -65,50 +64,32 @@ Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.cer"
6564

6665
Your certificate is now ready to upload to the Azure portal. Once uploaded, retrieve the certificate thumbprint for use to authenticate your application.
6766

67+
## (Optional): Export your public certificate with its private key
6868

69-
## Option 2: Create and export your public certificate with its private key
69+
If your application will be running from another machine or cloud, such as Azure Automation, you'll also need a private key.
7070

71-
Use this option to create a certificate and its private key if your application will be running from another machine or cloud, such as Azure Automation.
72-
73-
In an elevated PowerShell prompt, run the following command and leave the PowerShell console session open. Replace `{certificateName}` with name that you wish to give your certificate.
74-
75-
```powershell
76-
$certname = "{certificateName}" ## Replace {certificateName}
77-
$cert = New-SelfSignedCertificate -Subject "CN=$certname" -CertStoreLocation "Cert:\CurrentUser\My" -KeyExportPolicy Exportable -KeySpec Signature -KeyLength 2048 -KeyAlgorithm RSA -HashAlgorithm SHA256
78-
79-
```
80-
81-
The **$cert** variable in the previous command stores your certificate in the current session and allows you to export it. The command below exports the certificate in `.cer` format. You can also export it in other formats supported on the Azure portal including `.pem` and `.crt`.
82-
83-
84-
```powershell
85-
86-
Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.cer" ## Specify your preferred location
87-
88-
```
89-
90-
Still in the same session, create a password for your certificate private key and save it in a variable. In the following command, replace `{myPassword}` with the password that you wish to use to protect your certificate private key.
71+
Following on from the previous commands, create a password for your certificate private key and save it in a variable. Replace `{myPassword}` with the password that you wish to use to protect your certificate private key.
9172

9273
```powershell
9374
9475
$mypwd = ConvertTo-SecureString -String "{myPassword}" -Force -AsPlainText ## Replace {myPassword}
9576
9677
```
9778

98-
Now, using the password you stored in the `$mypwd` variable, secure, and export your private key.
79+
Using the password you stored in the `$mypwd` variable, secure and export your private key using the command;
9980

10081
```powershell
10182
10283
Export-PfxCertificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.pfx" -Password $mypwd ## Specify your preferred location
10384
10485
```
10586

106-
Your certificate (`.cer` file) is now ready to upload to the Azure portal. You also have a private key (`.pfx` file) that is encrypted and can't be read by other parties. Once uploaded, retrieve the certificate thumbprint for use to authenticate your application.
87+
Your certificate (*.cer* file) is now ready to upload to the Azure portal. The private key (*.pfx* file) is encrypted and can't be read by other parties. Once uploaded, retrieve the certificate thumbprint, which you can use to authenticate your application.
10788

10889

10990
## Optional task: Delete the certificate from the keystore.
11091

111-
If you created the certificate using Option 2, you can delete the key pair from your personal store. First, run the following command to retrieve the certificate thumbprint.
92+
You can delete the key pair from your personal store by running the following command to retrieve the certificate thumbprint.
11293

11394
```powershell
11495

articles/active-directory/develop/v2-overview.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: overview
1111
ms.workload: identity
12-
ms.date: 09/13/2021
12+
ms.date: 10/18/2022
1313
ms.author: ryanwi
1414
ms.reviewer: agirling, saeeda, benv
15-
ms.custom: identityplatformtop40, contperf-fy21q2
15+
ms.custom: identityplatformtop40, contperf-fy21q2, engagement-fy23
1616
# Customer intent: As an application developer, I want a quick introduction to the Microsoft identity platform so I can decide if this platform meets my application development requirements.
1717
---
1818

1919
# What is the Microsoft identity platform?
2020

21-
The Microsoft identity platform helps you build applications your users and customers can sign in to using their Microsoft identities or social accounts, and provide authorized access to your own APIs or Microsoft APIs like Microsoft Graph.
21+
The Microsoft identity platform helps you build applications your users and customers can sign in to using their Microsoft identities or social accounts. It authorizes access to your own APIs or Microsoft APIs like Microsoft Graph.
2222

2323
There are several components that make up the Microsoft identity platform:
2424

2525
- **OAuth 2.0 and OpenID Connect standard-compliant authentication service** enabling developers to authenticate several identity types, including:
2626
- Work or school accounts, provisioned through Azure AD
27-
- Personal Microsoft account, like Skype, Xbox, and Outlook.com
27+
- Personal Microsoft accounts (Skype, Xbox, Outlook.com)
2828
- Social or local accounts, by using Azure AD B2C
29-
- **Open-source libraries**: Microsoft Authentication Libraries (MSAL) and support for other standards-compliant libraries
29+
- **Open-source libraries**: Microsoft Authentication Library (MSAL) and support for other standards-compliant libraries.
3030
- **Application management portal**: A registration and configuration experience in the Azure portal, along with the other Azure management capabilities.
3131
- **Application configuration API and PowerShell**: Programmatic configuration of your applications through the Microsoft Graph API and PowerShell so you can automate your DevOps tasks.
3232
- **Developer content**: Technical documentation including quickstarts, tutorials, how-to guides, and code samples.
3333

34-
For developers, the Microsoft identity platform offers integration of modern innovations in the identity and security space like passwordless authentication, step-up authentication, and Conditional Access. You don't need to implement such functionality yourself: applications integrated with the Microsoft identity platform natively take advantage of such innovations.
34+
> [!VIDEO https://www.youtube.com/embed/uDU1QTSw7Ps]
3535
36-
With the Microsoft identity platform, you can write code once and reach any user. You can build an app once and have it work across many platforms, or build an app that functions as a client as well as a resource application (API).
36+
For developers, the Microsoft identity platform offers integration of modern innovations in the identity and security space like passwordless authentication, step-up authentication, and Conditional Access. You don't need to implement such functionality yourself. Applications integrated with the Microsoft identity platform natively take advantage of such innovations.
3737

38-
For a video overview of the platform and a demo of the authentication experience, see [What is the Microsoft identity platform for developers?](https://youtu.be/uDU1QTSw7Ps).
38+
With the Microsoft identity platform, you can write code once and reach any user. You can build an app once and have it work across many platforms, or build an app that functions as both a client and a resource application (API).
3939

4040
## Getting started
4141

42-
Choose the [application scenario](authentication-flows-app-scenarios.md) you'd like to build. Each of these scenario paths starts with an overview and links to a quickstart to help you get up and running:
42+
Choose your preferred [application scenario](authentication-flows-app-scenarios.md). Each of these scenario paths has an overview and links to a quickstart to help you get started:
4343

4444
- [Single-page app (SPA)](scenario-spa-overview.md)
4545
- [Web app that signs in users](scenario-web-app-sign-user-overview.md)
@@ -72,12 +72,13 @@ Learn how core authentication and Azure AD concepts apply to the Microsoft ident
7272

7373
[Azure AD B2B](../external-identities/what-is-b2b.md) - Invite external users into your Azure AD tenant as "guest" users, and assign permissions for authorization while they use their existing credentials for authentication.
7474

75-
[Azure Active Directory for developers (v1.0)](../azuread-dev/v1-overview.md) - Shown here for developers with existing apps that use the older v1.0 endpoint. **Do not** use v1.0 for new projects.
75+
[Azure Active Directory for developers (v1.0)](../azuread-dev/v1-overview.md) - Exclusively for developers with existing apps that use the older v1.0 endpoint. **Do not** use v1.0 for new projects.
7676

7777
## Next steps
7878

79-
If you have an Azure account you already have access to an Azure Active Directory tenant, but most Microsoft identity platform developers need their own Azure AD tenant for use while developing applications, a "dev tenant."
79+
If you have an Azure account, then you have access to an Azure Active Directory tenant. However, most Microsoft identity platform developers need their own Azure AD tenant for use while developing applications, known as a *dev tenant*.
8080

8181
Learn how to create your own tenant for use while building your applications:
8282

83-
[Quickstart: Set up an Azure AD tenant](quickstart-create-new-tenant.md)
83+
> [!div class="nextstepaction"]
84+
> [Quickstart: Set up an Azure AD tenant](quickstart-create-new-tenant.md)
15.3 KB
Loading
Loading
163 KB
Loading

0 commit comments

Comments
 (0)