Large updates to webserver

Do not merge yet

Change-Id: I38c56844c1b0e3e8e5493c2705e62e6db7ee2102
diff --git a/src/token_authorization_middleware_test.cpp b/src/token_authorization_middleware_test.cpp
index e3a18f1..004fddb 100644
--- a/src/token_authorization_middleware_test.cpp
+++ b/src/token_authorization_middleware_test.cpp
@@ -6,11 +6,9 @@
 using namespace crow;
 using namespace std;
 
-
-
 // Tests that static urls are correctly passed
 TEST(TokenAuthentication, TestBasicReject) {
-  App<crow::TokenAuthorizationMiddleware> app;
+  App<crow::TokenAuthorization::Middleware> app;
   decltype(app)::server_t server(&app, "127.0.0.1", 45451);
   CROW_ROUTE(app, "/")([]() { return 200; });
   auto _ = async(launch::async, [&] { server.run(); });
@@ -48,7 +46,7 @@
 
 // Tests that Base64 basic strings work
 TEST(TokenAuthentication, TestRejectedResource) {
-  App<crow::TokenAuthorizationMiddleware> app;
+  App<crow::TokenAuthorization::Middleware> app;
   app.bindaddr("127.0.0.1").port(45451);
   CROW_ROUTE(app, "/")([]() { return 200; });
   auto _ = async(launch::async, [&] { app.run(); });
@@ -77,7 +75,7 @@
 
 // Tests that Base64 basic strings work
 TEST(TokenAuthentication, TestGetLoginUrl) {
-  App<crow::TokenAuthorizationMiddleware> app;
+  App<crow::TokenAuthorization::Middleware> app;
   app.bindaddr("127.0.0.1").port(45451);
   CROW_ROUTE(app, "/")([]() { return 200; });
   auto _ = async(launch::async, [&] { app.run(); });
@@ -106,7 +104,7 @@
 
 // Tests boundary conditions on login
 TEST(TokenAuthentication, TestPostBadLoginUrl) {
-  App<crow::TokenAuthorizationMiddleware> app;
+  App<crow::TokenAuthorization::Middleware> app;
   app.bindaddr("127.0.0.1").port(45451);
   CROW_ROUTE(app, "/")([]() { return 200; });
   auto _ = async(launch::async, [&] { app.run(); });
@@ -189,7 +187,7 @@
 };
 
 TEST(TokenAuthentication, TestSuccessfulLogin) {
-  App<crow::TokenAuthorization<KnownLoginAuthenticator>> app;
+  App<crow::TokenAuthorization::Middleware> app;
   app.bindaddr("127.0.0.1").port(45451);
   CROW_ROUTE(app, "/")([]() { return 200; });
   auto _ = async(launch::async, [&] { app.run(); });