Push env variables to rAuth + cargo fmt.

This commit is contained in:
Paul Makles
2021-01-26 17:29:03 +00:00
parent abd8b1821d
commit 23ec2d61f1
10 changed files with 94 additions and 56 deletions

View File

@@ -41,7 +41,7 @@ pub enum ClientboundNotification {
Message(Message),
MessageUpdate {
id: String,
data: JsonValue
data: JsonValue,
},
MessageDelete {
id: String,
@@ -50,7 +50,7 @@ pub enum ClientboundNotification {
ChannelCreate(Channel),
ChannelUpdate {
id: String,
data: JsonValue
data: JsonValue,
},
ChannelGroupJoin {
id: String,

View File

@@ -12,7 +12,10 @@ use futures::{pin_mut, prelude::*};
use hive_pubsub::PubSub;
use log::{debug, info};
use many_to_many::ManyToMany;
use rauth::{auth::{Auth, Session}, options::Options};
use rauth::{
auth::{Auth, Session},
options::Options,
};
use std::collections::HashMap;
use std::net::SocketAddr;
use std::sync::{Arc, Mutex, RwLock};
@@ -84,9 +87,10 @@ async fn accept(stream: TcpStream) {
}
}
if let Ok(validated_session) = Auth::new(get_collection("accounts"), Options::new())
.verify_session(new_session)
.await
if let Ok(validated_session) =
Auth::new(get_collection("accounts"), Options::new())
.verify_session(new_session)
.await
{
let id = validated_session.user_id.clone();
if let Ok(user) = (Ref { id: id.clone() }).fetch_user().await {