Upgrade CustomAutenticationMvc to v4.0.11

ServiceStack · Feb 21, 2014 · 893e6d6 · 893e6d6
1 parent d987952
commit 893e6d6
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 92 deletions.
diff --git a/CustomAuthenticationMvc/App_Start/AppHost.cs b/CustomAuthenticationMvc/App_Start/AppHost.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Web;
+using System.Collections.Generic;
 using System.Web.Security;
 using Funq;
-using ServiceStack.CacheAccess;
-using ServiceStack.CacheAccess.Providers;
-using ServiceStack.Redis;
-using ServiceStack.ServiceHost;
-using ServiceStack.ServiceInterface;
-using ServiceStack.ServiceInterface.Auth;
-using ServiceStack.WebHost.Endpoints;
+using ServiceStack;
+using ServiceStack.Auth;
+using ServiceStack.Caching;
+using ServiceStack.Configuration;
 
 namespace CustomAuthenticationMvc.App_Start
 {
@@ -79,7 +73,7 @@ public class HelloService : Service
 
         public object Any(HelloRequest request)
         {
-            Session.Set(HelloServiceCounterKey, Session.Get<int>(HelloServiceCounterKey) + 1);
+            SessionBag.Set(HelloServiceCounterKey, SessionBag.Get<int>(HelloServiceCounterKey) + 1);
             var userSession = SessionAs<CustomUserSession>();
             var roles = string.Join(", ", userSession.Roles.ToArray());
             return new HelloResponse { Result = "Hello, " + request.Name + ", your role(s): " + roles};

diff --git a/CustomAuthenticationMvc/Controllers/AccountController.cs b/CustomAuthenticationMvc/Controllers/AccountController.cs
@@ -2,17 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Transactions;
-using System.Web;
 using System.Web.Mvc;
 using System.Web.Security;
 using DotNetOpenAuth.AspNet;
 using Microsoft.Web.WebPages.OAuth;
-using ServiceStack.Common.Web;
-using ServiceStack.ServiceClient.Web;
-using ServiceStack.ServiceHost;
-using ServiceStack.ServiceInterface;
-using ServiceStack.ServiceInterface.Auth;
-using ServiceStack.WebHost.Endpoints;
+using ServiceStack;
+using ServiceStack.Auth;
 using WebMatrix.WebData;
 using CustomAuthenticationMvc.Filters;
 using CustomAuthenticationMvc.Models;
@@ -45,19 +40,20 @@ public ActionResult Login(LoginModel model, string returnUrl)
             {
                 try
                 {
-                    var authService = AppHostBase.Resolve<AuthService>();
-                    authService.RequestContext = System.Web.HttpContext.Current.ToRequestContext();
-                    var response = authService.Authenticate(new Auth
-                                                                {
-                                                                    UserName = model.UserName,
-                                                                    Password = model.Password,
-                                                                    RememberMe = model.RememberMe
-                                                                });
-
-                    // add ASP.NET auth cookie
-                    FormsAuthentication.SetAuthCookie(model.UserName, model.RememberMe);
-
-                    return RedirectToLocal(returnUrl);
+                    using (var authService = HostContext.ResolveService<AuthenticateService>(base.HttpContext))
+                    {
+                        var response = authService.Authenticate(new Authenticate
+                        {
+                            UserName = model.UserName,
+                            Password = model.Password,
+                            RememberMe = model.RememberMe
+                        });
+
+                        // add ASP.NET auth cookie
+                        FormsAuthentication.SetAuthCookie(model.UserName, model.RememberMe);
+
+                        return RedirectToLocal(returnUrl);
+                    }
                 }
                 catch (HttpError)
                 {

diff --git a/CustomAuthenticationMvc/Controllers/BaseController.cs b/CustomAuthenticationMvc/Controllers/BaseController.cs
@@ -1,14 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using CustomAuthenticationMvc.App_Start;
-using ServiceStack.CacheAccess;
-using ServiceStack.ServiceClient.Web;
-using ServiceStack.ServiceHost;
-using ServiceStack.ServiceInterface;
-using ServiceStack.WebHost.Endpoints;
+using System.Web.Mvc;
+using ServiceStack;
+using ServiceStack.Caching;
 
 namespace CustomAuthenticationMvc.Controllers
 {
@@ -22,7 +14,7 @@ protected ISession ServiceStackSession
         {
             get
             {
-                return _serviceStackSession ?? (_serviceStackSession = AppHostBase.Resolve<ISessionFactory>().GetOrCreateSession());
+                return _serviceStackSession ?? (_serviceStackSession = HostContext.Resolve<ISessionFactory>().GetOrCreateSession());
             }
         }
     }

diff --git a/CustomAuthenticationMvc/Controllers/HomeController.cs b/CustomAuthenticationMvc/Controllers/HomeController.cs
@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using CustomAuthenticationMvc.App_Start;
-using ServiceStack.CacheAccess;
-using ServiceStack.Common.ServiceClient.Web;
-using ServiceStack.ServiceClient.Web;
-using ServiceStack.ServiceInterface;
-using ServiceStack.ServiceInterface.Auth;
-using ServiceStack.WebHost.Endpoints;
+using ServiceStack;
 
 namespace CustomAuthenticationMvc.Controllers
 {
@@ -32,13 +22,14 @@ public ActionResult About()
 
         public ActionResult RunHelloService()
         {
-            var helloService = AppHostBase.Resolve<HelloService>();
-            helloService.RequestContext = System.Web.HttpContext.Current.ToRequestContext();
-            var response = (HelloResponse)helloService.Any(new HelloRequest { Name = User.Identity.Name });
-
-            ViewBag.Response = response.Result;
-            ViewBag.Counter = ServiceStackSession.Get<int>(HelloService.HelloServiceCounterKey);
-            return View("Index");
+            using (var helloService = HostContext.ResolveService<HelloService>(base.HttpContext))
+            {
+                var response = (HelloResponse)helloService.Any(new HelloRequest { Name = User.Identity.Name });
+
+                ViewBag.Response = response.Result;
+                ViewBag.Counter = ServiceStackSession.Get<int>(HelloService.HelloServiceCounterKey);
+                return View("Index");
+            }
         }
 
         public ActionResult Contact()

diff --git a/CustomAuthenticationMvc/CustomAuthenticationMvc.csproj b/CustomAuthenticationMvc/CustomAuthenticationMvc.csproj
@@ -18,6 +18,10 @@
     <UseIISExpress>false</UseIISExpress>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,35 +42,25 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="ServiceStack, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.3.9.28\lib\net35\ServiceStack.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Common, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Client, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.28\lib\net35\ServiceStack.Common.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Common, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.28\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.OrmLite, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.28\lib\ServiceStack.OrmLite.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.28\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Redis, Version=3.9.29.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Redis.3.9.29\lib\net35\ServiceStack.Redis.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.3.9.28\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text, Version=3.9.28.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Text, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Text.3.9.28\lib\net35\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/CustomAuthenticationMvc/Web.config b/CustomAuthenticationMvc/Web.config
@@ -35,7 +35,7 @@
       </namespaces>
     </pages>
     <httpHandlers>
-      <add path="api*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" />
+      <add path="api*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*" />
     </httpHandlers>
   </system.web>
   <system.webServer>
@@ -72,15 +72,15 @@
   <location path="api">
     <system.web>
       <httpHandlers>
-        <add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" />
+        <add path="*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*" />
       </httpHandlers>
     </system.web>
     <!-- Required for IIS 7.0 -->
     <system.webServer>
       <modules runAllManagedModulesForAllRequests="true" />
       <validation validateIntegratedModeConfiguration="false" />
       <handlers>
-        <add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true" />
+        <add path="*" name="ServiceStack.Factory" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true" />
       </handlers>
     </system.webServer>
   </location>

diff --git a/CustomAuthenticationMvc/packages.config b/CustomAuthenticationMvc/packages.config
@@ -28,10 +28,10 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="Modernizr" version="2.5.3" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
-  <package id="ServiceStack" version="3.9.28" targetFramework="net40" />
-  <package id="ServiceStack.Common" version="3.9.28" targetFramework="net40" />
-  <package id="ServiceStack.OrmLite.SqlServer" version="3.9.28" targetFramework="net40" />
-  <package id="ServiceStack.Redis" version="3.9.29" targetFramework="net40" />
-  <package id="ServiceStack.Text" version="3.9.28" targetFramework="net40" />
+  <package id="ServiceStack" version="4.0.11" targetFramework="net40" />
+  <package id="ServiceStack.Client" version="4.0.11" targetFramework="net40" />
+  <package id="ServiceStack.Common" version="4.0.11" targetFramework="net40" />
+  <package id="ServiceStack.Interfaces" version="4.0.11" targetFramework="net40" />
+  <package id="ServiceStack.Text" version="4.0.11" targetFramework="net40" />
   <package id="WebGrease" version="1.1.0" targetFramework="net40" />
 </packages>
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="..\CustomAuthentication.Mvc\packages.config" />
   <repository path="..\CustomAuthentication\packages.config" />
   <repository path="..\CustomAuthenticationMvc\packages.config" />
   <repository path="..\HelloWorld\packages.config" />