Skip to content

Commit 61c8de2

Browse files
authored
Merge pull request #74242 from MicrosoftDocs/master
Merge master to live 3:00 AM
2 parents 3102f88 + 8ff42a2 commit 61c8de2

File tree

397 files changed

+3897
-2375
lines changed

Some content is hidden

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

397 files changed

+3897
-2375
lines changed

articles/active-directory-b2c/active-directory-b2c-reference-manage-sso-and-token-configuration.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ This article provides information about how you can manage your token, session,
1919

2020
## Token lifetimes and claims configuration
2121

22-
To change the settings on your token lifetimes, you add a [ClaimsProviders](claimsproviders.md) element in the relying party file of the policy you want to impact. The **ClaimsProviders** element is a child of the [TrustFrameworkPolicy](trustframeworkpolicy.md) element. Inside, you'll need to put the information that affects your token lifetimes. The XML looks like this example:
22+
To change the settings on your token lifetimes, you add a [ClaimsProviders](claimsproviders.md) element in the relying party file of the policy you want to impact. The **ClaimsProviders** element is a child of the [TrustFrameworkPolicy](trustframeworkpolicy.md) element.
23+
24+
Insert the ClaimsProviders element between the BasePolicy element and the RelyingParty element of the relying party file.
25+
26+
Inside, you'll need to put the information that affects your token lifetimes. The XML looks like this example:
2327

2428
```XML
2529
<ClaimsProviders>

articles/active-directory/develop/quickstart-v1-dotnet-webapi.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,23 @@ To validate incoming requests and tokens, you need to set up your application to
8888
}
8989
```
9090
91-
4. Open the file `App_Start\Startup.Auth.cs` and implement the `ConfigureAuth(…)` method. The parameters that you provide in `WindowsAzureActiveDirectoryBearerAuthenticationOptions` will serve as coordinates for your app to communicate with Azure AD.
91+
4. Open the file `App_Start\Startup.Auth.cs` and implement the `ConfigureAuth(…)` method. The parameters that you provide in `WindowsAzureActiveDirectoryBearerAuthenticationOptions` will serve as coordinates for your app to communicate with Azure AD. To use them you'll need to use classes in the `System.IdentityModel.Tokens` namespace.
92+
93+
```csharp
94+
using System.IdentityModel.Tokens;
95+
```
9296
9397
```csharp
9498
public void ConfigureAuth(IAppBuilder app)
9599
{
96100
app.UseWindowsAzureActiveDirectoryBearerAuthentication(
97101
new WindowsAzureActiveDirectoryBearerAuthenticationOptions
98102
{
99-
Audience = ConfigurationManager.AppSettings["ida:Audience"],
100-
Tenant = ConfigurationManager.AppSettings["ida:Tenant"]
103+
Tenant = ConfigurationManager.AppSettings["ida:Tenant"],
104+
TokenValidationParameters = new TokenValidationParameters
105+
{
106+
ValidAudience = ConfigurationManager.AppSettings["ida:Audience"]
107+
}
101108
});
102109
}
103110
```

articles/active-directory/develop/reference-v2-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Middleware libraries are used to protect Web applications and Web APIs. For web
6565

6666
| Platform | Library | Download | Source Code | Sample | Reference
6767
| --- | --- | --- | --- | --- | --- |
68-
| ![.NET](media/sample-v2-code/logo_NET.png) ![.NET Core](media/sample-v2-code/logo_NETcore.png) | ASP.NET Security |[NuGet](https://www.nuget.org/packages/Microsoft.AspNet.Mvc/) |[ASP.NET Security (GitHub)](https://github.com/aspnet/Security) |[MVC app](quickstart-v2-aspnet-webapp.md) |[ASP.NET API reference](https://docs.microsoft.com/dotnet/api/?view=aspnetcore-2.0) |
68+
| ![.NET](media/sample-v2-code/logo_NET.png) ![.NET Core](media/sample-v2-code/logo_NETcore.png) | ASP.NET Security |[NuGet](https://www.nuget.org/packages/Microsoft.AspNet.Mvc/) |[GitHub](https://github.com/aspnet/AspNetCore) |[MVC app](quickstart-v2-aspnet-webapp.md) |[ASP.NET API reference](https://docs.microsoft.com/dotnet/api/?view=aspnetcore-2.0) |
6969
| ![.NET](media/sample-v2-code/logo_NET.png)| IdentityModel Extensions for .NET| |[GitHub](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) | [MVC app](quickstart-v2-aspnet-webapp.md) |[Reference](https://docs.microsoft.com/dotnet/api/overview/azure/activedirectory/client?view=azure-dotnet) |
7070
| ![Node.js](media/sample-v2-code/logo_nodejs.png) | Azure AD Passport |[NPM](https://www.npmjs.com/package/passport-azure-ad) |[GitHub](https://github.com/AzureAD/passport-azure-ad) | [Web app](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-nodejs) | |
7171

articles/active-directory/saas-apps/cornerstone-ondemand-provisioning-tutorial.md

Lines changed: 59 additions & 57 deletions
Large diffs are not rendered by default.

articles/active-directory/saas-apps/factset-tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ To configure Azure AD single sign-on with FactSet, perform the following steps:
102102
![FactSet Domain and URLs single sign-on information](common/sp-identifier.png)
103103

104104
a. In the **Sign on URL** text box, type a URL using the following pattern:
105-
`https://login.factset.com/services/auth-test?idpid=<GUID>`
105+
`https://<intendedDestinationURL>.factset.com?idpid=<GUID>`
106106

107107
b. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
108108
`https://login.factset.com`
109109

110110
> [!NOTE]
111-
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [FactSet Client support team](mailto:support@factset.com) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
111+
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact your FactSet account representative to get these values. If you don't know who your FactSet representative is, you can find help on the [FactSet support numbers page](https://www.factset.com/support-numbers). You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
112112

113113
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
114114

@@ -126,7 +126,7 @@ To configure Azure AD single sign-on with FactSet, perform the following steps:
126126

127127
### Configure FactSet Single Sign-On
128128

129-
To configure single sign-on on **FactSet** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [FactSet support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
129+
To configure single sign-on on **FactSet** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to FactSet Support individuals you are in contact with. They set this setting to have the SAML SSO connection set properly on both sides.
130130

131131
### Create an Azure AD test user
132132

@@ -181,7 +181,7 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
181181

182182
### Create FactSet test user
183183

184-
In this section, you create a user called Britta Simon in FactSet. Work with [FactSet support team](mailto:support@factset.com) to add the users in the FactSet platform. Users must be created and activated before you use single sign-on.
184+
In this section, you create a user called Britta Simon in FactSet. Work with your FactSet account support representatives to add the users in the FactSet platform. Users must be created and activated before you use single sign-on.
185185

186186
### Test single sign-on
187187

articles/active-directory/saas-apps/hrworks-single-sign-on-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To configure Azure AD single sign-on with HRworks Single Sign-On, perform the fo
105105
`https://login.hrworks.de/?companyId=<companyId>&directssologin=true`
106106

107107
> [!NOTE]
108-
> The value is not real. Update the value with the actual Sign-On URL. Contact [HRworks Single Sign-On Client support team](mailto:nadja.sommerfeld@hrworks.de) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
108+
> The value is not real. Update the value with the actual Sign-On URL. Contact [HRworks Single Sign-On Client support team](mailto:support@hrworks.de) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
109109

110110
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
111111

0 commit comments

Comments
 (0)