updating deps

Author: neil

Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "autodiscover"
-version = "0.1.0"
-edition = "2018"
+version = "0.2.0"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 lazy_static = "1.4"
 toml = "0.5"
-actix-web = "2.0"
-actix-rt = "1.0"
-askama = "0.9"
+actix-web = "4.0.0-rc.3"
+actix-rt = "2.6"
+askama = "0.11"
 serde = "1.0"
 serde_derive = "1.0"
-quick-xml = "0.18.1"
+quick-xml = "0.22"
 uuid = { version = "0.8", features = ["v4"] }

src/handlers.rs

@@ -18,31 +18,30 @@ pub async fn autoconfig(getdata: web::Query<HashMap<String, String>>) -> Result<
         );
     }
 
-    HttpResponse::Ok().content_type("text/xml").body(tpl).await
+    Ok(HttpResponse::Ok().content_type("text/xml").body(tpl))
 }
 
 pub async fn autodiscover_json() -> Result<HttpResponse> {
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok()
         .content_type("application/json")
         .body(
             AutoDiscoverJson { c: &CONFIG }
                 .render()
                 .expect("Failed to render template"),
-        )
-        .await
+        ))
 }
 
 pub async fn mobileconfig(getdata: web::Query<HashMap<String, String>>) -> Result<HttpResponse> {
     let email = get_email_address(None, getdata.into_inner());
 
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok()
         .content_type("application/x-apple-aspen-config; charset=utf-8")
-        .header(
+        .insert_header((
             http::header::CONTENT_DISPOSITION,
             format!(
                 "attachment; filename={}.mobileconfig",
                 &CONFIG.general.domain
-            ),
+            ))
         )
         .body(
             MobileConfigXml {
@@ -53,8 +52,7 @@ pub async fn mobileconfig(getdata: web::Query<HashMap<String, String>>) -> Resul
             }
             .render()
             .expect("Failed to render template"),
-        )
-        .await
+        ))
 }
 
 pub async fn autodiscover_xml_get(
@@ -63,7 +61,7 @@ pub async fn autodiscover_xml_get(
     let schema = get_schema(None);
     let email = get_email_address(None, getdata.into_inner());
 
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok()
         .content_type("text/xml")
         .body(
             AutoDiscoverXml {
@@ -73,22 +71,20 @@ pub async fn autodiscover_xml_get(
             }
             .render()
             .expect("Failed to render template"),
-        )
-        .await
+        ))
 }
 
 pub async fn autodiscover_xml_post(
     raw_post: web::Bytes,
     getdata: web::Query<HashMap<String, String>>,
-    req: web::HttpRequest,
 ) -> Result<HttpResponse> {
 
     let xml_post = read_xml(raw_post);
 
     let schema = get_schema(Some(xml_post.clone()));
     let email = get_email_address(Some(xml_post), getdata.into_inner());
 
-    HttpResponse::Ok()
+    Ok(HttpResponse::Ok()
         .content_type("text/xml")
         .body(
             AutoDiscoverXml {
@@ -98,6 +94,5 @@ pub async fn autodiscover_xml_post(
             }
             .render()
             .expect("Failed to render template"),
-        )
-        .await
+        ))
 }