[ENG-1828] Migrate to new Cloud Services API

Cargo.toml

@@ -19,30 +19,35 @@ repository   = "https://github.com/spacedriveapp/spacedrive"
 rust-version = "1.81"
 
 [workspace.dependencies]
+# First party dependencies
+sd-cloud-schema = { git = "https://github.com/spacedriveapp/cloud-services-schema", rev = "bbc69c5cb2" }
+
 # Third party dependencies used by one or more of our crates
 async-channel       = "2.3"
 async-stream        = "0.3.6"
 async-trait         = "0.1.83"
 axum                = "0.7.7"
 axum-extra          = "0.9.4"
 base64              = "0.22.1"
-blake3              = "1.5"
+blake3              = "1.5.4"
+bytes               = "1.7.1"                                          # Update blocked by hyper
 chrono              = "0.4.38"
 ed25519-dalek       = "2.1"
+flume               = "0.11.0"
 futures             = "0.3.31"
 futures-concurrency = "7.6"
 globset             = "0.4.15"
 http                = "1.1"
 hyper               = "1.5"
-image               = "0.24.9"                                         # Update blocked due to https://github.com/image-rs/image/issues/2230
+image               = "0.25.4"
 itertools           = "0.13.0"
 lending-stream      = "1.0"
-libc                = "0.2"
+libc                = "0.2.159"
 mimalloc            = "0.1.43"
 normpath            = "1.3"
 pin-project-lite    = "0.2.14"
 rand                = "0.9.0-alpha.2"
-regex               = "1"
+regex               = "1.11"
 reqwest             = { version = "0.12.8", default-features = false }
 rmp                 = "0.8.14"
 rmp-serde           = "1.3"
@@ -62,7 +67,8 @@ tracing-subscriber  = "0.3.18"
 tracing-test        = "0.2.5"
 uhlc                = "0.8.0"                                          # Must follow version used by specta
 uuid                = "1.10"                                           # Must follow version used by specta
-webp                = "0.2.6"                                          # Update blocked by image
+webp                = "0.3.0"
+zeroize             = "1.8"
 
 [workspace.dependencies.rspc]
 git = "https://github.com/spacedriveapp/rspc.git"

apps/desktop/package.json

@@ -20,26 +20,28 @@
 		"@sd/ui": "workspace:*",
 		"@t3-oss/env-core": "^0.7.1",
 		"@tanstack/react-query": "^5.59",
-		"@tauri-apps/api": "=2.0.2",
-		"@tauri-apps/plugin-dialog": "2.0.0",
+		"@tauri-apps/api": "=2.0.3",
+		"@tauri-apps/plugin-dialog": "2.0.1",
+		"@tauri-apps/plugin-http": "2.0.1",
 		"@tauri-apps/plugin-os": "2.0.0",
-		"@tauri-apps/plugin-shell": "2.0.0",
+		"@tauri-apps/plugin-shell": "2.0.1",
 		"consistent-hash": "^1.2.2",
 		"immer": "^10.0.3",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-router-dom": "=6.20.1",
-		"sonner": "^1.0.3"
+		"sonner": "^1.0.3",
+		"supertokens-web-js": "^0.13.0"
 	},
 	"devDependencies": {
 		"@sd/config": "workspace:*",
 		"@sentry/vite-plugin": "^2.16.0",
-		"@tauri-apps/cli": "2.0.1",
+		"@tauri-apps/cli": "2.0.4",
 		"@types/react": "^18.2.67",
 		"@types/react-dom": "^18.2.22",
 		"sass": "^1.72.0",
 		"typescript": "^5.6.2",
-		"vite": "^5.2.0",
-		"vite-tsconfig-paths": "^4.3.2"
+		"vite": "^5.4.9",
+		"vite-tsconfig-paths": "^5.0.1"
 	}
 }

apps/desktop/src-tauri/Cargo.toml

@@ -35,12 +35,15 @@ uuid               = { workspace = true, features = ["serde"] }
 
 # Specific Desktop dependencies
 # WARNING: Do NOT enable default features, as that vendors dbus (see below)
