From 87a703ae2295e418a7c853c8be6a576f2594241a Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Mon, 22 Jul 2019 22:22:06 -0400
Subject: Upgrade actix-web and other dependencies; Update version to 0.2.1

---
 src/routes/mod.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 16fcce9..29ab58f 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -1,5 +1,5 @@
-use actix_web::{HttpRequest, Json, Result};
-use std::ops::Deref;
+use actix_web::{web::Json, web::Query, HttpRequest, Result};
+use std::collections::HashMap;
 
 pub mod messages;
 use messages::*;
@@ -7,7 +7,7 @@ use messages::*;
 type JsonMessage<U> = Result<Json<OutgoingMsg<U>>>;
 
 // Sends a default response message when requested an undefined resource.
-pub fn not_understood(req: &HttpRequest) -> JsonMessage<NotUnderstood> {
+pub fn not_understood(req: HttpRequest) -> JsonMessage<NotUnderstood> {
     let message = NotUnderstood {
         path: destruct_path(req.path()),
     };
@@ -16,16 +16,14 @@ pub fn not_understood(req: &HttpRequest) -> JsonMessage<NotUnderstood> {
 }
 
 // Sends Callback message with information from HttpRequest.
-pub fn callback(req: &HttpRequest) -> JsonMessage<Callback> {
+pub fn callback(req: HttpRequest, query: Query<HashMap<String, String>>) -> JsonMessage<Callback> {
     let path = req.path();
     let method = req.method().as_str();
-    let query_ref = req.query();
-    let request = query_ref.deref().clone();
 
     let callback = Callback {
         path: destruct_path(path),
         request: String::from(method),
-        content: request,
+        content: query.into_inner(),
     };
 
     Ok(Json(callback.as_outgoing()))
-- 
cgit