fixes login locking up after refresh

backend/Cargo.lock

@@ -825,7 +825,7 @@ dependencies = [
 
 [[package]]
 name = "embassy-os"
-version = "0.3.0-rev.1"
+version = "0.3.0-rev.2"
 dependencies = [
  "aes",
  "async-trait",

backend/Cargo.toml

@@ -14,7 +14,7 @@ keywords = [
 name = "embassy-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/embassy-os"
-version = "0.3.0-rev.1"
+version = "0.3.0-rev.2"
 
 [lib]
 name = "embassy"

backend/sqlx-data.json

@@ -47,7 +47,7 @@
         {
           "name": "id: u32",
           "ordinal": 0,
-          "type_info": "Null"
+          "type_info": "Int64"
         }
       ],
       "parameters": {
@@ -68,6 +68,16 @@
       "nullable": []
     }
   },
+  "2932aa02735b6422fca4ba889abfb3de8598178d4690076dc278898753d9df62": {
+    "query": "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = ?",
+    "describe": {
+      "columns": [],
+      "parameters": {
+        "Right": 1
+      },
+      "nullable": []
+    }
+  },
   "3502e58f2ab48fb4566d21c920c096f81acfa3ff0d02f970626a4dcd67bac71d": {
     "query": "SELECT tor_key FROM account",
     "describe": {

backend/src/db/mod.rs

@@ -148,6 +148,10 @@ async fn deal_with_messages(
                         }
                         return Ok(())
                     }
+                    None => {
+                        tracing::info!("Closing WebSocket: Stream Finished");
+                        return Ok(())
+                    }
                     _ => (),
                 }
             }

backend/src/middleware/auth.rs

@@ -39,12 +39,16 @@ impl HasLoggedOutSessions {
             .by_ref()
             .map(|x| x.as_logout_session_id())
             .collect::<Vec<_>>();
-        sqlx::query(&format!(
-            "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id IN ('{}')",
-            sessions.join("','")
-        ))
-        .execute(&mut ctx.secret_store.acquire().await?)
-        .await?;
+        let mut sqlx_conn = ctx.secret_store.acquire().await?;
+        for session in &sessions {
+            sqlx::query!(
+                "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = ?",
+                session
+            )
+            .execute(&mut sqlx_conn)
+            .await?;
+        }
+        drop(sqlx_conn);
         for session in sessions {
             for socket in ctx
                 .open_authed_websockets

backend/src/version/mod.rs

@@ -10,14 +10,16 @@ use crate::{Error, ResultExt};
 
 mod v0_3_0;
 mod v0_3_0_1;
+mod v0_3_0_2;
 
-pub type Current = v0_3_0_1::Version;
+pub type Current = v0_3_0_2::Version;
 
 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(untagged)]
 enum Version {
     V0_3_0(Wrapper<v0_3_0::Version>),
     V0_3_0_1(Wrapper<v0_3_0_1::Version>),
+    V0_3_0_2(Wrapper<v0_3_0_2::Version>),
     Other(emver::Version),
 }
 
@@ -33,6 +35,11 @@ where
     async fn up<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error>;
     async fn down<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error>;
     async fn commit<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error> {
+        crate::db::DatabaseModel::new()
+            .server_info()
+            .eos_version_compat()
+            .put(db, &self.compat())
+            .await?;
         crate::db::DatabaseModel::new()
             .server_info()
             .version()
@@ -114,6 +121,7 @@ pub async fn init<Db: DbHandle>(db: &mut Db) -> Result<(), Error> {
     match version {
         Version::V0_3_0(v) => v.0.migrate_to(&Current::new(), db).await?,
         Version::V0_3_0_1(v) => v.0.migrate_to(&Current::new(), db).await?,
+        Version::V0_3_0_2(v) => v.0.migrate_to(&Current::new(), db).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),

backend/src/version/v0_3_0_2.rs

@@ -0,0 +1,33 @@
+use std::path::Path;
+
+use emver::VersionRange;
+use tokio::process::Command;
+
+use super::*;
+use crate::disk::quirks::{fetch_quirks, save_quirks, update_quirks};
+use crate::disk::BOOT_RW_PATH;
+use crate::update::query_mounted_label;
+use crate::util::Invoke;
+
+const V0_3_0_2: emver::Version = emver::Version::new(0, 3, 0, 2);
+
+pub struct Version;
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_3_0_1::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_0_2
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &*v0_3_0::V0_3_0_COMPAT
+    }
+    async fn up<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
+        Ok(())
+    }
+}

frontend/config-sample.json

@@ -1,5 +1,6 @@
 {
   "useMocks": true,
+  "targetArch": "aarch64",
   "ui": {
     "patchDb": {
       "poll": {
@@ -13,7 +14,6 @@
     "mocks": {
       "maskAs": "tor",
       "skipStartupAlerts": true
-    },
-    "targetArch": "aarch64"
+    }
   }
 }

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "embassy-os",
-  "version": "0.3.0.1",
+  "version": "0.3.0.2",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "scripts": {

frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html

@@ -10,8 +10,11 @@
 </ion-header>
 
 <ion-content class="ion-padding">
-  <p class="note-padding">Minor bugfixes and performance improvements.</p>
+  <p class="note-padding">Minor compatibility fix.</p>
   <h5>Previous releases:</h5>
+  <h6>0.3.0.1 Release Notes</h6>
+  <p>Minor bugfixes and performance improvements.</p>
+  <p></p>
   <h6>0.3.0 Release Notes</h6>
   <p></p>
   <p>