-opener               = { version = "0.7.1", features = ["reveal"], default-features = false }
-specta-typescript    = "=0.0.7"
-tauri-plugin-dialog  = "=2.0.2"
-tauri-plugin-os      = "=2.0.1"
-tauri-plugin-shell   = "=2.0.2"
-tauri-plugin-updater = "=2.0.2"
+opener                         = { version = "0.7.1", features = ["reveal"], default-features = false }
+specta-typescript              = "=0.0.7"
+tauri-plugin-clipboard-manager = "=2.0.1"
+tauri-plugin-deep-link         = "=2.0.1"
+tauri-plugin-dialog            = "=2.0.3"
+tauri-plugin-http              = "=2.0.3"
+tauri-plugin-os                = "=2.0.1"
+tauri-plugin-shell             = "=2.0.2"
+tauri-plugin-updater           = "=2.0.2"
 
 # memory allocator
 mimalloc = { workspace = true }

apps/desktop/src-tauri/capabilities/default.json

@@ -17,13 +17,40 @@
 		"dialog:allow-open",
 		"dialog:allow-save",
 		"dialog:allow-confirm",
+		"deep-link:default",
 		"os:allow-os-type",
 		"core:window:allow-close",
 		"core:window:allow-create",
 		"core:window:allow-maximize",
 		"core:window:allow-minimize",
 		"core:window:allow-toggle-maximize",
 		"core:window:allow-start-dragging",
-		"core:webview:allow-internal-toggle-devtools"
+		"core:webview:allow-internal-toggle-devtools",
+		{
+			"identifier": "http:default",
+			"allow": [
+				{
+					"url": "http://ipc.localhost"
+				},
+				{
+					"url": "http://asset.localhost"
+				},
+				{
+					"url": "http://localhost:8001"
+				},
+				{
+					"url": "http://tauri.localhost"
+				},
+				{
+					"url": "http://localhost:9420"
+				},
+				{
+					"url": "https://auth.spacedrive.com"
+				},
+				{
+					"url": "https://plausible.io"
+				}
+			]
+		}
 	]
 }

apps/desktop/src-tauri/src/main.rs

@@ -14,13 +14,13 @@ use sd_core::{Node, NodeError};
 use sd_fda::DiskAccess;
 use serde::{Deserialize, Serialize};
 use specta_typescript::Typescript;
-use tauri::Emitter;
 use tauri::{async_runtime::block_on, webview::PlatformWebview, AppHandle, Manager, WindowEvent};
+use tauri::{Emitter, Listener};
 use tauri_plugins::{sd_error_plugin, sd_server_plugin};
 use tauri_specta::{collect_events, Builder};
 use tokio::task::block_in_place;
 use tokio::time::sleep;
-use tracing::error;
+use tracing::{debug, error};
 
 mod file;
 mod menu;
@@ -179,7 +179,11 @@ pub enum DragAndDropEvent {
 	Cancelled,
 }
 
