Update to rAuth v1, closes #63.

Add Pong packet for normal frames.

src/routes/mod.rs

@@ -1,7 +1,8 @@
-pub use rocket::response::Redirect;
 pub use rocket::http::Status;
+pub use rocket::response::Redirect;
 use rocket::{Build, Rocket};
 
+mod bots;
 mod channels;
 mod invites;
 mod onboard;
@@ -10,7 +11,6 @@ mod root;
 mod servers;
 mod sync;
 mod users;
-mod bots;
 
 pub fn mount(rocket: Rocket<Build>) -> Rocket<Build> {
     rocket

src/routes/onboard/complete.rs

@@ -2,7 +2,7 @@ use crate::database::*;
 use crate::util::result::{Error, Result, EmptyResponse};
 
 use mongodb::bson::doc;
-use rauth::auth::Session;
+use rauth::entities::Session;
 use regex::Regex;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};

src/routes/onboard/hello.rs

@@ -1,6 +1,6 @@
 use crate::database::*;
 
-use rauth::auth::Session;
+use rauth::entities::Session;
 use rocket::serde::json::Value;
 
 #[get("/hello")]

src/routes/push/subscribe.rs

@@ -1,37 +1,19 @@
 use crate::database::*;
 use crate::util::result::{EmptyResponse, Error, Result};
 
-use mongodb::bson::{doc, to_document};
-use rauth::auth::Session;
+use mongodb::bson::doc;
+use rauth::entities::{Model, Session, WebPushSubscription};
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct Subscription {
-    endpoint: String,
-    p256dh: String,
-    auth: String,
-}
 
 #[post("/subscribe", data = "<data>")]
-pub async fn req(session: Session, data: Json<Subscription>) -> Result<EmptyResponse> {
-    let data = data.into_inner();
-    get_collection("accounts")
-        .update_one(
-            doc! {
-                "_id": session.user_id,
-                "sessions.id": session.id.unwrap()
-            },
-            doc! {
-                "$set": {
-                    "sessions.$.subscription": to_document(&data)
-                        .map_err(|_| Error::DatabaseError { operation: "to_document", with: "subscription" })?
-                }
-            },
-            None,
-        )
+pub async fn req(mut session: Session, data: Json<WebPushSubscription>) -> Result<EmptyResponse> {
+    session.subscription = Some(data.into_inner());
+    session
+        .save(&get_db(), None)
         .await
-        .map_err(|_| Error::DatabaseError { operation: "update_one", with: "account" })?;
-
-    Ok(EmptyResponse {})
+        .map(|_| EmptyResponse)
+        .map_err(|_| Error::DatabaseError {
+            operation: "save",
+            with: "session",
+        })
 }

src/routes/push/unsubscribe.rs

@@ -1,29 +1,18 @@
 use crate::database::*;
-use crate::util::result::{Error, Result, EmptyResponse};
+use crate::util::result::{EmptyResponse, Error, Result};
 
 use mongodb::bson::doc;
-use rauth::auth::Session;
+use rauth::entities::{Model, Session};
 
 #[post("/unsubscribe")]
-pub async fn req(session: Session) -> Result<EmptyResponse> {
-    get_collection("accounts")
-        .update_one(
-            doc! {
-                "_id": session.user_id,
-                "sessions.id": session.id.unwrap()
-            },
-            doc! {
-                "$unset": {
-                    "sessions.$.subscription": 1
-                }
-            },
-            None,
-        )
+pub async fn req(mut session: Session) -> Result<EmptyResponse> {
+    session.subscription = None;
+    session
+        .save(&get_db(), None)
         .await
+        .map(|_| EmptyResponse)
         .map_err(|_| Error::DatabaseError {
-            operation: "to_document",
-            with: "subscription",
-        })?;
-
-    Ok(EmptyResponse {})
+            operation: "save",
+            with: "session",
+        })
 }

src/routes/root.rs

@@ -1,7 +1,11 @@
-use crate::util::{ratelimit::RateLimitGuard, variables::{
-    APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, JANUARY_URL, USE_AUTUMN,
-    USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL, VOSO_WS_HOST,
-}};
+use crate::util::{
+    ratelimit::RateLimitGuard,
+    variables::{
+        APP_URL, AUTUMN_URL, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, JANUARY_URL,
+        USE_AUTUMN, USE_EMAIL, USE_HCAPTCHA, USE_JANUARY, USE_VOSO, VAPID_PUBLIC_KEY, VOSO_URL,
+        VOSO_WS_HOST,
+    },
+};
 
 use mongodb::bson::doc;
 use rocket::{http::Status, serde::json::Value};

src/routes/sync/get_settings.rs

@@ -14,9 +14,9 @@ pub struct Options {
 #[post("/settings/fetch", data = "<options>")]
 pub async fn req(user: User, options: Json<Options>) -> Result<Value> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
+
     let options = options.into_inner();
     let mut projection = doc! {
         "_id": 0,

src/routes/sync/get_unreads.rs

@@ -7,8 +7,8 @@ use rocket::serde::json::Value;
 #[get("/unreads")]
 pub async fn req(user: User) -> Result<Value> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
-    
+
     Ok(json!(User::fetch_unreads(&user.id).await?))
 }

src/routes/sync/set_settings.rs

@@ -1,6 +1,6 @@
 use crate::database::*;
 use crate::notifications::events::ClientboundNotification;
-use crate::util::result::{Error, Result, EmptyResponse};
+use crate::util::result::{EmptyResponse, Error, Result};
 
 use chrono::prelude::*;
 use mongodb::bson::{doc, to_bson};
@@ -20,7 +20,7 @@ pub struct Options {
 #[post("/settings/set?<options..>", data = "<data>")]
 pub async fn req(user: User, data: Json<Data>, options: Options) -> Result<EmptyResponse> {
     if user.bot.is_some() {
-        return Err(Error::IsBot)
+        return Err(Error::IsBot);
     }
 
     let data = data.into_inner();

src/routes/users/change_username.rs

@@ -3,9 +3,8 @@ use crate::notifications::events::ClientboundNotification;
 use crate::util::result::{Error, Result, EmptyResponse};
 
 use mongodb::bson::doc;
-use rauth::auth::{Auth, Session};
+use rauth::entities::Account;
 use regex::Regex;
-use rocket::State;
 use rocket::serde::json::Json;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -26,8 +25,7 @@ pub struct Data {
 
 #[patch("/<_ignore_id>/username", data = "<data>")]
 pub async fn req(
-    auth: &State<Auth>,
-    session: Session,
+    account: Account,
     user: User,
     data: Json<Data>,
     _ignore_id: String,
@@ -39,8 +37,7 @@ pub async fn req(
     data.validate()
         .map_err(|error| Error::FailedValidation { error })?;
 
-    auth.verify_password(&session, data.password.clone())
-        .await
+    account.verify_password(&data.password)
         .map_err(|_| Error::InvalidCredentials)?;
 
     let mut set = doc! {};