Feature/general cleanup (#15)

zippy1981 · web-flow · commit cc914d013224 · 2019-05-02T12:31:08.000-04:00
* Updated copyright.

* Removed unneeded packages.

* This probably broke something

* Resharperings.

* didn't wnat to commit the php stuff

* didn't mean to delte this.

* Updated passwords on the readme page.

* Deleteing again
diff --git a/AlwaysEncryptedSample.Models/CreditCard.cs b/AlwaysEncryptedSample.Models/CreditCard.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/AlwaysEncryptedSample.Models/Properties/AssemblyInfo.cs b/AlwaysEncryptedSample.Models/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AlwaysEncryptedSample.Models")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/AlwaysEncryptedSample.Tests/Controllers/HomeControllerTest.cs b/AlwaysEncryptedSample.Tests/Controllers/HomeControllerTest.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Mvc;
+﻿using System.Web.Mvc;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using AlwaysEncryptedSample;
 using AlwaysEncryptedSample.Controllers;
 
 namespace AlwaysEncryptedSample.Tests.Controllers
diff --git a/AlwaysEncryptedSample.Tests/Properties/AssemblyInfo.cs b/AlwaysEncryptedSample.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
@@ -10,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AlwaysEncryptedSample.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/AlwaysEncryptedSample/AlwaysEncryptedSample.csproj b/AlwaysEncryptedSample/AlwaysEncryptedSample.csproj
@@ -77,21 +77,9 @@
     <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Security.Facebook, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Facebook.4.0.1\lib\net45\Microsoft.Owin.Security.Facebook.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.Google, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Google.4.0.1\lib\net45\Microsoft.Owin.Security.Google.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.MicrosoftAccount, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.MicrosoftAccount.4.0.1\lib\net45\Microsoft.Owin.Security.MicrosoftAccount.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Security.Twitter, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Twitter.4.0.1\lib\net45\Microsoft.Owin.Security.Twitter.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/AlwaysEncryptedSample/App_Start/BundleConfig.cs b/AlwaysEncryptedSample/App_Start/BundleConfig.cs
@@ -1,5 +1,4 @@
-﻿using System.Web;
-using System.Web.Optimization;
+﻿using System.Web.Optimization;
 
 namespace AlwaysEncryptedSample
 {
diff --git a/AlwaysEncryptedSample/App_Start/FilterConfig.cs b/AlwaysEncryptedSample/App_Start/FilterConfig.cs
@@ -1,5 +1,4 @@
-﻿using System.Web;
-using System.Web.Mvc;
+﻿using System.Web.Mvc;
 
 namespace AlwaysEncryptedSample
 {
diff --git a/AlwaysEncryptedSample/App_Start/IdentityConfig.cs b/AlwaysEncryptedSample/App_Start/IdentityConfig.cs
@@ -1,10 +1,6 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using System.Web;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.AspNet.Identity.Owin;
diff --git a/AlwaysEncryptedSample/App_Start/RouteConfig.cs b/AlwaysEncryptedSample/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+﻿using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace AlwaysEncryptedSample
diff --git a/AlwaysEncryptedSample/App_Start/Startup.Auth.cs b/AlwaysEncryptedSample/App_Start/Startup.Auth.cs
@@ -3,7 +3,6 @@
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
 using Microsoft.Owin.Security.Cookies;
-using Microsoft.Owin.Security.Google;
 using Owin;
 using AlwaysEncryptedSample.Models;
 using AlwaysEncryptedSample.Services;
diff --git a/AlwaysEncryptedSample/App_Start/WebApiConfig.cs b/AlwaysEncryptedSample/App_Start/WebApiConfig.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Http;
+﻿using System.Web.Http;
 
 namespace AlwaysEncryptedSample
 {
diff --git a/AlwaysEncryptedSample/Controllers/AccountController.cs b/AlwaysEncryptedSample/Controllers/AccountController.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Globalization;
-using System.Linq;
-using System.Security.Claims;
+﻿using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
diff --git a/AlwaysEncryptedSample/Controllers/HomeController.cs b/AlwaysEncryptedSample/Controllers/HomeController.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+﻿using System.Web.Mvc;
 
 namespace AlwaysEncryptedSample.Controllers
 {
diff --git a/AlwaysEncryptedSample/Controllers/ManageController.cs b/AlwaysEncryptedSample/Controllers/ManageController.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Linq;
+﻿using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
diff --git a/AlwaysEncryptedSample/Global.asax.cs b/AlwaysEncryptedSample/Global.asax.cs
@@ -1,6 +1,5 @@
 ﻿using System.Configuration;
 using System.Data;
-using System.Data.Common;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
@@ -51,6 +50,7 @@ private bool CreateDatabase(SqlConnectionStringBuilder builder)
                 }
                 catch (SqlException)
                 {
+                    //TODO: Send this exception somewhere.
                     return false;
                 }
             }
@@ -99,7 +99,7 @@ protected void Application_Start()
             }
             
             var log = log4net.LogManager.GetLogger(GetType());
-            log.InfoFormat("Calling Application_Start");
+            log.Info("Calling Application_Start");
             
             log.Debug("Performing Area Registration");
             AreaRegistration.RegisterAllAreas();
@@ -115,7 +115,7 @@ protected void Application_Start()
             using (var authDbCtx = AuthDbContext.Create())
             {
                 authDbCtx.Database.Log = (dbLog => log.Debug(dbLog));
-                log.Info("Initialization tests for Autorization Schema");
+                log.Info("Initialization tests for Authorization Schema");
                 if (!authDbCtx.Roles.Any())
                 {
                     log.Info("No roles found in database. Creating roles");
@@ -135,7 +135,7 @@ protected void Application_Start()
                         EmailConfirmed = true,
                         PasswordHash = userManager.PasswordHasher.HashPassword("Alm0nds!"),
                     });
-
+                    
                     userManager.AddToRole("Administrator", "DBAs");
 
                     userManager.Create(new ApplicationUser
diff --git a/AlwaysEncryptedSample/Migrations/Configuration.cs b/AlwaysEncryptedSample/Migrations/Configuration.cs
@@ -2,10 +2,7 @@
 
 namespace AlwaysEncryptedSample.Migrations
 {
-    using System;
-    using System.Data.Entity;
     using System.Data.Entity.Migrations;
-    using System.Linq;
 
     internal sealed class AuthConfiguration : DbMigrationsConfiguration<AuthDbContext>
     {
diff --git a/AlwaysEncryptedSample/Properties/AssemblyInfo.cs b/AlwaysEncryptedSample/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AlwaysEncryptedSample")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/AlwaysEncryptedSample/Services/AuthDbContext.cs b/AlwaysEncryptedSample/Services/AuthDbContext.cs
@@ -8,7 +8,7 @@ namespace AlwaysEncryptedSample.Services
     public class AuthDbContext : IdentityDbContext<ApplicationUser>
     {
         public AuthDbContext()
-            : base("DefaultConnection", throwIfV1Schema: false)
+            : base("DefaultConnection", throwIfV1Schema: true)
         {
         }
 
diff --git a/AlwaysEncryptedSample/Views/Shared/_Layout.cshtml b/AlwaysEncryptedSample/Views/Shared/_Layout.cshtml
@@ -1,5 +1,4 @@
-﻿@using Microsoft.Ajax.Utilities
-<!DOCTYPE html>
+﻿<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/AlwaysEncryptedSample/packages.config b/AlwaysEncryptedSample/packages.config
@@ -23,11 +23,7 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net46" />
   <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Security.Facebook" version="4.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Security.Google" version="4.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Security.MicrosoftAccount" version="4.0.1" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Security.Twitter" version="4.0.1" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
diff --git a/ReadMe.md b/ReadMe.md
@@ -73,8 +73,8 @@ using deterministic encryption.
 
 ## Using the app:
 
-The app has two users `Administrator` with the password of `P3ter!` and CCAdmin
-with the password of `P@ul!`. The user administrator has access to an
+The app has two users `Administrator` with the password of `Alm0nds!` and CCAdmin
+with the password of `Appl3s`. The user administrator has access to an
 "Internals" page that lists the columns in the database, as well as the
 encryption information for them. The CCadmin user has a page that will let
 them import 1000 randomly generated fake credit cards, and then display them

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.ComponentModel;`
`3`	`2`	`using System.ComponentModel.DataAnnotations;`
`4`	`3`	`using System.ComponentModel.DataAnnotations.Schema;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Web;`
`2`		`-using System.Web.Optimization;`
	`1`	`+using System.Web.Optimization;`
`3`	`2`
`4`	`3`	`namespace AlwaysEncryptedSample`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Web;`
`2`		`-using System.Web.Mvc;`
	`1`	`+using System.Web.Mvc;`
`3`	`2`
`4`	`3`	`namespace AlwaysEncryptedSample`
`5`	`4`	`{`