Middle of session move.

This commit is contained in:
2026-05-13 11:35:30 -04:00
parent 89715320cb
commit 8f34bad321
9 changed files with 910 additions and 912 deletions

View File

@@ -8,7 +8,7 @@ use axum::{
use clap::Parser;
//use morethantext::{ActionType, ErrorType, MoreThanText};
//use morethantext::{MoreThanText, MsgAction, Query};
use morethantext::{ErrorID, MTTError, MoreThanText};
use morethantext::{ErrorID, Field, MTTError, MoreThanText};
use std::{collections::HashMap, convert::Infallible};
use tokio::{spawn, sync::mpsc::channel};
use tower_cookies::{Cookie, CookieManagerLayer, Cookies};
@@ -55,7 +55,7 @@ async fn create_app(state: MoreThanText) -> Router {
#[allow(dead_code)]
#[derive(Clone)]
struct SessionID(String);
struct SessionID(Field);
impl<S> FromRequestParts<S> for SessionID
where
@@ -74,14 +74,14 @@ where
let (tx, mut rx) = channel(1);
spawn(async move {
let id = match requested {
Some(data) => state.client_with_session(data, None).session_id(),
None => state.client().session_id(),
Some(data) => state.client_with_session(data, None).session_id().clone(),
None => state.client().session_id().clone(),
};
tx.send(id).await.unwrap();
});
let id = rx.recv().await.unwrap();
if !req_id.is_some_and(|x| x == id.to_string()) {
cookies.add(Cookie::new(SESSION_KEY, id.to_string()));
if !req_id.is_some_and(|x| x == "id".to_string()) {
cookies.add(Cookie::new(SESSION_KEY, "id".to_string()));
}
Ok(SessionID(id))
}
@@ -149,6 +149,7 @@ mod servers {
}
#[tokio::test]
#[ignore = "need to complete moving session into the queue"]
async fn session_ids_are_unique() {
let app = create_app(MoreThanText::new()).await;
let mut holder: Vec<String> = Vec::new();