From 3b6889bedb9b086182283a553c6489bb3e6b5396 Mon Sep 17 00:00:00 2001
From: Gneev Roland <rgneev@mont.com>
Date: Thu, 4 May 2017 15:00:59 +0300
Subject: [PATCH] Inherited RazorViewService from DefaultViewService

---
 .../IdentityServer.RazorViewEngine.csproj     |  5 ++--
 .../RazorViewService.cs                       | 25 +++++++++++--------
 .../packages.config                           |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/IdentityServer.RazorViewEngine/IdentityServer.RazorViewEngine.csproj b/IdentityServer.RazorViewEngine/IdentityServer.RazorViewEngine.csproj
index b4c9797..ce0c5a3 100644
--- a/IdentityServer.RazorViewEngine/IdentityServer.RazorViewEngine.csproj
+++ b/IdentityServer.RazorViewEngine/IdentityServer.RazorViewEngine.csproj
@@ -31,9 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="IdentityServer3, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IdentityServer3.2.1.1\lib\net45\IdentityServer3.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="IdentityServer3, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\IdentityServer3.2.4.0\lib\net45\IdentityServer3.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
diff --git a/IdentityServer.RazorViewEngine/RazorViewService.cs b/IdentityServer.RazorViewEngine/RazorViewService.cs
index 534e126..0f36aaf 100644
--- a/IdentityServer.RazorViewEngine/RazorViewService.cs
+++ b/IdentityServer.RazorViewEngine/RazorViewService.cs
@@ -16,47 +16,52 @@
 
 namespace IdentityServer.RazorViewEngine
 {
-	public class RazorViewService : IViewService
+	public class RazorViewService : DefaultViewService
 	{
 		private readonly IRazorEngineService _service;
 
-		public RazorViewService(TemplateServiceConfiguration config)
-		{
+		public RazorViewService(TemplateServiceConfiguration config) : base(new DefaultViewServiceOptions(), new EmbeddedAssetsViewLoader())
+		{            
 			config.Debug = true;
 			_service = RazorEngineService.Create(config);
 		}
 
-		public virtual Task<Stream> Login(LoginViewModel model, SignInMessage message)
+		public override Task<Stream> Login(LoginViewModel model, SignInMessage message)
 		{
 			return Task.FromResult(RunTemplate("login", model, message.ClientId, message.Tenant));
 		}
 
-		public virtual Task<Stream> Logout(LogoutViewModel model, SignOutMessage message)
+        public override Task<Stream> Logout(LogoutViewModel model, SignOutMessage message)
 		{
 			return Task.FromResult(RunTemplate("logout", model, message?.ClientId));
 		}
 
-		public virtual Task<Stream> LoggedOut(LoggedOutViewModel model, SignOutMessage message)
+        public override Task<Stream> LoggedOut(LoggedOutViewModel model, SignOutMessage message)
 		{
 			return Task.FromResult(RunTemplate("loggedout", model, message?.ClientId));
 		}
 
-		public virtual Task<Stream> Consent(ConsentViewModel model, ValidatedAuthorizeRequest authorizeRequest)
+        public override Task<Stream> Consent(ConsentViewModel model, ValidatedAuthorizeRequest authorizeRequest)
 		{
 			return Task.FromResult(RunTemplate("consent", model, authorizeRequest.ClientId));
 		}
 
-		public virtual Task<Stream> ClientPermissions(ClientPermissionsViewModel model)
+        public virtual Task<Stream> ClientPermissions(ClientPermissionsViewModel model)
 		{
 			return Task.FromResult(RunTemplate("permission", model));
 		}
 
-		public virtual Task<Stream> Error(ErrorViewModel model)
+        public override Task<Stream> Error(ErrorViewModel model)
 		{
 			return Task.FromResult(RunTemplate("error", model));
 		}
 
-		protected Stream RunTemplate(string key, object model, string clientId = null, string tenant = null)
+        public override Task<Stream> AuthorizeResponse(AuthorizeResponseViewModel model)
+        {
+            return Task.FromResult(RunTemplate("formpostresponse", model));
+        }
+
+        protected Stream RunTemplate(string key, object model, string clientId = null, string tenant = null)
 	        {
 	            var viewBag = new DynamicViewBag(new Dictionary<string, object>
 	            {
diff --git a/IdentityServer.RazorViewEngine/packages.config b/IdentityServer.RazorViewEngine/packages.config
index ff6c0c5..03e911c 100644
--- a/IdentityServer.RazorViewEngine/packages.config
+++ b/IdentityServer.RazorViewEngine/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IdentityServer3" version="2.1.1" targetFramework="net45" />
+  <package id="IdentityServer3" version="2.4.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="RazorEngine" version="3.7.3" targetFramework="net45" />