Merge branch 'dev' of https://github.com/IdentityServer/IdentityServe…

…r3.Samples into dev # Conflicts: # source/MVC ViewService/MvcViewServiceSample/MvcViewServiceSample.csproj # source/MVC ViewService/MvcViewServiceSample/packages.config # source/SelfHost (InMem with WS-Fed)/SelfHost/SelfHost (InMem with WS-Fed).csproj # source/SelfHost (InMem with WS-Fed)/SelfHost/packages.config
CShen-101-solution · Feb 22, 2016 · c9ec9c5 · c9ec9c5
2 parents 00e710b + d6a6d1c
commit c9ec9c5
Show file tree

Hide file tree

Showing 78 changed files with 214 additions and 3,922 deletions.
diff --git a/source/AspNetIdentity/WebHost/IdSvr/Clients.cs b/source/AspNetIdentity/WebHost/IdSvr/Clients.cs
diff --git a/source/AspNetIdentity/WebHost/IdSvr/Factory.cs b/source/AspNetIdentity/WebHost/IdSvr/Factory.cs
@@ -25,6 +25,7 @@
 using IdentityServer3.Core.Services;
 using IdentityServer3.Core.Services.InMemory;
 using IdentityServer3.Core.Services.Default;
+using IdentityServer3.Host.Config;
 
 namespace WebHost.IdSvr
 {

diff --git a/source/AspNetIdentity/WebHost/IdSvr/Scopes.cs b/source/AspNetIdentity/WebHost/IdSvr/Scopes.cs
diff --git a/source/AspNetIdentity/WebHost/IdSvr/UserService.cs b/source/AspNetIdentity/WebHost/IdSvr/UserService.cs
@@ -47,10 +47,10 @@ public UserService(UserManager userMgr)
         protected override async Task<IEnumerable<System.Security.Claims.Claim>> GetClaimsFromAccount(User user) {
             var claims = (await base.GetClaimsFromAccount(user)).ToList();
 			if (!String.IsNullOrWhiteSpace(user.FirstName)) {
-				claims.Add(new Claim("given_name", user.FirstName));
+				claims.Add(new System.Security.Claims.Claim("given_name", user.FirstName));
 			}
 			if (!String.IsNullOrWhiteSpace(user.LastName)) {
-				claims.Add(new Claim("family_name", user.LastName));
+				claims.Add(new System.Security.Claims.Claim("family_name", user.LastName));
 			}
 
 			return claims;

diff --git a/source/AspNetIdentity/WebHost/Web.config b/source/AspNetIdentity/WebHost/Web.config
@@ -9,10 +9,10 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <connectionStrings>
-    <add name="AspId" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="AspId_CustomPK" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity.CustomPK;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <!--<add name="AspId" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="AspId_CustomPK" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity.CustomPK;Integrated Security=True" providerName="System.Data.SqlClient" />-->
+    <!--<add name="AspId" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="AspId_CustomPK" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity.CustomPK;Integrated Security=True" providerName="System.Data.SqlClient" />-->
+    <add name="AspId" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="AspId_CustomPK" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity.CustomPK;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true"></modules>

diff --git a/source/AspNetIdentity/WebHost/WebHost.csproj b/source/AspNetIdentity/WebHost/WebHost.csproj
@@ -59,8 +59,8 @@
       <HintPath>..\packages\IdentityModel.1.0.0\lib\net45\IdentityModel.Net45.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="IdentityServer3, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IdentityServer3.2.0.0-build00174\lib\net45\IdentityServer3.dll</HintPath>
+    <Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -133,6 +133,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="index.html" />
     <Content Include="packages.config" />
     <EmbeddedResource Include="IdSvr\idsrv3test.pfx" />
     <None Include="Web.Debug.config">
@@ -143,19 +144,25 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Web.config" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\_sharedConfiguration\Clients.cs">
+      <Link>IdSvr\Clients.cs</Link>
+    </Compile>
+    <Compile Include="..\..\_sharedConfiguration\Scopes.cs">
+      <Link>IdSvr\Scopes.cs</Link>
+    </Compile>
     <Compile Include="App_Packages\IdentityServer3.AspNetIdentity\IdentityServer3.AspNetIdentity.cs" />
     <Compile Include="AspId\CustomEntitiesWithIntKey.cs" />
     <Compile Include="AspId\SimpleEntities.cs" />
     <Compile Include="IdMgr\CustomIdentityManagerServiceWithIntKeys.cs" />
     <Compile Include="IdMgr\SimpleIdentityManagerService.cs" />
     <Compile Include="IdSvr\Certificate.cs" />
-    <Compile Include="IdSvr\Clients.cs" />
     <Compile Include="IdSvr\CustomUserService.cs" />
     <Compile Include="IdSvr\Factory.cs" />
-    <Compile Include="IdSvr\Scopes.cs" />
     <Compile Include="IdSvr\UserService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />

diff --git a/source/AspNetIdentity/WebHost/index.html b/source/AspNetIdentity/WebHost/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+	<meta charset="utf-8" />
+</head>
+<body>
+    <h1>ASP.NET Identity Demo</h1>
+    <ul>
+        <li><a href="/core">IdentityServer Welcome Page</a></li>
+        <li><a href="/admin">IdentityManager User Administration</a></li>
+    </ul>
+</body>
+</html>
diff --git a/source/AspNetIdentity/WebHost/packages.config b/source/AspNetIdentity/WebHost/packages.config
@@ -4,8 +4,8 @@
   <package id="IdentityManager" version="1.0.0-beta5-5" targetFramework="net45" />
   <package id="IdentityManager.AspNetIdentity" version="1.0.0-beta5-1" targetFramework="net45" />
   <package id="IdentityModel" version="1.0.0" targetFramework="net45" />
-  <package id="IdentityServer3" version="2.0.0-build00174" targetFramework="net45" />
-  <package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00036" targetFramework="net45" />
+  <package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
+  <package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00037" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />

diff --git a/source/AspNetIdentity_2fa/WebHost/IdSvr/Clients.cs b/source/AspNetIdentity_2fa/WebHost/IdSvr/Clients.cs
diff --git a/source/AspNetIdentity_2fa/WebHost/IdSvr/Factory.cs b/source/AspNetIdentity_2fa/WebHost/IdSvr/Factory.cs
@@ -25,6 +25,7 @@
 using IdentityServer3.Core.Services;
 using IdentityServer3.Core.Services.InMemory;
 using IdentityServer3.Core.Services.Default;
+using IdentityServer3.Host.Config;
 
 namespace WebHost.IdSvr
 {

diff --git a/source/AspNetIdentity_2fa/WebHost/IdSvr/Scopes.cs b/source/AspNetIdentity_2fa/WebHost/IdSvr/Scopes.cs
diff --git a/source/AspNetIdentity_2fa/WebHost/Views/TwoFactor/Index.cshtml b/source/AspNetIdentity_2fa/WebHost/Views/TwoFactor/Index.cshtml
@@ -3,7 +3,7 @@
 }
 
 <h2>Two Factor</h2>
-<p>Enter the code sent to your mobile device</p>
+<p>Enter the code sent to your mobile device (any value will work -- it's just a sample)</p>
 <form method="post">
     @if (ViewData["message"] != null)
     {

diff --git a/source/AspNetIdentity_2fa/WebHost/Web.config b/source/AspNetIdentity_2fa/WebHost/Web.config
@@ -15,8 +15,8 @@
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
   </appSettings>
   <connectionStrings>
-    <add name="AspId" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity.2fa;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <!--<add name="AspId" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity.2fa;Integrated Security=True" providerName="System.Data.SqlClient" />-->
+    <!--<add name="AspId" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=IdentityServer3.AspNetIdentity.2fa;Integrated Security=True" providerName="System.Data.SqlClient" />-->
+    <add name="AspId" connectionString="Data Source=(LocalDb)\MSSQLLocalDb;Initial Catalog=IdentityServer3.AspNetIdentity.2fa;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />

diff --git a/source/AspNetIdentity_2fa/WebHost/WebHost.csproj b/source/AspNetIdentity_2fa/WebHost/WebHost.csproj
@@ -59,8 +59,8 @@
       <HintPath>..\packages\IdentityModel.1.0.0\lib\net45\IdentityModel.Net45.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="IdentityServer3, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IdentityServer3.2.1.2-build00267\lib\net45\IdentityServer3.dll</HintPath>
+    <Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdentityServer3.2.4.1-build00428\lib\net45\IdentityServer3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -151,6 +151,7 @@
     <Content Include="Content\Site.css" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
+    <Content Include="index.html" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
     <Content Include="fonts\glyphicons-halflings-regular.woff2" />
@@ -166,6 +167,12 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\_sharedConfiguration\Clients.cs">
+      <Link>IdSvr\Clients.cs</Link>
+    </Compile>
+    <Compile Include="..\..\_sharedConfiguration\Scopes.cs">
+      <Link>IdSvr\Scopes.cs</Link>
+    </Compile>
     <Compile Include="App_Packages\IdentityServer3.AspNetIdentity\IdentityServer3.AspNetIdentity.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="AspId\SimpleEntities.cs" />
@@ -175,9 +182,7 @@
     </Compile>
     <Compile Include="IdMgr\SimpleIdentityManagerService.cs" />
     <Compile Include="IdSvr\Certificate.cs" />
-    <Compile Include="IdSvr\Clients.cs" />
     <Compile Include="IdSvr\Factory.cs" />
-    <Compile Include="IdSvr\Scopes.cs" />
     <Compile Include="IdSvr\UserService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />

diff --git a/source/AspNetIdentity_2fa/WebHost/index.html b/source/AspNetIdentity_2fa/WebHost/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+	<meta charset="utf-8" />
+</head>
+<body>
+    <h1>ASP.NET Identity w/ 2fa Demo</h1>
+    <ul>
+        <li><a href="/core">IdentityServer Welcome Page</a></li>
+        <li><a href="/admin">IdentityManager User Administration</a></li>
+    </ul>
+</body>
+</html>
diff --git a/source/AspNetIdentity_2fa/WebHost/packages.config b/source/AspNetIdentity_2fa/WebHost/packages.config
@@ -5,8 +5,8 @@
   <package id="IdentityManager" version="1.0.0-beta5-5" targetFramework="net45" />
   <package id="IdentityManager.AspNetIdentity" version="1.0.0-beta5-1" targetFramework="net45" />
   <package id="IdentityModel" version="1.0.0" targetFramework="net45" />
-  <package id="IdentityServer3" version="2.1.2-build00267" targetFramework="net45" />
-  <package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00024" targetFramework="net45" />
+  <package id="IdentityServer3" version="2.4.1-build00428" targetFramework="net45" />
+  <package id="IdentityServer3.AspNetIdentity" version="2.0.0-build00037" targetFramework="net45" />
   <package id="jQuery" version="2.1.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net45" />

diff --git a/source/CustomHrd/CustomHrd/Config/Clients.cs b/source/CustomHrd/CustomHrd/Config/Clients.cs
diff --git a/source/CustomHrd/CustomHrd/Config/Scopes.cs b/source/CustomHrd/CustomHrd/Config/Scopes.cs
diff --git a/source/CustomHrd/CustomHrd/Config/Users.cs b/source/CustomHrd/CustomHrd/Config/Users.cs