feat: swap over to using json for token generation return data
This commit is contained in:
parent
07979bf90e
commit
5d9c016e8e
1 changed files with 17 additions and 2 deletions
|
|
@ -1,14 +1,29 @@
|
||||||
|
use chrono::{DateTime, Duration, NaiveDateTime, Utc};
|
||||||
use rocket::{get, State};
|
use rocket::{get, State};
|
||||||
|
use rocket::serde::json::Json;
|
||||||
|
use serde::Serialize;
|
||||||
use crate::account::account::Auth;
|
use crate::account::account::Auth;
|
||||||
use crate::nnid::oauth::generate_token::create_token;
|
use crate::nnid::oauth::generate_token::create_token;
|
||||||
use crate::nnid::oauth::generate_token::token_type::AUTH_TOKEN;
|
use crate::nnid::oauth::generate_token::token_type::AUTH_TOKEN;
|
||||||
use crate::Pool;
|
use crate::Pool;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct TokenData{
|
||||||
|
token: String,
|
||||||
|
expiry: NaiveDateTime
|
||||||
|
}
|
||||||
|
|
||||||
#[get("/api/v2/oauth2/generate_token")]
|
#[get("/api/v2/oauth2/generate_token")]
|
||||||
pub async fn generate_token(pool: &State<Pool>, auth: Auth<false>) -> String{
|
pub async fn generate_token(pool: &State<Pool>, auth: Auth<false>) -> Json<TokenData>{
|
||||||
let pool = pool.inner();
|
let pool = pool.inner();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
create_token(pool, auth.pid, AUTH_TOKEN, None).await
|
Json(
|
||||||
|
TokenData{
|
||||||
|
expiry: Utc::now().naive_utc() + Duration::hours(1),
|
||||||
|
token: create_token(pool, auth.pid, AUTH_TOKEN, None).await,
|
||||||
|
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue