Handle the gateway endpoint error

Related: #338
This commit is contained in:
Kevin Yue
2024-03-25 20:35:01 +08:00
parent 08bd4efefa
commit 2d1aa3ba8c
8 changed files with 28 additions and 16 deletions

11
crates/gpapi/src/error.rs Normal file
View File

@@ -0,0 +1,11 @@
use thiserror::Error;
#[derive(Error, Debug)]
pub enum PortalError {
#[error("Portal prelogin error: {0}")]
PreloginError(String),
#[error("Portal config error: {0}")]
ConfigError(String),
#[error("Gateway error: {0}")]
GatewayError(String),
}

View File

@@ -6,6 +6,7 @@ use urlencoding::encode;
use crate::{
credential::Credential,
error::PortalError,
gp_params::GpParams,
utils::{normalize_server, parse_gp_error, remove_url_scheme},
};
@@ -28,7 +29,13 @@ pub async fn gateway_login(gateway: &str, cred: &Credential, gp_params: &GpParam
info!("Gateway login, user_agent: {}", gp_params.user_agent());
let res = client.post(&login_url).form(&params).send().await?;
let res = client
.post(&login_url)
.form(&params)
.send()
.await
.map_err(|e| anyhow::anyhow!(PortalError::GatewayError(e.to_string())))?;
let status = res.status();
if status.is_client_error() || status.is_server_error() {

View File

@@ -1,5 +1,6 @@
pub mod auth;
pub mod credential;
pub mod error;
pub mod gateway;
pub mod gp_params;
pub mod portal;

View File

@@ -7,9 +7,9 @@ use specta::Type;
use crate::{
credential::{AuthCookieCredential, Credential},
error::PortalError,
gateway::{parse_gateways, Gateway},
gp_params::GpParams,
portal::PortalError,
utils::{normalize_server, parse_gp_error, remove_url_scheme, xml},
};

View File

@@ -3,13 +3,3 @@ mod prelogin;
pub use config::*;
pub use prelogin::*;
use thiserror::Error;
#[derive(Error, Debug)]
pub enum PortalError {
#[error("Portal prelogin error: {0}")]
PreloginError(String),
#[error("Portal config error: {0}")]
ConfigError(String),
}

View File

@@ -6,8 +6,8 @@ use serde::Serialize;
use specta::Type;
use crate::{
error::PortalError,
gp_params::GpParams,
portal::PortalError,
utils::{base64, normalize_server, parse_gp_error, xml},
};