diff --git a/frontend/bun.lock b/frontend/bun.lock index 7f913d8..a68ac32 100644 --- a/frontend/bun.lock +++ b/frontend/bun.lock @@ -23,6 +23,7 @@ "solid-motionone": "^1.0.3", "solidjs-markdown": "^0.2.0", "tailwind-scrollbar-hide": "^2.0.0", + "tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", "tauri-plugin-sharetarget-api": "file:../tauri-plugin-sharetarget", "valibot": "^1.0.0-rc.2", }, @@ -698,6 +699,8 @@ "tailwindcss": ["tailwindcss@3.4.0", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.19.1", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", "postcss": "^8.4.23", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA=="], + "tauri-plugin-ios-shared-token-api": ["tauri-plugin-ios-shared-token-api@file:../tauri-plugin-ios-shared-token", { "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.6" }, "devDependencies": { "@rollup/plugin-typescript": "^11.1.6", "rollup": "^4.9.6", "tslib": "^2.6.2", "typescript": "^5.3.3" } }], + "tauri-plugin-sharetarget-api": ["tauri-plugin-sharetarget-api@file:../tauri-plugin-sharetarget", { "dependencies": { "@tauri-apps/api": ">=2.0.0-beta.6" }, "devDependencies": { "@rollup/plugin-typescript": "^11.1.6", "@tauri-apps/cli": "^2.0.4", "rollup": "^4.24.2", "tslib": "^2.6.2", "typescript": "^5.3.3" } }], "thenby": ["thenby@1.3.4", "", {}, "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ=="], diff --git a/frontend/package.json b/frontend/package.json index 6c1a2f7..2f8d555 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -33,6 +33,7 @@ "solid-motionone": "^1.0.3", "solidjs-markdown": "^0.2.0", "tailwind-scrollbar-hide": "^2.0.0", + "tauri-plugin-ios-shared-token-api": "file:../tauri-plugin-ios-shared-token", "tauri-plugin-sharetarget-api": "file:../tauri-plugin-sharetarget", "valibot": "^1.0.0-rc.2" }, diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock index 70dab8b..43fd354 100644 --- a/frontend/src-tauri/Cargo.lock +++ b/frontend/src-tauri/Cargo.lock @@ -18,6 +18,7 @@ dependencies = [ "tauri-plugin-fs", "tauri-plugin-global-shortcut", "tauri-plugin-http", + "tauri-plugin-ios-shared-token", "tauri-plugin-log", "tauri-plugin-os", "tauri-plugin-sharetarget", @@ -4113,6 +4114,16 @@ dependencies = [ "urlpattern", ] +[[package]] +name = "tauri-plugin-ios-shared-token" +version = "0.1.0" +dependencies = [ + "serde", + "tauri", + "tauri-plugin", + "thiserror 2.0.12", +] + [[package]] name = "tauri-plugin-log" version = "2.4.0" diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index a6ed212..46a052b 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -40,3 +40,6 @@ tauri-plugin-global-shortcut = "2" [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] tauri-plugin-sharetarget = { path = "../../tauri-plugin-sharetarget"} + +[target."cfg(any(target_os = \"ios\"))".dependencies] +tauri-plugin-ios-shared-token = { path = "../../tauri-plugin-ios-shared-token"} diff --git a/frontend/src-tauri/capabilities/mobile.toml b/frontend/src-tauri/capabilities/mobile.toml index 5851392..c0594ef 100644 --- a/frontend/src-tauri/capabilities/mobile.toml +++ b/frontend/src-tauri/capabilities/mobile.toml @@ -9,6 +9,7 @@ permissions = [ "http:default", "os:default", "sharetarget:default", + "ios-shared-token:default", { identifier = "http:default", allow = [ { url = "https://haystack.johncosta.tech" }, { url = "http://localhost:3040" }, diff --git a/frontend/src-tauri/src/lib.rs b/frontend/src-tauri/src/lib.rs index 06b916b..8131d78 100644 --- a/frontend/src-tauri/src/lib.rs +++ b/frontend/src-tauri/src/lib.rs @@ -58,6 +58,8 @@ pub fn android() { .plugin(tauri_plugin_store::Builder::new().build()) .plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_sharetarget::init()) + #[cfg(target_os = "ios")] + .plugin(tauri_plugin_ios_shared_token::init()) .setup(|app| { log::info!("running things!"); setup_window(app)?; diff --git a/frontend/src/ProtectedRoute.tsx b/frontend/src/ProtectedRoute.tsx index e4bc3c9..3a26c41 100644 --- a/frontend/src/ProtectedRoute.tsx +++ b/frontend/src/ProtectedRoute.tsx @@ -1,6 +1,7 @@ import { type Component, type JSX, Show } from "solid-js"; import { jwtDecode } from "jwt-decode"; import { Navigate } from "@solidjs/router"; +import { saveToken } from "tauri-plugin-ios-shared-token-api"; export const isTokenValid = (): boolean => { const token = localStorage.getItem("access"); @@ -22,6 +23,15 @@ export const ProtectedRoute: Component<{ children?: JSX.Element }> = ( ) => { const isValid = isTokenValid(); + if (isValid) { + const token = localStorage.getItem("access"); + if (token == null) { + throw new Error("unreachable"); + } + + saveToken(token); + } + return ( }> {props.children} diff --git a/tauri-plugin-ios-shared-token/.gitignore b/tauri-plugin-ios-shared-token/.gitignore new file mode 100644 index 0000000..50d8e32 --- /dev/null +++ b/tauri-plugin-ios-shared-token/.gitignore @@ -0,0 +1,17 @@ +/.vs +.DS_Store +.Thumbs.db +*.sublime* +.idea/ +debug.log +package-lock.json +.vscode/settings.json +yarn.lock + +/.tauri +/target +Cargo.lock +node_modules/ + +dist-js +dist diff --git a/tauri-plugin-ios-shared-token/Cargo.toml b/tauri-plugin-ios-shared-token/Cargo.toml new file mode 100644 index 0000000..9d2bbd2 --- /dev/null +++ b/tauri-plugin-ios-shared-token/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "tauri-plugin-ios-shared-token" +version = "0.1.0" +authors = [ "You" ] +description = "" +edition = "2021" +rust-version = "1.77.2" +exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"] +links = "tauri-plugin-ios-shared-token" + +[dependencies] +tauri = { version = "2.5.0" } +serde = "1.0" +thiserror = "2" + +[build-dependencies] +tauri-plugin = { version = "2.2.0", features = ["build"] } diff --git a/tauri-plugin-ios-shared-token/README.md b/tauri-plugin-ios-shared-token/README.md new file mode 100644 index 0000000..230ccaa --- /dev/null +++ b/tauri-plugin-ios-shared-token/README.md @@ -0,0 +1 @@ +# Tauri Plugin ios-shared-token diff --git a/tauri-plugin-ios-shared-token/build.rs b/tauri-plugin-ios-shared-token/build.rs new file mode 100644 index 0000000..c1b1a2a --- /dev/null +++ b/tauri-plugin-ios-shared-token/build.rs @@ -0,0 +1,8 @@ +const COMMANDS: &[&str] = &["saveToken"]; + +fn main() { + tauri_plugin::Builder::new(COMMANDS) + .android_path("android") + .ios_path("ios") + .build(); +} diff --git a/tauri-plugin-ios-shared-token/bun.lock b/tauri-plugin-ios-shared-token/bun.lock new file mode 100644 index 0000000..0d36f6b --- /dev/null +++ b/tauri-plugin-ios-shared-token/bun.lock @@ -0,0 +1,90 @@ +{ + "lockfileVersion": 1, + "workspaces": { + "": { + "name": "tauri-plugin-ios-shared-token-api", + "dependencies": { + "@tauri-apps/api": ">=2.0.0-beta.6", + }, + "devDependencies": { + "@rollup/plugin-typescript": "^11.1.6", + "rollup": "^4.9.6", + "tslib": "^2.6.2", + "typescript": "^5.3.3", + }, + }, + }, + "packages": { + "@rollup/plugin-typescript": ["@rollup/plugin-typescript@11.1.6", "", { "dependencies": { "@rollup/pluginutils": "^5.1.0", "resolve": "^1.22.1" }, "peerDependencies": { "rollup": "^2.14.0||^3.0.0||^4.0.0", "tslib": "*", "typescript": ">=3.7.0" }, "optionalPeers": ["rollup", "tslib"] }, "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA=="], + + "@rollup/pluginutils": ["@rollup/pluginutils@5.1.4", "", { "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", "picomatch": "^4.0.2" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" }, "optionalPeers": ["rollup"] }, "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ=="], + + "@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.40.1", "", { "os": "android", "cpu": "arm" }, "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw=="], + + "@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.40.1", "", { "os": "android", "cpu": "arm64" }, "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw=="], + + "@rollup/rollup-darwin-arm64": ["@rollup/rollup-darwin-arm64@4.40.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA=="], + + "@rollup/rollup-darwin-x64": ["@rollup/rollup-darwin-x64@4.40.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw=="], + + "@rollup/rollup-freebsd-arm64": ["@rollup/rollup-freebsd-arm64@4.40.1", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw=="], + + "@rollup/rollup-freebsd-x64": ["@rollup/rollup-freebsd-x64@4.40.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q=="], + + "@rollup/rollup-linux-arm-gnueabihf": ["@rollup/rollup-linux-arm-gnueabihf@4.40.1", "", { "os": "linux", "cpu": "arm" }, "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg=="], + + "@rollup/rollup-linux-arm-musleabihf": ["@rollup/rollup-linux-arm-musleabihf@4.40.1", "", { "os": "linux", "cpu": "arm" }, "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg=="], + + "@rollup/rollup-linux-arm64-gnu": ["@rollup/rollup-linux-arm64-gnu@4.40.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg=="], + + "@rollup/rollup-linux-arm64-musl": ["@rollup/rollup-linux-arm64-musl@4.40.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ=="], + + "@rollup/rollup-linux-loongarch64-gnu": ["@rollup/rollup-linux-loongarch64-gnu@4.40.1", "", { "os": "linux", "cpu": "none" }, "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ=="], + + "@rollup/rollup-linux-powerpc64le-gnu": ["@rollup/rollup-linux-powerpc64le-gnu@4.40.1", "", { "os": "linux", "cpu": "ppc64" }, "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg=="], + + "@rollup/rollup-linux-riscv64-gnu": ["@rollup/rollup-linux-riscv64-gnu@4.40.1", "", { "os": "linux", "cpu": "none" }, "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ=="], + + "@rollup/rollup-linux-riscv64-musl": ["@rollup/rollup-linux-riscv64-musl@4.40.1", "", { "os": "linux", "cpu": "none" }, "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA=="], + + "@rollup/rollup-linux-s390x-gnu": ["@rollup/rollup-linux-s390x-gnu@4.40.1", "", { "os": "linux", "cpu": "s390x" }, "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg=="], + + "@rollup/rollup-linux-x64-gnu": ["@rollup/rollup-linux-x64-gnu@4.40.1", "", { "os": "linux", "cpu": "x64" }, "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ=="], + + "@rollup/rollup-linux-x64-musl": ["@rollup/rollup-linux-x64-musl@4.40.1", "", { "os": "linux", "cpu": "x64" }, "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ=="], + + "@rollup/rollup-win32-arm64-msvc": ["@rollup/rollup-win32-arm64-msvc@4.40.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg=="], + + "@rollup/rollup-win32-ia32-msvc": ["@rollup/rollup-win32-ia32-msvc@4.40.1", "", { "os": "win32", "cpu": "ia32" }, "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA=="], + + "@rollup/rollup-win32-x64-msvc": ["@rollup/rollup-win32-x64-msvc@4.40.1", "", { "os": "win32", "cpu": "x64" }, "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA=="], + + "@tauri-apps/api": ["@tauri-apps/api@2.5.0", "", {}, "sha512-Ldux4ip+HGAcPUmuLT8EIkk6yafl5vK0P0c0byzAKzxJh7vxelVtdPONjfgTm96PbN24yjZNESY8CKo8qniluA=="], + + "@types/estree": ["@types/estree@1.0.7", "", {}, "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="], + + "estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="], + + "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], + + "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], + + "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="], + + "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], + + "path-parse": ["path-parse@1.0.7", "", {}, "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="], + + "picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="], + + "resolve": ["resolve@1.22.10", "", { "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w=="], + + "rollup": ["rollup@4.40.1", "", { "dependencies": { "@types/estree": "1.0.7" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.40.1", "@rollup/rollup-android-arm64": "4.40.1", "@rollup/rollup-darwin-arm64": "4.40.1", "@rollup/rollup-darwin-x64": "4.40.1", "@rollup/rollup-freebsd-arm64": "4.40.1", "@rollup/rollup-freebsd-x64": "4.40.1", "@rollup/rollup-linux-arm-gnueabihf": "4.40.1", "@rollup/rollup-linux-arm-musleabihf": "4.40.1", "@rollup/rollup-linux-arm64-gnu": "4.40.1", "@rollup/rollup-linux-arm64-musl": "4.40.1", "@rollup/rollup-linux-loongarch64-gnu": "4.40.1", "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1", "@rollup/rollup-linux-riscv64-gnu": "4.40.1", "@rollup/rollup-linux-riscv64-musl": "4.40.1", "@rollup/rollup-linux-s390x-gnu": "4.40.1", "@rollup/rollup-linux-x64-gnu": "4.40.1", "@rollup/rollup-linux-x64-musl": "4.40.1", "@rollup/rollup-win32-arm64-msvc": "4.40.1", "@rollup/rollup-win32-ia32-msvc": "4.40.1", "@rollup/rollup-win32-x64-msvc": "4.40.1", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw=="], + + "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], + + "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], + + "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="], + } +} diff --git a/tauri-plugin-ios-shared-token/guest-js/index.ts b/tauri-plugin-ios-shared-token/guest-js/index.ts new file mode 100644 index 0000000..1860ee4 --- /dev/null +++ b/tauri-plugin-ios-shared-token/guest-js/index.ts @@ -0,0 +1,12 @@ +import { invoke } from "@tauri-apps/api/core"; + +export async function saveToken(token: string) { + return await invoke<{ token?: string }>( + "plugin:ios-shared-token|saveToken", + { + payload: { + token, + }, + }, + ); +} diff --git a/tauri-plugin-ios-shared-token/ios/.gitignore b/tauri-plugin-ios-shared-token/ios/.gitignore new file mode 100644 index 0000000..5922fda --- /dev/null +++ b/tauri-plugin-ios-shared-token/ios/.gitignore @@ -0,0 +1,10 @@ +.DS_Store +/.build +/Packages +/*.xcodeproj +xcuserdata/ +DerivedData/ +.swiftpm/config/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc +Package.resolved diff --git a/tauri-plugin-ios-shared-token/ios/Package.swift b/tauri-plugin-ios-shared-token/ios/Package.swift new file mode 100644 index 0000000..4c491f6 --- /dev/null +++ b/tauri-plugin-ios-shared-token/ios/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "tauri-plugin-ios-shared-token", + platforms: [ + .macOS(.v10_13), + .iOS(.v13), + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "tauri-plugin-ios-shared-token", + type: .static, + targets: ["tauri-plugin-ios-shared-token"]), + ], + dependencies: [ + .package(name: "Tauri", path: "../.tauri/tauri-api") + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "tauri-plugin-ios-shared-token", + dependencies: [ + .byName(name: "Tauri") + ], + path: "Sources") + ] +) diff --git a/tauri-plugin-ios-shared-token/ios/README.md b/tauri-plugin-ios-shared-token/ios/README.md new file mode 100644 index 0000000..35c5ef2 --- /dev/null +++ b/tauri-plugin-ios-shared-token/ios/README.md @@ -0,0 +1,3 @@ +# Tauri Plugin ios-shared-token + +A description of this package. diff --git a/tauri-plugin-ios-shared-token/ios/Sources/SharedToken.swift b/tauri-plugin-ios-shared-token/ios/Sources/SharedToken.swift new file mode 100644 index 0000000..768e1db --- /dev/null +++ b/tauri-plugin-ios-shared-token/ios/Sources/SharedToken.swift @@ -0,0 +1,34 @@ +import SwiftRs +import Tauri +import UIKit +import WebKit + +class SaveTokenArgs: Decodable { + var token: String? +} + +let appGroupID = "group.com.haystack.com" +let sharedTokenKey = "sharedAuthToken" + +class SharedToken: Plugin { + @objc func saveToken(_ invoke: Invoke) throws { + guard let args = try? invoke.parseArgs(SaveTokenArgs.self), let token = args.token else { + invoke.reject("Missing token argument") + return + } + + // Access shared UserDefaults + guard let sharedDefaults = UserDefaults(suiteName: appGroupID) else { + invoke.reject("Could not access shared UserDefaults. Check App Group configuration.") + return + } + + sharedDefaults.set(token, forKey: sharedTokenKey) + invoke.resolve() + } +} + +@_cdecl("init_plugin_ios_shared_token") +func initPlugin() -> Plugin { + return SharedToken() +} diff --git a/tauri-plugin-ios-shared-token/ios/Tests/PluginTests/PluginTests.swift b/tauri-plugin-ios-shared-token/ios/Tests/PluginTests/PluginTests.swift new file mode 100644 index 0000000..4f8e9ac --- /dev/null +++ b/tauri-plugin-ios-shared-token/ios/Tests/PluginTests/PluginTests.swift @@ -0,0 +1,8 @@ +import XCTest +@testable import ExamplePlugin + +final class ExamplePluginTests: XCTestCase { + func testExample() throws { + let plugin = ExamplePlugin() + } +} diff --git a/tauri-plugin-ios-shared-token/package.json b/tauri-plugin-ios-shared-token/package.json new file mode 100644 index 0000000..eb41d07 --- /dev/null +++ b/tauri-plugin-ios-shared-token/package.json @@ -0,0 +1,33 @@ +{ + "name": "tauri-plugin-ios-shared-token-api", + "version": "0.1.0", + "author": "You", + "description": "", + "type": "module", + "types": "./dist-js/index.d.ts", + "main": "./dist-js/index.cjs", + "module": "./dist-js/index.js", + "exports": { + "types": "./dist-js/index.d.ts", + "import": "./dist-js/index.js", + "require": "./dist-js/index.cjs" + }, + "files": [ + "dist-js", + "README.md" + ], + "scripts": { + "build": "rollup -c", + "prepublishOnly": "pnpm build", + "pretest": "pnpm build" + }, + "dependencies": { + "@tauri-apps/api": ">=2.0.0-beta.6" + }, + "devDependencies": { + "@rollup/plugin-typescript": "^11.1.6", + "rollup": "^4.9.6", + "typescript": "^5.3.3", + "tslib": "^2.6.2" + } +} diff --git a/tauri-plugin-ios-shared-token/permissions/autogenerated/commands/saveToken.toml b/tauri-plugin-ios-shared-token/permissions/autogenerated/commands/saveToken.toml new file mode 100644 index 0000000..488bd1c --- /dev/null +++ b/tauri-plugin-ios-shared-token/permissions/autogenerated/commands/saveToken.toml @@ -0,0 +1,13 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-saveToken" +description = "Enables the saveToken command without any pre-configured scope." +commands.allow = ["saveToken"] + +[[permission]] +identifier = "deny-saveToken" +description = "Denies the saveToken command without any pre-configured scope." +commands.deny = ["saveToken"] diff --git a/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md b/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md new file mode 100644 index 0000000..bb9ac5e --- /dev/null +++ b/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md @@ -0,0 +1,36 @@ + +## Permission Table + + + + + + + + + + + + + + + + + +
IdentifierDescription
+ +`ios-shared-token:allow-saveToken` + + + +Enables the saveToken command without any pre-configured scope. + +
+ +`ios-shared-token:deny-saveToken` + + + +Denies the saveToken command without any pre-configured scope. + +
diff --git a/tauri-plugin-ios-shared-token/permissions/default.toml b/tauri-plugin-ios-shared-token/permissions/default.toml new file mode 100644 index 0000000..1d56122 --- /dev/null +++ b/tauri-plugin-ios-shared-token/permissions/default.toml @@ -0,0 +1,3 @@ +[default] +description = "Default permissions for the plugin" +permissions = ["saveToken"] diff --git a/tauri-plugin-ios-shared-token/permissions/schemas/schema.json b/tauri-plugin-ios-shared-token/permissions/schemas/schema.json new file mode 100644 index 0000000..868c220 --- /dev/null +++ b/tauri-plugin-ios-shared-token/permissions/schemas/schema.json @@ -0,0 +1,312 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "PermissionFile", + "description": "Permission file that can define a default permission, a set of permissions or a list of inlined permissions.", + "type": "object", + "properties": { + "default": { + "description": "The default permission set for the plugin", + "anyOf": [ + { + "$ref": "#/definitions/DefaultPermission" + }, + { + "type": "null" + } + ] + }, + "set": { + "description": "A list of permissions sets defined", + "type": "array", + "items": { + "$ref": "#/definitions/PermissionSet" + } + }, + "permission": { + "description": "A list of inlined permissions", + "default": [], + "type": "array", + "items": { + "$ref": "#/definitions/Permission" + } + } + }, + "definitions": { + "DefaultPermission": { + "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.", + "type": "object", + "required": [ + "permissions" + ], + "properties": { + "version": { + "description": "The version of the permission.", + "type": [ + "integer", + "null" + ], + "format": "uint64", + "minimum": 1.0 + }, + "description": { + "description": "Human-readable description of what the permission does. Tauri convention is to use `

` headings in markdown content for Tauri documentation generation purposes.", + "type": [ + "string", + "null" + ] + }, + "permissions": { + "description": "All permissions this set contains.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "PermissionSet": { + "description": "A set of direct permissions grouped together under a new name.", + "type": "object", + "required": [ + "description", + "identifier", + "permissions" + ], + "properties": { + "identifier": { + "description": "A unique identifier for the permission.", + "type": "string" + }, + "description": { + "description": "Human-readable description of what the permission does.", + "type": "string" + }, + "permissions": { + "description": "All permissions this set contains.", + "type": "array", + "items": { + "$ref": "#/definitions/PermissionKind" + } + } + } + }, + "Permission": { + "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.", + "type": "object", + "required": [ + "identifier" + ], + "properties": { + "version": { + "description": "The version of the permission.", + "type": [ + "integer", + "null" + ], + "format": "uint64", + "minimum": 1.0 + }, + "identifier": { + "description": "A unique identifier for the permission.", + "type": "string" + }, + "description": { + "description": "Human-readable description of what the permission does. Tauri internal convention is to use `

` headings in markdown content for Tauri documentation generation purposes.", + "type": [ + "string", + "null" + ] + }, + "commands": { + "description": "Allowed or denied commands when using this permission.", + "default": { + "allow": [], + "deny": [] + }, + "allOf": [ + { + "$ref": "#/definitions/Commands" + } + ] + }, + "scope": { + "description": "Allowed or denied scoped when using this permission.", + "allOf": [ + { + "$ref": "#/definitions/Scopes" + } + ] + }, + "platforms": { + "description": "Target platforms this permission applies. By default all platforms are affected by this permission.", + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/definitions/Target" + } + } + } + }, + "Commands": { + "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.", + "type": "object", + "properties": { + "allow": { + "description": "Allowed command.", + "default": [], + "type": "array", + "items": { + "type": "string" + } + }, + "deny": { + "description": "Denied command, which takes priority.", + "default": [], + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "Scopes": { + "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```", + "type": "object", + "properties": { + "allow": { + "description": "Data that defines what is allowed by the scope.", + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/definitions/Value" + } + }, + "deny": { + "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.", + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/definitions/Value" + } + } + } + }, + "Value": { + "description": "All supported ACL values.", + "anyOf": [ + { + "description": "Represents a null JSON value.", + "type": "null" + }, + { + "description": "Represents a [`bool`].", + "type": "boolean" + }, + { + "description": "Represents a valid ACL [`Number`].", + "allOf": [ + { + "$ref": "#/definitions/Number" + } + ] + }, + { + "description": "Represents a [`String`].", + "type": "string" + }, + { + "description": "Represents a list of other [`Value`]s.", + "type": "array", + "items": { + "$ref": "#/definitions/Value" + } + }, + { + "description": "Represents a map of [`String`] keys to [`Value`]s.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/Value" + } + } + ] + }, + "Number": { + "description": "A valid ACL number.", + "anyOf": [ + { + "description": "Represents an [`i64`].", + "type": "integer", + "format": "int64" + }, + { + "description": "Represents a [`f64`].", + "type": "number", + "format": "double" + } + ] + }, + "Target": { + "description": "Platform target.", + "oneOf": [ + { + "description": "MacOS.", + "type": "string", + "enum": [ + "macOS" + ] + }, + { + "description": "Windows.", + "type": "string", + "enum": [ + "windows" + ] + }, + { + "description": "Linux.", + "type": "string", + "enum": [ + "linux" + ] + }, + { + "description": "Android.", + "type": "string", + "enum": [ + "android" + ] + }, + { + "description": "iOS.", + "type": "string", + "enum": [ + "iOS" + ] + } + ] + }, + "PermissionKind": { + "type": "string", + "oneOf": [ + { + "description": "Enables the saveToken command without any pre-configured scope.", + "type": "string", + "const": "allow-saveToken", + "markdownDescription": "Enables the saveToken command without any pre-configured scope." + }, + { + "description": "Denies the saveToken command without any pre-configured scope.", + "type": "string", + "const": "deny-saveToken", + "markdownDescription": "Denies the saveToken command without any pre-configured scope." + } + ] + } + } +} \ No newline at end of file diff --git a/tauri-plugin-ios-shared-token/rollup.config.js b/tauri-plugin-ios-shared-token/rollup.config.js new file mode 100644 index 0000000..d834363 --- /dev/null +++ b/tauri-plugin-ios-shared-token/rollup.config.js @@ -0,0 +1,31 @@ +import { readFileSync } from 'fs' +import { join } from 'path' +import { cwd } from 'process' +import typescript from '@rollup/plugin-typescript' + +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'), 'utf8')) + +export default { + input: 'guest-js/index.ts', + output: [ + { + file: pkg.exports.import, + format: 'esm' + }, + { + file: pkg.exports.require, + format: 'cjs' + } + ], + plugins: [ + typescript({ + declaration: true, + declarationDir: `./${pkg.exports.import.split('/')[0]}` + }) + ], + external: [ + /^@tauri-apps\/api/, + ...Object.keys(pkg.dependencies || {}), + ...Object.keys(pkg.peerDependencies || {}) + ] +} diff --git a/tauri-plugin-ios-shared-token/src/commands.rs b/tauri-plugin-ios-shared-token/src/commands.rs new file mode 100644 index 0000000..039f56b --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/commands.rs @@ -0,0 +1,13 @@ +use tauri::{AppHandle, command, Runtime}; + +use crate::models::*; +use crate::Result; +use crate::IosSharedTokenExt; + +#[command] +pub(crate) async fn ping( + app: AppHandle, + payload: PingRequest, +) -> Result { + app.ios_shared_token().ping(payload) +} diff --git a/tauri-plugin-ios-shared-token/src/desktop.rs b/tauri-plugin-ios-shared-token/src/desktop.rs new file mode 100644 index 0000000..2e320a0 --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/desktop.rs @@ -0,0 +1,22 @@ +use serde::de::DeserializeOwned; +use tauri::{plugin::PluginApi, AppHandle, Runtime}; + +use crate::models::*; + +pub fn init( + app: &AppHandle, + _api: PluginApi, +) -> crate::Result> { + Ok(IosSharedToken(app.clone())) +} + +/// Access to the ios-shared-token APIs. +pub struct IosSharedToken(AppHandle); + +impl IosSharedToken { + pub fn ping(&self, payload: PingRequest) -> crate::Result { + Ok(PingResponse { + value: payload.value, + }) + } +} diff --git a/tauri-plugin-ios-shared-token/src/error.rs b/tauri-plugin-ios-shared-token/src/error.rs new file mode 100644 index 0000000..895220d --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/error.rs @@ -0,0 +1,21 @@ +use serde::{ser::Serializer, Serialize}; + +pub type Result = std::result::Result; + +#[derive(Debug, thiserror::Error)] +pub enum Error { + #[error(transparent)] + Io(#[from] std::io::Error), + #[cfg(mobile)] + #[error(transparent)] + PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError), +} + +impl Serialize for Error { + fn serialize(&self, serializer: S) -> std::result::Result + where + S: Serializer, + { + serializer.serialize_str(self.to_string().as_ref()) + } +} diff --git a/tauri-plugin-ios-shared-token/src/lib.rs b/tauri-plugin-ios-shared-token/src/lib.rs new file mode 100644 index 0000000..b0f0c40 --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/lib.rs @@ -0,0 +1,48 @@ +use tauri::{ + plugin::{Builder, TauriPlugin}, + Manager, Runtime, +}; + +pub use models::*; + +#[cfg(desktop)] +mod desktop; +#[cfg(mobile)] +mod mobile; + +mod commands; +mod error; +mod models; + +pub use error::{Error, Result}; + +#[cfg(desktop)] +use desktop::IosSharedToken; +#[cfg(mobile)] +use mobile::IosSharedToken; + +/// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the ios-shared-token APIs. +pub trait IosSharedTokenExt { + fn ios_shared_token(&self) -> &IosSharedToken; +} + +impl> crate::IosSharedTokenExt for T { + fn ios_shared_token(&self) -> &IosSharedToken { + self.state::>().inner() + } +} + +/// Initializes the plugin. +pub fn init() -> TauriPlugin { + Builder::new("ios-shared-token") + .invoke_handler(tauri::generate_handler![commands::ping]) + .setup(|app, api| { + #[cfg(mobile)] + let ios_shared_token = mobile::init(app, api)?; + #[cfg(desktop)] + let ios_shared_token = desktop::init(app, api)?; + app.manage(ios_shared_token); + Ok(()) + }) + .build() +} diff --git a/tauri-plugin-ios-shared-token/src/mobile.rs b/tauri-plugin-ios-shared-token/src/mobile.rs new file mode 100644 index 0000000..505005c --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/mobile.rs @@ -0,0 +1,34 @@ +use serde::de::DeserializeOwned; +use tauri::{ + plugin::{PluginApi, PluginHandle}, + AppHandle, Runtime, +}; + +use crate::models::*; + +#[cfg(target_os = "ios")] +tauri::ios_plugin_binding!(init_plugin_ios_shared_token); + +// initializes the Kotlin or Swift plugin classes +pub fn init( + _app: &AppHandle, + api: PluginApi, +) -> crate::Result> { + #[cfg(target_os = "android")] + let handle = api.register_android_plugin("", "ExamplePlugin")?; + #[cfg(target_os = "ios")] + let handle = api.register_ios_plugin(init_plugin_ios_shared_token)?; + Ok(IosSharedToken(handle)) +} + +/// Access to the ios-shared-token APIs. +pub struct IosSharedToken(PluginHandle); + +impl IosSharedToken { + pub fn ping(&self, payload: PingRequest) -> crate::Result { + self + .0 + .run_mobile_plugin("ping", payload) + .map_err(Into::into) + } +} diff --git a/tauri-plugin-ios-shared-token/src/models.rs b/tauri-plugin-ios-shared-token/src/models.rs new file mode 100644 index 0000000..1b53e9e --- /dev/null +++ b/tauri-plugin-ios-shared-token/src/models.rs @@ -0,0 +1,13 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Deserialize, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct PingRequest { + pub value: Option, +} + +#[derive(Debug, Clone, Default, Deserialize, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct PingResponse { + pub value: Option, +} diff --git a/tauri-plugin-ios-shared-token/tsconfig.json b/tauri-plugin-ios-shared-token/tsconfig.json new file mode 100644 index 0000000..0591122 --- /dev/null +++ b/tauri-plugin-ios-shared-token/tsconfig.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "target": "es2021", + "module": "esnext", + "moduleResolution": "bundler", + "skipLibCheck": true, + "strict": true, + "noUnusedLocals": true, + "noImplicitAny": true, + "noEmit": true + }, + "include": ["guest-js/*.ts"], + "exclude": ["dist-js", "node_modules"] +} diff --git a/tauri-plugin-sharetarget b/tauri-plugin-sharetarget index a280fc5..c0d8712 160000 --- a/tauri-plugin-sharetarget +++ b/tauri-plugin-sharetarget @@ -1 +1 @@ -Subproject commit a280fc5ac4db20c63fab0ed1657a1300563aacef +Subproject commit c0d871280be2922f940d8dc41cc85eeaab6f2ad9