Merged commit b5d62a9 from https://github.com/MartijnKooij/authservices/

with latest commit 782ac71 from https://github.com/Sustainsys/Saml2/
ThiemeNL · Mar 15, 2018 · 98309c6 · 98309c6
1 parent 782ac71
commit 98309c6
Show file tree

Hide file tree

Showing 308 changed files with 1,160 additions and 1,577 deletions.
diff --git a/.../SampleAspNetCore2ApplicationNETFramework/SampleAspNetCore2ApplicationNETFramework.csproj b/.../SampleAspNetCore2ApplicationNETFramework/SampleAspNetCore2ApplicationNETFramework.csproj
@@ -4,18 +4,18 @@
     <UserSecretsId>aspnet-SampleAspNetCore2ApplicationNETFramework-80AA900B-830E-447E-926E-5B6087BFF10D</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />

diff --git a/Samples/SampleAspNetCore2ApplicationNETFramework/Startup.cs b/Samples/SampleAspNetCore2ApplicationNETFramework/Startup.cs
@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using SampleAspNetCore2ApplicationNETFramework.Data;
 using SampleAspNetCore2ApplicationNETFramework.Services;
 using System.IdentityModel.Metadata;
+
 using Sustainsys.Saml2;
 using System.Security.Cryptography.X509Certificates;
