Refactored samples

micahlmartin · May 23, 2012 · a3f7d7a · a3f7d7a
1 parent 452adb5
commit a3f7d7a
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 88 deletions.
diff --git a/samples/MVC3Sample/Controllers/OAuthController.cs b/samples/MVC3Sample/Controllers/OAuthController.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using CrackerJack.OAuth;
-using CrackerJack.OAuth.Request;
-using CrackerJack.OAuth.Response;
+using OAuth2Provider;
+using OAuth2Provider.Request;
+using OAuth2Provider.Response;
 
 namespace MVC3Sample.Controllers
 {
@@ -18,7 +18,7 @@ public ActionResult Token()
         {
             try
             {
-                var oauthRequest = new TokenRequest(Request, MvcApplication.ServiceLocator);
+                var oauthRequest = new TokenRequest(new HttpRequestBaseRequest(Request), MvcApplication.ServiceLocator);
 
                 var token = oauthRequest.Authorize();
 

diff --git a/samples/MVC3Sample/Controllers/SecureController.cs b/samples/MVC3Sample/Controllers/SecureController.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using CrackerJack.OAuth;
-using CrackerJack.OAuth.Issuer;
-using CrackerJack.OAuth.Request;
+using OAuth2Provider;
+using OAuth2Provider.Issuer;
+using OAuth2Provider.Request;
 
 namespace MVC3Sample.Controllers
 {
@@ -41,7 +41,7 @@ protected virtual void AuthorizeRequest(ActionExecutingContext filterContext)
 
             try
             {
-                var resourceRequest = new ResourceRequest(Request, _serviceLocator);
+                var resourceRequest = new ResourceRequest(new HttpRequestBaseRequest(Request), _serviceLocator);
                 isAuthorized = resourceRequest.Authorize();
 
                 TokenData = _serviceLocator.Issuer.DecodeAccessToken(resourceRequest.AccessToken);

diff --git a/samples/MVC3Sample/Extensions.cs b/samples/MVC3Sample/Extensions.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using CrackerJack.OAuth.Response;
+using OAuth2Provider.Response;
 
 namespace MVC3Sample
 {

diff --git a/samples/MVC3Sample/Global.asax.cs b/samples/MVC3Sample/Global.asax.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
-using CrackerJack.OAuth;
+using OAuth2Provider;
 using Samples.Core;
 
 namespace MVC3Sample
@@ -37,9 +31,6 @@ protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
 
-            // Use LocalDB for Entity Framework by default
-            Database.DefaultConnectionFactory = new SqlConnectionFactory("Data Source=(localdb)\v11.0; Integrated Security=True; MultipleActiveResultSets=True");
-
             RegisterGlobalFilters(GlobalFilters.Filters);
             RegisterRoutes(RouteTable.Routes);
         }

diff --git a/samples/MVC3Sample/MVC3Sample.csproj b/samples/MVC3Sample/MVC3Sample.csproj
@@ -43,20 +43,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CrackerJack.OAuth">
-      <HintPath>..\..\binaries\CrackerJack.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework">
-      <HintPath>..\packages\EntityFramework.4.1.10331.0\lib\net40\EntityFramework.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Core, Version=1.0.11220.104, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Nuget.Core.1.0.1120.104\lib\net40\NuGet.Core.dll</HintPath>
+    <Reference Include="OAuth2Provider">
+      <HintPath>..\..\binaries\OAuth2Provider.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -198,7 +191,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Samples.Core\Samples.Core.csproj">
-      <Project>{06c23bea-1a09-4fb6-9766-5e474e7b32b1}</Project>
+      <Project>{06C23BEA-1A09-4FB6-9766-5E474E7B32B1}</Project>
       <Name>Samples.Core</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/samples/MVC3Sample/MVC3Sample.csproj.user b/samples/MVC3Sample/MVC3Sample.csproj.user
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

diff --git a/samples/MVC3Sample/OAuthResult.cs b/samples/MVC3Sample/OAuthResult.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-using CrackerJack.OAuth.Response;
+using OAuth2Provider.Response;
 
 namespace MVC3Sample
 {

diff --git a/samples/Samples.Core/OAuthServiceLocator.cs b/samples/Samples.Core/OAuthServiceLocator.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using CrackerJack.OAuth;
-using CrackerJack.OAuth.Issuer;
-using CrackerJack.OAuth.Repository;
+using OAuth2Provider;
+using OAuth2Provider.Issuer;
+using OAuth2Provider.Repository;
 
 namespace Samples.Core
 {

diff --git a/samples/Samples.Core/Samples.Core.csproj b/samples/Samples.Core/Samples.Core.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CrackerJack.OAuth">
-      <HintPath>..\..\binaries\CrackerJack.OAuth.dll</HintPath>
+    <Reference Include="OAuth2Provider">
+      <HintPath>..\..\binaries\OAuth2Provider.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/samples/Samples.Core/Samples.Core.csproj.user b/samples/Samples.Core/Samples.Core.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
+</Project>
diff --git a/samples/WebApiSample/Controllers/OAuthController.cs b/samples/WebApiSample/Controllers/OAuthController.cs
@@ -4,45 +4,41 @@
 using System.Web;
 using System.Web.Http;
 using System.Web.Mvc;
-using CrackerJack.OAuth;
-using CrackerJack.OAuth.Request;
-using CrackerJack.OAuth.Response;
 
 namespace WebApiSample.Controllers
 {
     public class OAuthController : ApiController
     {
-
-        public ActionResult Token()
-        {
-            try
-            {
-                var oauthRequest = new TokenRequest(Request, MvcApplication.ServiceLocator);
-
-                var token = oauthRequest.Authorize();
-
-                if (token.RedirectsUri.HasValue())
-                {
-
-                    var redirectUri = OAuthResponse
-                        .TokenResponse(token.AccessToken, token.ExpiresIn, token.RefreshToken)
-                        .SetLocation(token.RedirectsUri)
-                        .BuildQueryMessage().LocationUri;
-
-                    return Redirect(redirectUri);
-                }
-
-                var response = OAuthResponse
-                            .TokenResponse(token.AccessToken, token.ExpiresIn, token.RefreshToken)
-                            .BuildJsonMessage();
-
-                return this.OAuth(response);
-            }
-            catch (OAuthException ex)
-            {
-                var response = new ErrorResponseBuilder(ex).BuildJsonMessage();
-                return this.OAuth(response);
-            }
-        }
+        //public ActionResult Token()
+        //{
+        //    try
+        //    {
+        //        var oauthRequest = new TokenRequest(Request, MvcApplication.ServiceLocator);
+
+        //        var token = oauthRequest.Authorize();
+
+        //        if (token.RedirectsUri.HasValue())
+        //        {
+
+        //            var redirectUri = OAuthResponse
+        //                .TokenResponse(token.AccessToken, token.ExpiresIn, token.RefreshToken)
+        //                .SetLocation(token.RedirectsUri)
+        //                .BuildQueryMessage().LocationUri;
+
+        //            return Redirect(redirectUri);
+        //        }
+
+        //        var response = OAuthResponse
+        //                    .TokenResponse(token.AccessToken, token.ExpiresIn, token.RefreshToken)
+        //                    .BuildJsonMessage();
+
+        //        return this.OAuth(response);
+        //    }
+        //    catch (OAuthException ex)
+        //    {
+        //        var response = new ErrorResponseBuilder(ex).BuildJsonMessage();
+        //        return this.OAuth(response);
+        //    }
+        //}
     }
 }
diff --git a/samples/WebApiSample/Global.asax.cs b/samples/WebApiSample/Global.asax.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
-using System.Linq;
-using System.Web;
-using System.Web.Http;
+using System.Web.Http;
 using System.Web.Mvc;
-using System.Web.Optimization;
 using System.Web.Routing;
 
 namespace WebApiSample
@@ -43,13 +35,8 @@ protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
 
-            // Use LocalDB for Entity Framework by default
-            Database.DefaultConnectionFactory = new SqlConnectionFactory("Data Source=(localdb)\v11.0; Integrated Security=True; MultipleActiveResultSets=True");
-
             RegisterGlobalFilters(GlobalFilters.Filters);
             RegisterRoutes(RouteTable.Routes);
-
-            BundleTable.Bundles.RegisterTemplateBundles();
         }
     }
 }
diff --git a/samples/WebApiSample/WebApiSample.csproj b/samples/WebApiSample/WebApiSample.csproj
@@ -43,9 +43,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CrackerJack.OAuth">
-      <HintPath>..\..\binaries\CrackerJack.OAuth.dll</HintPath>
-    </Reference>
     <Reference Include="EntityFramework">
       <HintPath>..\packages\EntityFramework.4.1.10331.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>

diff --git a/samples/WebApiSample/WebApiSample.csproj.user b/samples/WebApiSample/WebApiSample.csproj.user
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">