traxys/regalade
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
traxys 2024-03-02 15:56:00 +01:00
parent 37888d5835
commit faeaf43f80
8 changed files with 1356 additions and 951 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -6,7 +6,7 @@ use std::{
};
use anyhow::anyhow;
use axum::{error_handling::HandleErrorLayer, http::StatusCode, BoxError, Router};
use axum::Router;
use base64::{engine::general_purpose, Engine};
use jwt_simple::prelude::HS256Key;
use migration::{Migrator, MigratorTrait};
@ -19,9 +19,9 @@ use openidconnect::{
use sea_orm::{ConnectOptions, Database, DatabaseConnection};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use time::OffsetDateTime;
use tower::ServiceBuilder;
use tower_http::services::{ServeDir, ServeFile};
use tower_sessions::{sqlx::PgPool, ExpiredDeletion, PostgresStore, SessionManagerLayer};
use tower_sessions::{session_store::ExpiredDeletion, SessionManagerLayer};
use tower_sessions_sqlx_store::{sqlx::PgPool, PostgresStore};
use tracing_subscriber::EnvFilter;
use uuid::Uuid;
@ -381,18 +381,12 @@ async fn main() -> anyhow::Result<()> {
.continuously_delete_expired(tokio::time::Duration::from_secs(60)),
);
let session_service = ServiceBuilder::new()
.layer(HandleErrorLayer::new(|_: BoxError| async {
StatusCode::BAD_REQUEST
}))
.layer(
SessionManagerLayer::new(sessions.clone())
.with_secure(false)
.with_same_site(tower_sessions::cookie::SameSite::Lax)
.with_expiry(tower_sessions::Expiry::AtDateTime(
OffsetDateTime::now_utc().saturating_add(SESSION_DURATION),
)),
);
let session_layer = SessionManagerLayer::new(sessions.clone())
.with_secure(false)
.with_same_site(tower_sessions::cookie::SameSite::Lax)
.with_expiry(tower_sessions::Expiry::AtDateTime(
OffsetDateTime::now_utc().saturating_add(SESSION_DURATION),
));
let state = Arc::new(AppState {
jwt_secret: config.jwt_secret,
@ -413,7 +407,7 @@ async fn main() -> anyhow::Result<()> {
)
.merge(app::router())
.with_state(state)
.layer(session_service);
.layer(session_layer);
let router = match config.serve_app {
None => router,