System-End/plura
1
0
Fork 0
mirror of https://github.com/System-End/plura.git synced 2026-04-19 20:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix oauth route

Browse source
This commit is contained in:
Suya1671 2025-07-20 00:59:22 +02:00
parent e3911cc4a5
commit dedc9243f5
No known key found for this signature in database
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/oauth.rs
View file

@ -1,6 +1,6 @@
use axum::{
extract::{FromRequestParts, Query, State},
http::{StatusCode, request::Parts},
http::{self, StatusCode, request::Parts},
};
use oauth2::{
AuthUrl, AuthorizationCode, ClientId, ClientSecret, EndpointNotSet, EndpointSet, RedirectUrl,
@ -62,18 +62,17 @@ pub struct OauthCode {
pub state: String,
}
pub struct Url(url::Url);
#[derive(Debug)]
pub struct Uri(http::Uri);
impl<S> FromRequestParts<S> for Url
impl<S> FromRequestParts<S> for Uri
where
S: Send + Sync,
{
type Rejection = (StatusCode, &'static str);
async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
let url = url::Url::parse(&parts.uri.to_string())
.map_err(|_| (StatusCode::BAD_REQUEST, "Invalid URL"))?;
Ok(Self(url))
Ok(Self(parts.uri.clone()))
}
}
@ -81,7 +80,7 @@ where
pub async fn oauth_handler(
Query(code): Query<OauthCode>,
State(state): State<user::State>,
Url(url): Url,
Uri(_uri): Uri,
) -> String {
let db = &state.db;
@ -145,34 +144,36 @@ pub async fn oauth_handler(
let response = format!("System for user {} authenticated!", record.owner_id.0);
if let Err(e) = slack_client
.post_webhook_message(
&url,
&SlackApiPostWebhookMessageRequest::new(
SlackMessageContent::new()
.with_text(response.clone()),
),
)
.await {
error!("Error sending Slack message: {:#?}", e);
}
// seemingly fails behind nest
// if let Err(e) = slack_client
// .post_webhook_message(
// &url,
// &SlackApiPostWebhookMessageRequest::new(
// SlackMessageContent::new()
// .with_text(response.clone()),
// ),
// )
// .await {
// error!("Error sending Slack message: {:#?}", e);
// }
response
}
Err(e) => {
let response = format!("Error creating system: {e:#?}");
if let Err(e) = slack_client
.post_webhook_message(
&url,
&SlackApiPostWebhookMessageRequest::new(
SlackMessageContent::new()
.with_text(response.clone()),
),
)
.await {
error!("Error sending Slack message: {:#?}", e);
}
// seemingly fails behind nest
// if let Err(e) = slack_client
// .post_webhook_message(
// &url,
// &SlackApiPostWebhookMessageRequest::new(
// SlackMessageContent::new()
// .with_text(response.clone()),
// ),
// )
// .await {
// error!("Error sending Slack message: {:#?}", e);
// }
error!("{response}");
response