draft!

Code-Inside · Jan 10, 2017 · 3413884 · 3413884
1 parent c064624
commit 3413884
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 403 deletions.
diff --git a/2016/IdentityTest/IdentityTest.IdServerHost/Configuration/Clients.cs b/2016/IdentityTest/IdentityTest.IdServerHost/Configuration/Clients.cs
@@ -27,33 +27,6 @@ public static List<Client> Get()
         {
             return new List<Client>
             {
-                new Client
-                {
-                    ClientName = "WPF WebView Client Sample",
-                    ClientId = "wpf.webview.client",
-                    Flow = Flows.Implicit,
-
-                    AllowedScopes = new List<string>
-                    {
-                        Constants.StandardScopes.OpenId,
-                        Constants.StandardScopes.Profile,
-                        Constants.StandardScopes.Email,
-                        Constants.StandardScopes.Roles,
-                        Constants.StandardScopes.Address,
-                        "read",
-                        "write"
-                    },
-
-                    ClientUri = "https://identityserver.io",
-
-                    RequireConsent = false,
-                    AllowRememberConsent = false,
-
-                    RedirectUris = new List<string>
-                    {
-                        "oob://localhost/wpf.webview.client",
-                    },
-                },
                 new Client
                 {
                     ClientId = "webapp",
@@ -65,19 +38,31 @@ public static List<Client> Get()
                     },
                     AllowedScopes = new List<string>
                     {   "openid",  "all_claims"
-                    }
+                    },
+                    RequireConsent = false,
                 },
                 new Client
                 {
-                    ClientId = "wpfapp",
                     ClientName = "WPFApp Demo",
+                    ClientId = "wpfapp",
                     Flow = Flows.HybridWithProofKey,
-                    ClientSecrets = new List<Secret>() { new Secret("secret".Sha256()) },
-                 AllowedScopes = new List<string>
-                 {   "openid",  "all_claims", "offline_access"
-                 },
-                     RequireConsent = false,
-                     RedirectUris = new List<string>() { "http://localhost/wpf.hybrid" }
+
+                    ClientSecrets = new List<Secret>
+                    {
+                        new Secret("secret".Sha256())
+                    },
+
+                    RedirectUris = new List<string>
+                    {
+                        "http://localhost/wpf.hybrid"
+                    },
+
+                    AllowedScopes = new List<string>
+                    {   "openid",  "all_claims"
+                    },
+                    RequireConsent = false,
+
+                    AccessTokenType = AccessTokenType.Reference
                 },
 
 

diff --git a/2016/IdentityTest/IdentityTest.IdServerHost/Startup.cs b/2016/IdentityTest/IdentityTest.IdServerHost/Startup.cs
@@ -4,8 +4,10 @@
 using IdentityServer3.Host.Config;
 using IdentityTest.IdServerHost;
 using Microsoft.Owin;
+using Microsoft.Owin.Security;
 using Microsoft.Owin.Security.WsFederation;
 using Owin;
+using AuthenticationOptions = IdentityServer3.Core.Configuration.AuthenticationOptions;
 
 [assembly: OwinStartup(typeof(IdentityTest.Startup))]
 
@@ -44,7 +46,6 @@ private void ConfigureIdentityProviders(IAppBuilder app, string signInAsType)
                 AuthenticationType = "windows",
                 Caption = "Windows",
                 SignInAsAuthenticationType = signInAsType,
-                CallbackPath = new PathString("/hello"),
                 MetadataAddress = "http://localhost:58773",
                 Wtrealm = "urn:idsrv3"
             };

diff --git a/2016/IdentityTest/IdentityTest.WinAuth/Startup.cs b/2016/IdentityTest/IdentityTest.WinAuth/Startup.cs
@@ -16,7 +16,7 @@ public void Configuration(IAppBuilder app)
             {
                 IdpReplyUrl = "http://localhost:56482/was",
                 SigningCertificate = Certificate.Load(),
-                EnableOAuth2Endpoint = true,
+                EnableOAuth2Endpoint = false,
             });
         }
     }

diff --git a/2016/IdentityTest/IdentityTest.WpfClient/App.config b/2016/IdentityTest/IdentityTest.WpfClient/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
diff --git a/2016/IdentityTest/IdentityTest.WpfClient/IdentityTest.WpfClient.csproj b/2016/IdentityTest/IdentityTest.WpfClient/IdentityTest.WpfClient.csproj
@@ -104,14 +104,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="LoginWebView.xaml.cs">
-      <DependentUpon>LoginWebView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="OidcStuff\WinFormsWebView.cs" />
-    <Page Include="LoginWebView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/2016/IdentityTest/IdentityTest.WpfClient/LoginWebView.xaml b/2016/IdentityTest/IdentityTest.WpfClient/LoginWebView.xaml