-const CLIENT_ID: &str = "2abb241e-40b8-4517-a3e3-5594375c8fbb";
+#[derive(Debug, Clone, Serialize, Deserialize, specta::Type, tauri_specta::Event)]
+#[serde(rename_all = "camelCase")]
+pub struct DeepLinkEvent {
+	data: String,
+}
 
 #[tokio::main]
 async fn main() -> tauri::Result<()> {
@@ -221,9 +225,20 @@ async fn main() -> tauri::Result<()> {
 
 	tauri::Builder::default()
 		.invoke_handler(builder.invoke_handler())
+		.plugin(tauri_plugin_deep_link::init())
 		.setup(move |app| {
 			// We need a the app handle to determine the data directory now.
 			// This means all the setup code has to be within `setup`, however it doesn't support async so we `block_on`.
+			let handle = app.handle().clone();
+			app.listen("deep-link://new-url", move |event| {
+				let deep_link_event = DeepLinkEvent {
+					data: event.payload().to_string(),
+				};
+				println!("Deep link event={:?}", deep_link_event);
+
+				handle.emit("deeplink", deep_link_event).unwrap();
+			});
+
 			block_in_place(|| {
 				block_on(async move {
 					builder.mount_events(app);
@@ -239,10 +254,7 @@ async fn main() -> tauri::Result<()> {
 
 					// The `_guard` must be assigned to variable for flushing remaining logs on main exit through Drop
 					let (_guard, result) = match Node::init_logger(&data_dir) {
-						Ok(guard) => (
-							Some(guard),
-							Node::new(data_dir, sd_core::Env::new(CLIENT_ID)).await,
-						),
+						Ok(guard) => (Some(guard), Node::new(data_dir).await),
 						Err(err) => (None, Err(NodeError::Logger(err))),
 					};
 
@@ -256,7 +268,7 @@ async fn main() -> tauri::Result<()> {
 						}
 					};
 
-					let should_clear_localstorage = node.libraries.get_all().await.is_empty();
+					let should_clear_local_storage = node.libraries.get_all().await.is_empty();
 
 					handle.plugin(rspc::integrations::tauri::plugin(router, {
 						let node = node.clone();
@@ -266,8 +278,8 @@ async fn main() -> tauri::Result<()> {
 					handle.manage(node.clone());
 
 					handle.windows().iter().for_each(|(_, window)| {
-						if should_clear_localstorage {
-							println!("cleaning localStorage");
+						if should_clear_local_storage {
+							debug!("cleaning localStorage");
 							for webview in window.webviews() {
 								webview.eval("localStorage.clear();").ok();
 							}
@@ -344,6 +356,7 @@ async fn main() -> tauri::Result<()> {
 		.plugin(tauri_plugin_dialog::init())
 		.plugin(tauri_plugin_os::init())
 		.plugin(tauri_plugin_shell::init())
+		.plugin(tauri_plugin_http::init())
 		// TODO: Bring back Tauri Plugin Window State - it was buggy so we removed it.
 		.plugin(tauri_plugin_updater::Builder::new().build())
 		.plugin(updater::plugin())

apps/desktop/src-tauri/tauri.conf.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/tauri-v2.0.0-rc.2/core/tauri-config-schema/schema.json",
+	"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/tauri-v2.0.0-rc.8/crates/tauri-cli/tauri.config.schema.json",
 	"productName": "Spacedrive",
 	"identifier": "com.spacedrive.desktop",
 	"build": {
@@ -36,7 +36,12 @@
 			}
 		],
 		"security": {
-			"csp": "default-src webkit-pdfjs-viewer: asset: https://asset.localhost blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
+			"csp": {
+				"default-src": "'self' webkit-pdfjs-viewer: asset: http://asset.localhost blob: data: filesystem: http: https: tauri:",
+				"connect-src": "'self' ipc: http://ipc.localhost ws: wss: http: https: tauri:",
+				"img-src": "'self' asset: http://asset.localhost blob: data: filesystem: http: https: tauri:",
+				"style-src": "'self' 'unsafe-inline' http: https: tauri:"
+			}
 		}
 	},
 	"bundle": {
@@ -100,6 +105,12 @@
 			"endpoints": [
 				"https://spacedrive.com/api/releases/tauri/{{version}}/{{target}}/{{arch}}"
 			]
+		},
+		"deep-link": {
+			"mobile": [],
+			"desktop": {
+				"schemes": ["spacedrive"]
+			}
 		}
 	}
 }

apps/desktop/src/App.tsx

@@ -3,9 +3,10 @@ import { QueryClientProvider } from '@tanstack/react-query';
 import { listen } from '@tauri-apps/api/event';
 import { PropsWithChildren, startTransition, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { RspcProvider } from '@sd/client';
+import { RspcProvider, useBridgeMutation } from '@sd/client';
 import {
 	createRoutes,
+	DeeplinkEvent,
 	ErrorPage,
 	KeybindEvent,
 	PlatformProvider,
@@ -17,14 +18,11 @@ import { RouteTitleContext } from '@sd/interface/hooks/useRouteTitle';
 
 import '@sd/ui/style/style.scss';
 
-import { useLocale } from '@sd/interface/hooks';
-
-import { commands } from './commands';
-import { platform } from './platform';
-import { queryClient } from './query';
-import { createMemoryRouterWithHistory } from './router';
-import { createUpdater } from './updater';
-
+import SuperTokens from 'supertokens-web-js';
+import EmailPassword from 'supertokens-web-js/recipe/emailpassword';
+import Passwordless from 'supertokens-web-js/recipe/passwordless';
+import Session from 'supertokens-web-js/recipe/session';
+import ThirdParty from 'supertokens-web-js/recipe/thirdparty';
 // TODO: Bring this back once upstream is fixed up.
 // const client = hooks.createClient({
 // 	links: [
@@ -34,22 +32,64 @@ import { createUpdater } from './updater';
 // 		tauriLink()
 // 	]
 // });
+import getCookieHandler from '@sd/interface/app/$libraryId/settings/client/account/handlers/cookieHandler';
+import getWindowHandler from '@sd/interface/app/$libraryId/settings/client/account/handlers/windowHandler';
+import { useLocale } from '@sd/interface/hooks';
+import { AUTH_SERVER_URL, getTokens } from '@sd/interface/util';
+
+import { commands } from './commands';
+import { platform } from './platform';
+import { queryClient } from './query';
+import { createMemoryRouterWithHistory } from './router';
+import { createUpdater } from './updater';
+
+SuperTokens.init({
+	appInfo: {
+		apiDomain: AUTH_SERVER_URL,
+		apiBasePath: '/api/auth',
+		appName: 'Spacedrive Auth Service'
+	},
+	cookieHandler: getCookieHandler,
+	windowHandler: getWindowHandler,
+	recipeList: [
+		Session.init({ tokenTransferMethod: 'header' }),
+		EmailPassword.init(),
+		ThirdParty.init(),
+		Passwordless.init()
+	]
+});
 
 const startupError = (window as any).__SD_ERROR__ as string | undefined;
 
 export default function App() {
 	useEffect(() => {
 		// This tells Tauri to show the current window because it's finished loading
 		commands.appReady();
+		// .then(() => {
+		// 	if (import.meta.env.PROD) window.fetch = fetch;
+		// });
 	}, []);
 
 	useEffect(() => {
 		const keybindListener = listen('keybind', (input) => {
 			document.dispatchEvent(new KeybindEvent(input.payload as string));
 		});
+		const deeplinkListener = listen('deeplink', async (data) => {
+			const payload = (data.payload as any).data as string;
+			if (!payload) return;
+			const json = JSON.parse(payload)[0];
+			if (!json) return;
+			//json output: "spacedrive://-/URL"
+			if (typeof json !== 'string') return;
+			if (!json.startsWith('spacedrive://-')) return;
+			const url = (json as string).split('://-/')[1];
+			if (!url) return;
+			document.dispatchEvent(new DeeplinkEvent(url));
+		});
 
 		return () => {
 			keybindListener.then((unlisten) => unlisten());
+			deeplinkListener.then((unlisten) => unlisten());
 		};
 	}, []);
 
@@ -79,6 +119,15 @@ type RedirectPath = { pathname: string; search: string | undefined };
 function AppInner() {
 	const [tabs, setTabs] = useState(() => [createTab()]);
 	const [selectedTabIndex, setSelectedTabIndex] = useState(0);
+	const tokens = getTokens();
+	const cloudBootstrap = useBridgeMutation('cloud.bootstrap');
+
+	useEffect(() => {
+		// If the access token and/or refresh token are missing, we need to skip the cloud bootstrap
+		if (tokens.accessToken.length === 0 || tokens.refreshToken.length === 0) return;
+		cloudBootstrap.mutate([tokens.accessToken, tokens.refreshToken]);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []);
 
 	const selectedTab = tabs[selectedTabIndex]!;
 

apps/desktop/tsconfig.json

@@ -5,7 +5,8 @@
 		"declarationDir": "dist",
 		"paths": {
 			"~/*": ["./src/*"]
-		}
+		},
+		"moduleResolution": "bundler"
 	},
 	"include": ["src"],
 	"references": [