Added httpauth, looking into sessions
This commit is contained in:
@@ -5,6 +5,8 @@ extern crate diesel_migrations;
|
||||
use std::env;
|
||||
use std::collections::HashSet;
|
||||
use std::sync::Arc;
|
||||
use actix_web_httpauth::middleware::HttpAuthentication;
|
||||
use db::users::validator;
|
||||
use log::{error, warn, info};
|
||||
use serenity::client::Cache;
|
||||
use serenity::framework::StandardFramework;
|
||||
@@ -96,32 +98,34 @@ async fn main() -> std::io::Result<()> {
|
||||
|
||||
let shard_manager = Arc::clone(&client.shard_manager);
|
||||
|
||||
tokio::spawn(async move {
|
||||
tokio::signal::ctrl_c().await.expect("Could not register ctrl+c handler");
|
||||
shard_manager.lock().await.shutdown_all().await;
|
||||
});
|
||||
// tokio::spawn(async move {
|
||||
// tokio::signal::ctrl_c().await.expect("Could not register ctrl+c handler");
|
||||
// shard_manager.lock().await.shutdown_all().await;
|
||||
// });
|
||||
|
||||
tokio::spawn(async move {
|
||||
if let Err(why) = client.start_autosharded().await {
|
||||
error!("An error occurred while running the client: {:?}", why);
|
||||
}
|
||||
});
|
||||
// tokio::spawn(async move {
|
||||
// if let Err(why) = client.start_autosharded().await {
|
||||
// error!("An error occurred while running the client: {:?}", why);
|
||||
// }
|
||||
// });
|
||||
|
||||
let host = env::var("SERVICE_HOST").unwrap_or("localhost".to_string());
|
||||
let port = env::var("SERVICE_PORT").unwrap_or("5000".to_string());
|
||||
|
||||
let server = match HttpServer::new(move || {
|
||||
let auth = HttpAuthentication::bearer(validator);
|
||||
let cors = Cors::default()
|
||||
.allow_any_origin()
|
||||
.allow_any_method()
|
||||
.allow_any_header()
|
||||
.max_age(3600);
|
||||
App::new()
|
||||
.wrap(auth)
|
||||
.wrap(cors)
|
||||
.app_data(web::Data::new(Arc::clone(&app_data)))
|
||||
.configure(crate::db::messages::init_routes)
|
||||
.configure(crate::db::spells::init_routes)
|
||||
.configure(crate::bot::api::init_routes)
|
||||
.wrap(cors)
|
||||
})
|
||||
.bind(format!("{}:{}", host, port)) {
|
||||
Ok(b) => {
|
||||
|
||||
Reference in New Issue
Block a user