improved error handling for authorization and connection errors

Author: Heliozoa

tmc-langs-cli/src/main.rs

@@ -3,7 +3,7 @@
 mod app;
 mod output;
 
-use output::{ErrorData, Output, OutputResult, Status};
+use output::{ErrorData, Kind, Output, OutputResult, Status};
 
 use anyhow::{Context, Result};
 use clap::{ArgMatches, Error, ErrorKind};
@@ -36,13 +36,13 @@ fn main() {
     if let Err(e) = run() {
         let causes: Vec<String> = e.chain().map(|e| format!("Caused by: {}", e)).collect();
         let message = error_message_special_casing(&e);
-        let http_status_code = find_http_error_code(&e);
+        let kind = solve_error_kind(&e);
         let error_output = Output {
             status: Status::Finished,
             message: Some(message),
             result: OutputResult::Error,
             data: Some(ErrorData {
-                http_status_code,
+                kind,
                 trace: causes,
             }),
             percent_done: 1.0,
@@ -63,13 +63,24 @@ fn main() {
     }
 }
 
-fn find_http_error_code(e: &anyhow::Error) -> Option<u16> {
+fn solve_error_kind(e: &anyhow::Error) -> Kind {
     for cause in e.chain() {
-        if let Some(CoreError::HttpStatus(_, status_code, _)) = cause.downcast_ref::<CoreError>() {
-            return Some(status_code.as_u16());
+        // check for authorization error
+        println!("{:?}", cause);
+        if let Some(CoreError::HttpError(_, status_code, _)) = cause.downcast_ref::<CoreError>() {
+            if status_code.as_u16() == 403 {
+                return Kind::AuthorizationError;
+            } else {
+                return Kind::HttpError(status_code.as_u16());
+            }
+        }
+        // check for connection error
+        if let Some(CoreError::ConnectionError(..)) = cause.downcast_ref::<CoreError>() {
+            return Kind::ConnectionError;
         }
     }
-    None
+
+    Kind::Generic
 }
 
 // goes through the error chain and returns the first special cased error message, if any

tmc-langs-cli/src/output.rs

@@ -58,6 +58,14 @@ impl From<StatusType> for OutputResult {
 
 #[derive(Debug, Serialize)]
 pub struct ErrorData {
-    pub http_status_code: Option<u16>,
+    pub kind: Kind,
     pub trace: Vec<String>,
 }
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum Kind {
+    Generic,
+    AuthorizationError,
+    ConnectionError,
+}

tmc-langs-core/src/error.rs

@@ -1,7 +1,7 @@
 //! The core error type.
 
 use crate::response;
-use reqwest::StatusCode;
+use reqwest::{Method, StatusCode};
 use std::path::PathBuf;
 use thiserror::Error;
 use url::Url;
@@ -28,17 +28,15 @@ pub enum CoreError {
 
     // network
     #[error("HTTP error {1} for {0}: {2}")]
-    HttpStatus(Url, StatusCode, String),
+    HttpError(Url, StatusCode, String),
+    #[error("Connection error trying to {0} {1}")]
+    ConnectionError(Method, Url, #[source] reqwest::Error),
     #[error("OAuth2 password exchange error")]
     Token(#[source] Box<TokenError>),
     #[error("OAuth2 unexpected token response: {0}")]
     TokenParse(String, #[source] serde_json::error::Error),
     #[error("Failed to parse as URL: {0}")]
     UrlParse(String, #[source] url::ParseError),
-    #[error("Failed to GET {0}")]
-    HttpGet(Url, #[source] reqwest::Error),
-    #[error("Failed to POST {0}")]
-    HttpPost(Url, #[source] reqwest::Error),
     #[error("Failed to write response to {0}")]
     HttpWriteResponse(PathBuf, #[source] reqwest::Error),
     #[error("Failed to deserialize response as JSON")]

tmc-langs-core/src/tmc_core/api.rs

@@ -9,7 +9,10 @@ use crate::{
 };
 
 use oauth2::TokenResponse;
-use reqwest::blocking::{multipart::Form, RequestBuilder, Response as ReqwestResponse};
+use reqwest::{
+    blocking::{multipart::Form, RequestBuilder, Response as ReqwestResponse},
+    Method,
+};
 use serde::de::DeserializeOwned;
 use serde_json::Value;
 use std::collections::HashMap;
@@ -69,7 +72,7 @@ impl CoreExt for ReqwestResponse {
                         })
                 })
                 .unwrap_or(text);
-            Err(CoreError::HttpStatus(url, status, parsed))
+            Err(CoreError::HttpError(url, status, parsed))
         }
     }
 }
@@ -109,7 +112,7 @@ impl TmcCore {
             .get(url.clone())
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpGet(url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::GET, url.clone(), e))?
             .check_error(url)?
             .json_res()
     }
@@ -128,7 +131,7 @@ impl TmcCore {
             .get(url.clone())
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpGet(url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::GET, url.clone(), e))?
             .check_error(url)?
             .copy_to(&mut target_file)
             .map_err(|e| CoreError::HttpWriteResponse(target.to_path_buf(), e))?;
@@ -144,7 +147,7 @@ impl TmcCore {
             .get(url.clone())
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpGet(url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::GET, url.clone(), e))?
             .check_error(url)?
             .copy_to(&mut target_file)
             .map_err(|e| CoreError::HttpWriteResponse(target.to_path_buf(), e))?;
@@ -612,7 +615,7 @@ impl TmcCore {
             .multipart(form)
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpPost(submission_url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::POST, submission_url.clone(), e))?
             .check_error(submission_url)?
             .json_res()?;
         log::debug!("received {:?}", res);
@@ -652,7 +655,7 @@ impl TmcCore {
             .multipart(form)
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpPost(feedback_url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::POST, feedback_url.clone(), e))?
             .check_error(feedback_url)?
             .json_res()
     }
@@ -677,7 +680,7 @@ impl TmcCore {
             .query(&[("review[points]", review_points)])
             .core_headers(self)
             .send()
-            .map_err(|e| CoreError::HttpPost(url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::POST, url.clone(), e))?
             .check_error(url)?
             .json_res()?;
         log::trace!("received {:?}", res);
@@ -699,7 +702,7 @@ impl TmcCore {
             .post(url.clone())
             .multipart(form)
             .send()
-            .map_err(|e| CoreError::HttpPost(url.clone(), e))?
+            .map_err(|e| CoreError::ConnectionError(Method::POST, url.clone(), e))?
             .check_error(url)?
             .json_res()
     }