cleanup

Author: gauffininteractive

src/Server/OneTrueError.Web/App_Start/IdentityConfig.cs

@@ -1,15 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Owin;
 using Microsoft.Owin.Security.Cookies;
-using Microsoft.Owin.Security.Google;
 using Microsoft.Owin.Security.OAuth;
 using Owin;
-using OneTrueError.Web.Providers;
-using OneTrueError.Web.Models;
 
 namespace OneTrueError.Web
 {
@@ -22,10 +16,6 @@ public partial class Startup
         // For more information on configuring authentication, please visit http://go.microsoft.com/fwlink/?LinkId=301864
         public void ConfigureAuth(IAppBuilder app)
         {
-            // Configure the db context and user manager to use a single instance per request
-            app.CreatePerOwinContext(ApplicationDbContext.Create);
-            app.CreatePerOwinContext<ApplicationUserManager>(ApplicationUserManager.Create);
-
             // Enable the application to use a cookie to store information for the signed in user
             // and to use a cookie to temporarily store information about a user logging in with a third party login provider
             app.UseCookieAuthentication(new CookieAuthenticationOptions());
@@ -36,7 +26,7 @@ public void ConfigureAuth(IAppBuilder app)
             OAuthOptions = new OAuthAuthorizationServerOptions
             {
                 TokenEndpointPath = new PathString("/Token"),
-                Provider = new ApplicationOAuthProvider(PublicClientId),
+                //Provider = new ApplicationOAuthProvider(PublicClientId),
                 AuthorizeEndpointPath = new PathString("/api/Account/ExternalLogin"),
                 AccessTokenExpireTimeSpan = TimeSpan.FromDays(14),
                 // In production mode set AllowInsecureHttp = false
@@ -66,4 +56,4 @@ public void ConfigureAuth(IAppBuilder app)
             //});
         }
     }
-}
+}

src/Server/OneTrueError.Web/App_Start/Startup.Auth.cs

@@ -211,7 +211,7 @@ public async Task<ActionResult> Login(LoginViewModel model)
                         ModelState.AddModelError("", "Incorrect username or password.");
                     else
                         ModelState.AddModelError("",
-                            "Your account is locked or have not been activated (check your email account). Contact support@onetrueerror.com if you need assistance.");
+                            "Your account is locked or have not been activated (check your mailbox). Contact support@onetrueerror.com if you need assistance.");
 
                     model.Password = "";
                     return View(model);

src/Server/OneTrueError.Web/Controllers/AccountController.cs

@@ -160,21 +160,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="EntityFramework">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer">
-      <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Owin">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.Identity.EntityFramework">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
-    </Reference>
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
@@ -216,7 +207,6 @@
     <Compile Include="App_Start\Cqs\JsonFormatter.cs" />
     <Compile Include="App_Start\Cqs\Metadata.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
-    <Compile Include="App_Start\IdentityConfig.cs" />
     <Compile Include="App_Start\IoC\GriffinContainerAdapter.cs" />
     <Compile Include="App_Start\IoC\GriffinContainerScopeAdapter.cs" />
     <Compile Include="App_Start\IoC\GriffinWebApiChildScope.cs" />
@@ -293,10 +283,8 @@
     <Compile Include="Models\Account\RegisterViewModel.cs" />
     <Compile Include="Models\Account\RequestPasswordResetViewModel.cs" />
     <Compile Include="Models\Account\ResetPasswordViewModel.cs" />
-    <Compile Include="Models\IdentityModels.cs" />
     <Compile Include="Models\SessionUser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\ApplicationOAuthProvider.cs" />
     <Compile Include="Results\ChallengeResult.cs" />
     <Compile Include="Startup.cs" />
   </ItemGroup>

src/Server/OneTrueError.Web/Models/IdentityModels.cs

@@ -56,4 +56,3 @@ var Griffin;
         Cqs.CqsClient = CqsClient;
     })(Cqs = Griffin.Cqs || (Griffin.Cqs = {}));
 })(Griffin || (Griffin = {}));
-//# sourceMappingURL=CqsClient.js.map

src/Server/OneTrueError.Web/OneTrueError.Web.csproj

@@ -645,4 +645,3 @@ var Griffin;
     }());
     Griffin.TextSelector = TextSelector;
 })(Griffin || (Griffin = {}));
-//# sourceMappingURL=Griffin.Editor.js.map

src/Server/OneTrueError.Web/Providers/ApplicationOAuthProvider.cs

@@ -224,4 +224,3 @@ var Griffin;
         Net.HttpClient = HttpClient;
     })(Net = Griffin.Net || (Griffin.Net = {}));
 })(Griffin || (Griffin = {})); // ReSharper restore InconsistentNaming
-//# sourceMappingURL=Griffin.Net.js.map

src/Server/OneTrueError.Web/Scripts/CqsClient.js

@@ -364,4 +364,3 @@ var Griffin;
         WebApp.Pager = Pager;
     })(WebApp = Griffin.WebApp || (Griffin.WebApp = {}));
 })(Griffin || (Griffin = {}));
-//# sourceMappingURL=Griffin.WebApp.js.map