Updated TestOptionsFactory and embedded pfx loading to be WAWS compat…

…ible
IdentityServer · Apr 14, 2014 · d12a253 · d12a253
1 parent 8d466fa
commit d12a253
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/source/Core.TestServices/TestCoreSettings.cs b/source/Core.TestServices/TestCoreSettings.cs
@@ -23,21 +23,16 @@ public class TestCoreSettings : ICoreSettings
         private X509Certificate2 _certificate;
         private string _publicHostAddress;
 
-        public TestCoreSettings(string issuerUri, string siteName, string certificateName, string publicHostAddress)
+        public TestCoreSettings(string issuerUri, string siteName, string publicHostAddress)
         {
             _issuerUri = issuerUri;
             _siteName = siteName;
             _publicHostAddress = publicHostAddress;
 
-            if (certificateName.IsMissing())
-            {
-                certificateName = "idsrv3test.pfx";
-            }
-
             var assembly = this.GetType().Assembly;
-            using (var stream = assembly.GetManifestResourceStream("Thinktecture.IdentityServer.TestServices." + certificateName))
+            using (var stream = assembly.GetManifestResourceStream("Thinktecture.IdentityServer.TestServices.idsrv3test.pfx"))
             {
-                _certificate = new X509Certificate2(ReadStream(stream));
+                _certificate = new X509Certificate2(ReadStream(stream), "idsrv3test");
             }
         }
 

diff --git a/source/Core.TestServices/TestOptionsFactory.cs b/source/Core.TestServices/TestOptionsFactory.cs
@@ -10,13 +10,13 @@ namespace Thinktecture.IdentityServer.TestServices
 {
     public class TestOptionsFactory
     {
-        public static IdentityServerServiceFactory Create(string issuerUri, string siteName, string certificateName = "", string publicHostAddress = "")
+        public static IdentityServerServiceFactory Create(string issuerUri, string siteName, string publicHostAddress = "")
         {
-            var settings = new TestCoreSettings(issuerUri, siteName, certificateName, publicHostAddress);
+            var settings = new TestCoreSettings(issuerUri, siteName, publicHostAddress);
             var codeStore = new TestAuthorizationCodeStore();
             var tokenStore = new TestTokenHandleStore();
             var consent = new TestConsentService();
-            var logger = new DebugLogger();
+            var logger = new TraceLogger();
 
             var fact = new IdentityServerServiceFactory
             {

diff --git a/source/Core.TestServices/idsrv3test.pfx b/source/Core.TestServices/idsrv3test.pfx
diff --git a/source/Host/Startup.cs b/source/Host/Startup.cs
@@ -15,10 +15,15 @@ public void Configuration(IAppBuilder app)
         {
             app.Map("/core", coreApp =>
                 {
+                    //var factory = TestOptionsFactory.Create(
+                    //    issuerUri: "https://idsrv3.com",
+                    //    siteName: "Thinktecture IdentityServer v3 - preview 1",
+                    //    publicHostAddress: "http://idsrv3.azurewebsites.net");
+
                     var factory = TestOptionsFactory.Create(
                         issuerUri: "https://idsrv3.com",
                         siteName: "Thinktecture IdentityServer v3 - preview 1",
-                        publicHostAddress: "http://localhost:3333");
+                        publicHostAddress: "http://localhost:3333/core");
 
                     //factory.UserService = Thinktecture.IdentityServer.MembershipReboot.UserServiceFactory.Factory;
                     //factory.UserService = Thinktecture.IdentityServer.AspNetIdentity.UserServiceFactory.Factory;