mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract `json!` into `api::json` 

Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
This commit is contained in:
Sebastian Martinez 2023-02-02 22:15:13 -03:00 committed by Alexis Sellier
parent d9f878bc45
commit b4ddb31cf3
No known key found for this signature in database
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
radicle-httpd/src/api/json.rs
View File

@ -14,6 +14,8 @@ use radicle_surf::blob::Blob;
use radicle_surf::tree::Tree;
use radicle_surf::{Commit, Stats};
use crate::api::auth::Session;
/// Returns JSON of a commit.
pub(crate) fn commit(commit: &Commit) -> Value {
json!({
@ -32,6 +34,17 @@ pub(crate) fn commit(commit: &Commit) -> Value {
})
}
/// Returns JSON of a session.
pub(crate) fn session(session_id: String, session: &Session) -> Value {
json!({
"sessionId": session_id,
"status": session.status,
"publicKey": session.public_key,
"issuedAt": session.issued_at.unix_timestamp(),
"expiresAt": session.expires_at.unix_timestamp()
})
}
/// Returns JSON for a blob with a given `path`.
pub(crate) fn blob(blob: &Blob, path: &str) -> Value {
json!({

16
radicle-httpd/src/api/v1/sessions.rs
View File

@ -7,12 +7,12 @@ use axum::{Json, Router};
use hyper::StatusCode;
use radicle::crypto::{PublicKey, Signature};
use serde::{Deserialize, Serialize};
use serde_json::json;
use time::{Duration, OffsetDateTime};
use crate::api::auth::{AuthState, Session};
use crate::api::axum_extra::Path;
use crate::api::error::Error;
use crate::api::json;
use crate::api::Context;
pub const UNAUTHORIZED_SESSIONS_EXPIRATION: Duration = Duration::seconds(60);
@ -55,12 +55,7 @@ async fn session_create_handler(State(ctx): State<Context>) -> impl IntoResponse
Ok::<_, Error>((
StatusCode::CREATED,
Json(json!({
"sessionId": session_id,
"publicKey": session.public_key,
"issuedAt": session.issued_at,
"expiresAt": session.expires_at
})),
Json(json::session(session_id, &session)),
))
}
@ -73,12 +68,7 @@ async fn session_handler(
let sessions = ctx.sessions.read().await;
let session = sessions.get(&session_id).ok_or(Error::NotFound)?;
Ok::<_, Error>(Json(json!({
"status": session.status,
"publicKey": session.public_key,
"issuedAt": session.issued_at.unix_timestamp(),
"expiresAt": session.expires_at.unix_timestamp()
})))
Ok::<_, Error>(Json(json::session(session_id, session)))
}
/// Update session.