feat: WASM support for atrium-oauth

.github/workflows/wasm.yml

@@ -67,8 +67,9 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-      - run: wasm-pack test --node atrium-api
-      - run: wasm-pack test --node atrium-xrpc
-      - run: wasm-pack test --node atrium-xrpc-client
-      - run: wasm-pack test --node atrium-identity
-      - run: wasm-pack test --node atrium-common
+      - run: wasm-pack test --node atrium-api --lib
+      - run: wasm-pack test --node atrium-xrpc --lib
+      - run: wasm-pack test --node atrium-xrpc-client --lib
+      - run: wasm-pack test --node atrium-identity --lib
+      - run: wasm-pack test --node atrium-common --lib
+      - run: wasm-pack test --node atrium-oauth --lib

Cargo.toml

@@ -55,10 +55,11 @@ unsigned-varint = "0.8"
 
 # Cryptography
 ecdsa = "0.16.9"
-elliptic-curve = "0.13.6"
+elliptic-curve = "0.13.8"
+getrandom = "0.2.15"
 jose-jwa = "0.1.2"
 jose-jwk = { version = "0.1.2", default-features = false }
-k256 = { version = "0.13.3", default-features = false }
+k256 = { version = "0.13.4", default-features = false }
 p256 = { version = "0.13.2", default-features = false }
 rand = "0.8.5"
 sha2 = "0.10.8"

atrium-oauth/Cargo.toml

@@ -39,11 +39,17 @@ trait-variant.workspace = true
 [dev-dependencies]
 atrium-api = { workspace = true, features = ["bluesky"] }
 futures.workspace = true
-hickory-resolver.workspace = true
 p256 = { workspace = true, features = ["pem", "std"] }
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 base64ct.workspace = true
 
 [features]
 default = ["default-client"]
 default-client = ["reqwest/default-tls"]
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { workspace = true, features = ["js"] }
+tokio = { workspace = true, features = ["macros", "rt", "time"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+hickory-resolver.workspace = true
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

atrium-oauth/README.md

@@ -31,38 +31,36 @@ impl DnsTxtResolver for SomeDnsTxtResolver {
     }
 }
 
-fn main() {
-    let http_client = Arc::new(DefaultHttpClient::default());
-    let config = OAuthClientConfig {
-        client_metadata: AtprotoLocalhostClientMetadata {
-            redirect_uris: Some(vec![String::from("http://127.0.0.1/callback")]),
-            scopes: Some(vec![
-                Scope::Known(KnownScope::Atproto),
-                Scope::Known(KnownScope::TransitionGeneric),
-            ]),
-        },
-        keys: None,
-        resolver: OAuthResolverConfig {
-            did_resolver: CommonDidResolver::new(CommonDidResolverConfig {
-                plc_directory_url: DEFAULT_PLC_DIRECTORY_URL.to_string(),
-                http_client: Arc::clone(&http_client),
-            }),
-            handle_resolver: AtprotoHandleResolver::new(AtprotoHandleResolverConfig {
-                dns_txt_resolver: SomeDnsTxtResolver,
-                http_client: Arc::clone(&http_client),
-            }),
-            authorization_server_metadata: Default::default(),
-            protected_resource_metadata: Default::default(),
-        },
-        // A store for saving state data while the user is being redirected to the authorization server.
-        state_store: MemoryStateStore::default(),
-        // A store for saving session data.
-        session_store: MemorySessionStore::default(),
-    };
-    let Ok(client) = OAuthClient::new(config) else {
-        panic!("failed to create oauth client");
-    };
-}
+let http_client = Arc::new(DefaultHttpClient::default());
+let config = OAuthClientConfig {
+    client_metadata: AtprotoLocalhostClientMetadata {
+        redirect_uris: Some(vec![String::from("http://127.0.0.1/callback")]),
+        scopes: Some(vec![
+            Scope::Known(KnownScope::Atproto),
+            Scope::Known(KnownScope::TransitionGeneric),
+        ]),
+    },
+    keys: None,
+    resolver: OAuthResolverConfig {
+        did_resolver: CommonDidResolver::new(CommonDidResolverConfig {
+            plc_directory_url: DEFAULT_PLC_DIRECTORY_URL.to_string(),
+            http_client: Arc::clone(&http_client),
+        }),
+        handle_resolver: AtprotoHandleResolver::new(AtprotoHandleResolverConfig {
+            dns_txt_resolver: SomeDnsTxtResolver,
+            http_client: Arc::clone(&http_client),
+        }),
+        authorization_server_metadata: Default::default(),
+        protected_resource_metadata: Default::default(),
+    },
+    // A store for saving state data while the user is being redirected to the authorization server.
+    state_store: MemoryStateStore::default(),
+    // A store for saving session data.
+    session_store: MemorySessionStore::default(),
+};
+let Ok(client) = OAuthClient::new(config) else {
+    panic!("failed to create oauth client");
+};
 ```
 
 ### Authentication

atrium-oauth/src/oauth_session.rs

@@ -380,9 +380,11 @@ mod tests {
         Agent::new(oauth_session(data, default_store()).await)
     }
 
-    async fn call_service(
-        service: &Service<impl SessionManager + Sync>,
+    async fn call_service<S>(
+        service: &Service<S>,
     ) -> Result<(), atrium_xrpc::Error<atrium_api::com::atproto::server::get_service_auth::Error>>
+    where
+        S: SessionManager + Send + Sync,
     {
         let output = service
             .com