+using Sustainsys.Saml2.AspNetCore2;
 
 namespace SampleAspNetCore2ApplicationNETFramework
 {
@@ -50,6 +47,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddAuthentication()
                 .AddSaml2(options => 
                 {
+
                     options.SPOptions.EntityId = new EntityId("https://localhost:44342/Saml2");
                     options.IdentityProviders.Add(
                         new IdentityProvider(

diff --git a/Samples/SampleHttpModuleApplication/App_Start/BundleConfig.cs b/Samples/SampleHttpModuleApplication/App_Start/BundleConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Optimization;
+using System.Web.Optimization;
 
 namespace SampleApplication
 {

diff --git a/Samples/SampleHttpModuleApplication/App_Start/FilterConfig.cs b/Samples/SampleHttpModuleApplication/App_Start/FilterConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
 namespace SampleApplication
 {

diff --git a/Samples/SampleHttpModuleApplication/App_Start/RouteConfig.cs b/Samples/SampleHttpModuleApplication/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace SampleApplication

diff --git a/Samples/SampleHttpModuleApplication/Global.asax.cs b/Samples/SampleHttpModuleApplication/Global.asax.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
 

diff --git a/Samples/SampleHttpModuleApplication/Properties/AssemblyInfo.cs b/Samples/SampleHttpModuleApplication/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Samples/SampleHttpModuleApplication/SampleHttpModuleApplication.csproj b/Samples/SampleHttpModuleApplication/SampleHttpModuleApplication.csproj
@@ -48,8 +48,7 @@
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -59,25 +58,21 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Routing" />
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />

diff --git a/Samples/SampleHttpModuleApplication/Web.config b/Samples/SampleHttpModuleApplication/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=152368
@@ -17,8 +17,8 @@
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
   </appSettings>
   <system.web>
-    <httpRuntime targetFramework="4.5"/>
-    <compilation debug="true" targetFramework="4.6.2"/>
+    <httpRuntime targetFramework="4.5" />
+    <compilation debug="true" targetFramework="4.6.2" />
     <authentication mode="Forms">
       <forms loginUrl="~/Account/Login" timeout="2880" />
     </authentication>
@@ -41,8 +41,7 @@
       <add name="Saml2AuthenticationModule" type="Sustainsys.Saml2.HttpModule.Saml2AuthenticationModule, Sustainsys.Saml2.HttpModule" />
     </modules>
   </system.webServer>
-  <sustainsys.saml2 entityId="http://localhost:17009/SamplePath/Saml2" returnUrl="http://localhost:17009/SamplePath/" discoveryServiceUrl="http://localhost:52071/DiscoveryService"
-                       authenticateRequestSigningBehavior="Always">
+  <sustainsys.saml2 entityId="http://localhost:17009/SamplePath/Saml2" returnUrl="http://localhost:17009/SamplePath/" discoveryServiceUrl="http://localhost:52071/DiscoveryService" authenticateRequestSigningBehavior="Always">
     <nameIdPolicy allowCreate="true" format="Persistent" />
     <requestedAuthnContext classRef="Password" comparison="Minimum" />
     <identityProviders>
@@ -59,7 +58,7 @@
   </sustainsys.saml2>
   <system.identityModel.services>
     <federationConfiguration>
-      <cookieHandler requireSsl="false" name="SampleApplicationAuth"/>
+      <cookieHandler requireSsl="false" name="SampleApplicationAuth" />
     </federationConfiguration>
   </system.identityModel.services>
   <runtime>
@@ -72,14 +71,6 @@
         <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -100,6 +91,14 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Samples/SampleHttpModuleApplication/packages.config b/Samples/SampleHttpModuleApplication/packages.config
@@ -3,9 +3,9 @@
   <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />

diff --git a/Samples/SampleIdentityServer3/Properties/AssemblyInfo.cs b/Samples/SampleIdentityServer3/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Samples/SampleIdentityServer3/Startup.cs b/Samples/SampleIdentityServer3/Startup.cs
@@ -1,24 +1,20 @@
 using IdentityServer3.Core.Configuration;
-using Owin;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using IdentityServer3.Core.Services.InMemory;
-using Microsoft.Owin;
+using IdentityServer3.Core.Extensions;
 using IdentityServer3.Core.Models;
-using Sustainsys.Saml2.Owin;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+using Microsoft.Owin.Security.Cookies;
+using Microsoft.Owin.Security.OpenIdConnect;
+using Owin;
+using Serilog;
+using Sustainsys.Saml2;
 using Sustainsys.Saml2.Configuration;
+using Sustainsys.Saml2.Owin;
+using System;
 using System.IdentityModel.Metadata;
-using Sustainsys.Saml2;
-using System.IdentityModel.Selectors;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.Owin.Security.Cookies;
-using Microsoft.Owin.Security.OpenIdConnect;
 using System.Threading.Tasks;
-using Serilog;
-using Microsoft.Owin.Security;
-using IdentityServer3.Core.Extensions;
+using System.Web;
 
 [assembly: OwinStartupAttribute(typeof(SampleIdentityServer3.Startup))]
 

diff --git a/Samples/SampleIdentityServer3/Users.cs b/Samples/SampleIdentityServer3/Users.cs
@@ -1,8 +1,6 @@
 using IdentityServer3.Core.Services.InMemory;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 
 namespace SampleIdentityServer3
 {

diff --git a/Samples/SampleMvcApplication/App_Start/BundleConfig.cs b/Samples/SampleMvcApplication/App_Start/BundleConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Optimization;
+using System.Web.Optimization;
 
 namespace SampleMvcApplication
 {

diff --git a/Samples/SampleMvcApplication/App_Start/FilterConfig.cs b/Samples/SampleMvcApplication/App_Start/FilterConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
 namespace SampleMvcApplication
 {

diff --git a/Samples/SampleMvcApplication/App_Start/RouteConfig.cs b/Samples/SampleMvcApplication/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace SampleMvcApplication

diff --git a/Samples/SampleMvcApplication/Controllers/HomeController.cs b/Samples/SampleMvcApplication/Controllers/HomeController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Web;
+using System.Security.Claims;
 using System.Web.Mvc;
 
 namespace SampleMvcApplication.Controllers

diff --git a/Samples/SampleMvcApplication/Global.asax.cs b/Samples/SampleMvcApplication/Global.asax.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
 

diff --git a/Samples/SampleMvcApplication/Properties/AssemblyInfo.cs b/Samples/SampleMvcApplication/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/Samples/SampleMvcApplication/SampleMvcApplication.csproj b/Samples/SampleMvcApplication/SampleMvcApplication.csproj
@@ -53,8 +53,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -65,20 +64,16 @@
       <HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />

diff --git a/Samples/SampleMvcApplication/Web.config b/Samples/SampleMvcApplication/Web.config
@@ -33,9 +33,7 @@
   </system.webServer>
   <sustainsys.saml2 entityId="http://localhost:2181/Saml2" returnUrl="http://localhost:2181/" discoveryServiceUrl="http://localhost:52071/DiscoveryService">
     <identityProviders>
-      <add entityId="https://stubidp.sustainsys.com/Metadata"
-           signOnUrl="https://stubidp.sustainsys.com/"
-           allowUnsolicitedAuthnResponse="true" binding="HttpRedirect">
+      <add entityId="https://stubidp.sustainsys.com/Metadata" signOnUrl="https://stubidp.sustainsys.com/" allowUnsolicitedAuthnResponse="true" binding="HttpRedirect">
         <signingCertificate fileName="~/App_Data/stubidp.sustainsys.com.cer" />
       </add>
     </identityProviders>
@@ -66,14 +64,6 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
@@ -82,6 +72,14 @@
         <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>