chore: fix http mode and admin signup init

This commit is contained in:
Jesús Pérez 2023-08-14 20:38:42 +00:00
parent 20f5e00cba
commit 5ee4a522d4
3 changed files with 20 additions and 9 deletions

View File

@ -78,7 +78,7 @@ pub fn admin_router_handlers() -> Router {
let _ = req_handler.trace_req(format!("Render users list")); let _ = req_handler.trace_req(format!("Render users list"));
( (
res_headers, res_headers,
result.to_owned() result
).into_response() ).into_response()
} }
async fn user_get_handler( async fn user_get_handler(

View File

@ -2,9 +2,7 @@ use std::sync::Arc;
use casbin::CoreApi; use casbin::CoreApi;
use axum::{ use axum::{
extract::{Request,ConnectInfo}, extract::{Request,ConnectInfo},
http::{ http::StatusCode,
StatusCode,
},
Extension, Extension,
response::{IntoResponse,Response,Redirect}, response::{IntoResponse,Response,Redirect},
middleware::Next, middleware::Next,

View File

@ -370,7 +370,12 @@ pub fn users_router_handlers() -> Router {
} else { } else {
DEFAULT_ROLES.to_owned() DEFAULT_ROLES.to_owned()
}; };
let isadmin = if user_data.id == "A" { let total_users = User::count(&app_dbs.user_store).await.unwrap_or_else(|e|{
let _ = req_handler.trace_req( format!("Users count error: {}",e));
println!("Count error: {}",e);
-1
});
let isadmin = if user_data.id == "A" || total_users < 1 {
true true
} else { } else {
false false
@ -600,10 +605,18 @@ pub fn users_router_handlers() -> Router {
"post_login_handler" "post_login_handler"
); );
let _ = req_handler.trace_req(format!("user '{}', new token: '{}', cookie: '{}' ",&user_login.name, &session_token, &session_cookie)); let _ = req_handler.trace_req(format!("user '{}', new token: '{}', cookie: '{}' ",&user_login.name, &session_token, &session_cookie));
( // TODO Is this a bug ??
req_handler.req_header.header, // http -> tokio-runtime-worker' panicked at 'payload claims content-length of 10, custom content-length header claims 34
result if app_dbs.config.protocol == "https" {
).into_response() (
req_handler.req_header.header,
result
).into_response()
} else {
(
result
).into_response()
}
}, },
Err(e) => { Err(e) => {
let _ = req_handler.trace_req(format!("user '{}' update error: {}",&user_login.name,e)); let _ = req_handler.trace_req(format!("user '{}' update error: {}",&user_login.name,e));