feat(e2ei)!: introduce handle & team in the client dpop token

crypto-ffi/bindings/js/CoreCrypto.ts

@@ -1700,10 +1700,11 @@ export class CoreCrypto {
      * @param handle - user handle e.g. `[email protected]`
      * @param expiryDays - generated x509 certificate expiry
      * @param ciphersuite - for generating signing key material
+     * @param team - name of the Wire team a user belongs to
      * @returns The new {@link E2eiEnrollment} enrollment instance to use with {@link CoreCrypto.e2eiMlsInitOnly}
      */
-    async e2eiNewEnrollment(clientId: string, displayName: string, handle: string, expiryDays: number, ciphersuite: Ciphersuite): Promise<E2eiEnrollment> {
-        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_enrollment(clientId, displayName, handle, expiryDays, ciphersuite));
+    async e2eiNewEnrollment(clientId: string, displayName: string, handle: string, expiryDays: number, ciphersuite: Ciphersuite, team?: string): Promise<E2eiEnrollment> {
+        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_enrollment(clientId, displayName, handle, team, expiryDays, ciphersuite));
         return new E2eiEnrollment(e2ei);
     }
 
@@ -1716,10 +1717,11 @@ export class CoreCrypto {
      * @param handle - user handle e.g. `[email protected]`
      * @param expiryDays - generated x509 certificate expiry
      * @param ciphersuite - for generating signing key material
+     * @param team - name of the Wire team a user belongs to
      * @returns The new {@link E2eiEnrollment} enrollment instance to use with {@link CoreCrypto.e2eiRotateAll}
      */
-    async e2eiNewActivationEnrollment(clientId: string, displayName: string, handle: string, expiryDays: number, ciphersuite: Ciphersuite): Promise<E2eiEnrollment> {
-        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_activation_enrollment(clientId, displayName, handle, expiryDays, ciphersuite));
+    async e2eiNewActivationEnrollment(clientId: string, displayName: string, handle: string, expiryDays: number, ciphersuite: Ciphersuite, team?: string): Promise<E2eiEnrollment> {
+        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_activation_enrollment(clientId, displayName, handle, team, expiryDays, ciphersuite));
         return new E2eiEnrollment(e2ei);
     }
 
@@ -1734,10 +1736,11 @@ export class CoreCrypto {
      * @param ciphersuite - for generating signing key material
      * @param displayName - human-readable name displayed in the application e.g. `Smith, Alice M (QA)`
      * @param handle - user handle e.g. `[email protected]`
+     * @param team - name of the Wire team a user belongs to
      * @returns The new {@link E2eiEnrollment} enrollment instance to use with {@link CoreCrypto.e2eiRotateAll}
      */
-    async e2eiNewRotateEnrollment(clientId: string, expiryDays: number, ciphersuite: Ciphersuite, displayName?: string, handle?: string,): Promise<E2eiEnrollment> {
-        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_rotate_enrollment(clientId, displayName, handle, expiryDays, ciphersuite));
+    async e2eiNewRotateEnrollment(clientId: string, expiryDays: number, ciphersuite: Ciphersuite, displayName?: string, handle?: string, team?: string): Promise<E2eiEnrollment> {
+        const e2ei = await CoreCryptoError.asyncMapErr(this.#cc.e2ei_new_rotate_enrollment(clientId, displayName, handle, team, expiryDays, ciphersuite));
         return new E2eiEnrollment(e2ei);
     }
 

crypto-ffi/bindings/jvm/src/main/kotlin/com/wire/crypto/client/CoreCryptoCentral.kt

@@ -61,6 +61,7 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
      * @param handle user handle e.g. `[email protected]`
      * @param expiryDays generated x509 certificate expiry
      * @param ciphersuite for generating signing key material
+     * @param team name of the Wire team a user belongs to
      * @return The new [E2EIEnrollment] enrollment to use with [e2eiMlsInitOnly]
      */
     suspend fun e2eiNewEnrollment(
@@ -69,8 +70,9 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
         handle: String,
         expiryDays: UInt,
         ciphersuite: Ciphersuite,
+        team: String? = null,
     ): E2EIEnrollment {
-        return E2EIEnrollment(cc.e2eiNewEnrollment(clientId, displayName, handle, expiryDays, ciphersuite.lower()))
+        return E2EIEnrollment(cc.e2eiNewEnrollment(clientId, displayName, handle, team, expiryDays, ciphersuite.lower()))
     }
 
     /**
@@ -82,6 +84,7 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
      * @param handle user handle e.g. `[email protected]`
      * @param expiryDays generated x509 certificate expiry
      * @param ciphersuite for generating signing key material
+     * @param team name of the Wire team a user belongs to
      * @return The new [E2EIEnrollment] enrollment to use with [e2eiRotateAll]
      */
     suspend fun e2eiNewActivationEnrollment(
@@ -90,12 +93,14 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
         handle: String,
         expiryDays: UInt,
         ciphersuite: Ciphersuite,
+        team: String? = null,
     ): E2EIEnrollment {
         return E2EIEnrollment(
             cc.e2eiNewActivationEnrollment(
                 clientId,
                 displayName,
                 handle,
+                team,
                 expiryDays,
                 ciphersuite.lower()
             )
@@ -112,6 +117,7 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
      * @param ciphersuite for generating signing key material
      * @param displayName human-readable name displayed in the application e.g. `Smith, Alice M (QA)`
      * @param handle user handle e.g. `[email protected]`
+     * @param team name of the Wire team a user belongs to
      * @return The new [E2EIEnrollment] enrollment to use with [e2eiRotateAll]
      */
     suspend fun e2eiNewRotateEnrollment(
@@ -120,12 +126,14 @@ class CoreCryptoCentral private constructor(private val cc: CoreCrypto, private
         ciphersuite: Ciphersuite,
         displayName: String? = null,
         handle: String? = null,
+        team: String? = null,
     ): E2EIEnrollment {
         return E2EIEnrollment(
             cc.e2eiNewRotateEnrollment(
                 clientId,
                 displayName,
                 handle,
+                team,
                 expiryDays,
                 ciphersuite.lower()
             )

crypto-ffi/bindings/swift/Sources/CoreCrypto/CoreCrypto.swift

@@ -1154,9 +1154,10 @@ public class CoreCryptoWrapper {
     /// - parameter handle: user handle e.g. `[email protected]`
     /// - parameter expiryDays: generated x509 certificate expiry
     /// - parameter ciphersuite: For generating signing key material.
+    /// - parameter team: name of the Wire team a user belongs to
     /// - returns: The new ``CoreCryptoSwift.WireE2eIdentity`` object
-    public func e2eiNewEnrollment(clientId: String, displayName: String, handle: String, expiryDays: UInt32, ciphersuite: UInt16) async throws -> E2eiEnrollment {
-        let enrollment = try await self.coreCrypto.e2eiNewEnrollment(clientId: clientId, displayName: displayName, handle: handle, expiryDays: expiryDays, ciphersuite: ciphersuite)
+    public func e2eiNewEnrollment(clientId: String, displayName: String, handle: String, expiryDays: UInt32, ciphersuite: UInt16, handle: String? = nil) async throws -> E2eiEnrollment {
+        let enrollment = try await self.coreCrypto.e2eiNewEnrollment(clientId: clientId, displayName: displayName, handle: handle, team: team, expiryDays: expiryDays, ciphersuite: ciphersuite)
         return E2eiEnrollment(enrollment)
     }
 
@@ -1168,9 +1169,10 @@ public class CoreCryptoWrapper {
     /// - parameter handle: user handle e.g. `[email protected]`
     /// - parameter expiryDays: generated x509 certificate expiry
     /// - parameter ciphersuite: For generating signing key material.
+    /// - parameter team: name of the Wire team a user belongs to
     /// - returns: The new ``CoreCryptoSwift.WireE2eIdentity`` object
-    public func e2eiNewActivationEnrollment(clientId: String, displayName: String, handle: String, expiryDays: UInt32, ciphersuite: UInt16) async throws -> E2eiEnrollment {
-        let enrollment = try await self.coreCrypto.e2eiNewActivationEnrollment(clientId: clientId, displayName: displayName, handle: handle, expiryDays: expiryDays, ciphersuite: ciphersuite)
+    public func e2eiNewActivationEnrollment(clientId: String, displayName: String, handle: String, expiryDays: UInt32, ciphersuite: UInt16, handle: String? = nil) async throws -> E2eiEnrollment {
+        let enrollment = try await self.coreCrypto.e2eiNewActivationEnrollment(clientId: clientId, displayName: displayName, handle: handle, team: team, expiryDays: expiryDays, ciphersuite: ciphersuite)
         return E2eiEnrollment(enrollment)
     }
 
@@ -1183,9 +1185,10 @@ public class CoreCryptoWrapper {
     /// - parameter ciphersuite: For generating signing key material.
     /// - parameter displayName: human readable name displayed in the application e.g. `Smith, Alice M (QA)`
     /// - parameter handle: user handle e.g. `[email protected]`
+    /// - parameter team: name of the Wire team a user belongs to
     /// - returns: The new ``CoreCryptoSwift.WireE2eIdentity`` object
-    public func e2eiNewRotateEnrollment(clientId: String, expiryDays: UInt32, ciphersuite: UInt16, displayName: String? = nil, handle: String? = nil) async throws -> E2eiEnrollment {
-        let enrollment = try await self.coreCrypto.e2eiNewRotateEnrollment(clientId: clientId, expiryDays: expiryDays, ciphersuite: ciphersuite, displayName: displayName, handle: handle)
+    public func e2eiNewRotateEnrollment(clientId: String, expiryDays: UInt32, ciphersuite: UInt16, displayName: String? = nil, handle: String? = nil, team: String? = nil) async throws -> E2eiEnrollment {
+        let enrollment = try await self.coreCrypto.e2eiNewRotateEnrollment(clientId: clientId, expiryDays: expiryDays, ciphersuite: ciphersuite, displayName: displayName, handle: handle, team: team)
         return E2eiEnrollment(enrollment)
     }
 

crypto-ffi/src/generic.rs

@@ -1296,6 +1296,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> CoreCryptoResult<std::sync::Arc<E2eiEnrollment>> {
@@ -1306,6 +1307,7 @@ impl CoreCrypto {
                 client_id.into_bytes().into(),
                 display_name,
                 handle,
+                team,
                 expiry_days,
                 ciphersuite.into(),
             )
@@ -1322,6 +1324,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> CoreCryptoResult<std::sync::Arc<E2eiEnrollment>> {
@@ -1332,6 +1335,7 @@ impl CoreCrypto {
                 client_id.into_bytes().into(),
                 display_name,
                 handle,
+                team,
                 expiry_days,
                 ciphersuite.into(),
             )
@@ -1348,6 +1352,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: Option<String>,
         handle: Option<String>,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> CoreCryptoResult<std::sync::Arc<E2eiEnrollment>> {
@@ -1358,6 +1363,7 @@ impl CoreCrypto {
                 client_id.into_bytes().into(),
                 display_name,
                 handle,
+                team,
                 expiry_days,
                 ciphersuite.into(),
             )

crypto-ffi/src/wasm.rs

@@ -2443,6 +2443,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> Promise {
@@ -2456,6 +2457,7 @@ impl CoreCrypto {
                         client_id.into_bytes().into(),
                         display_name,
                         handle,
+                        team,
                         expiry_days,
                         ciphersuite.into(),
                     )
@@ -2477,6 +2479,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> Promise {
@@ -2490,6 +2493,7 @@ impl CoreCrypto {
                         client_id.into_bytes().into(),
                         display_name,
                         handle,
+                        team,
                         expiry_days,
                         ciphersuite.into(),
                     )
@@ -2511,6 +2515,7 @@ impl CoreCrypto {
         client_id: String,
         display_name: Option<String>,
         handle: Option<String>,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: Ciphersuite,
     ) -> Promise {
@@ -2524,6 +2529,7 @@ impl CoreCrypto {
                         client_id.into_bytes().into(),
                         display_name,
                         handle,
+                        team,
                         expiry_days,
                         ciphersuite.into(),
                     )

crypto/Cargo.toml

@@ -44,7 +44,7 @@ async-trait = "0.1"
 async-lock = "3.0"
 schnellru = "0.2"
 zeroize = "1.5"
-wire-e2e-identity = { version = "0.5", default-features = false }
+wire-e2e-identity = { version = "=0.6.1", default-features = false }
 indexmap = "2"
 x509-cert = "0.2"
 pem = "3.0"
@@ -99,7 +99,7 @@ async-std = { version = "1.12", features = ["attributes"] }
 futures-util = { version = "0.3", features = ["std", "alloc"] }
 proteus-traits = "2.0"
 async-trait = "0.1"
-wire-e2e-identity = { version = "0.5", features = ["identity-builder"] }
+wire-e2e-identity = { version = "=0.6.1", features = ["identity-builder"] }
 fluvio-wasm-timer = "0.2"
 time = { version = "0.3", features = ["wasm-bindgen"] }
 base64 = "0.21"

crypto/src/e2e_identity/identity.rs

@@ -36,7 +36,7 @@ impl<'a> TryFrom<(wire_e2e_identity::prelude::WireIdentity, &'a [u8])> for WireI
         let certificate = document.to_pem("CERTIFICATE", LineEnding::LF)?;
         Ok(Self {
             client_id: i.client_id,
-            handle: i.handle,
+            handle: i.handle.to_string(),
             display_name: i.display_name,
             domain: i.domain,
             certificate,
@@ -123,8 +123,11 @@ pub mod tests {
 
     wasm_bindgen_test_configure!(run_in_browser);
 
+    #[allow(clippy::redundant_static_lifetimes)]
     const ALICE_ANDROID: &'static str = "t6wRpI8BRSeviBwwiFp5MQ:[email protected]";
+    #[allow(clippy::redundant_static_lifetimes)]
     const ALICE_IOS: &'static str = "t6wRpI8BRSeviBwwiFp5MQ:[email protected]";
+    #[allow(clippy::redundant_static_lifetimes)]
     const BOB_ANDROID: &'static str = "wjoxZL5tTzi2-8iND-HimA:[email protected]";
 
     #[async_std::test]

crypto/src/e2e_identity/mod.rs

@@ -36,13 +36,15 @@ impl MlsCentral {
         client_id: ClientId,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         ciphersuite: MlsCiphersuite,
     ) -> E2eIdentityResult<E2eiEnrollment> {
         E2eiEnrollment::try_new(
             client_id,
             display_name,
             handle,
+            team,
             expiry_days,
             &self.mls_backend,
             ciphersuite,
@@ -84,6 +86,7 @@ pub struct E2eiEnrollment {
     client_id: String,
     display_name: String,
     handle: String,
+    team: Option<String>,
     expiry: core::time::Duration,
     directory: Option<types::E2eiAcmeDirectory>,
     account: Option<wire_e2e_identity::prelude::E2eiAcmeAccount>,
@@ -110,10 +113,12 @@ impl E2eiEnrollment {
     /// * `display_name` - human readable name displayed in the application e.g. `Smith, Alice M (QA)`
     /// * `handle` - user handle e.g. `[email protected]`
     /// * `expiry_days` - generated x509 certificate expiry in days
+    #[allow(clippy::too_many_arguments)]
     pub fn try_new(
         client_id: ClientId,
         display_name: String,
         handle: String,
+        team: Option<String>,
         expiry_days: u32,
         backend: &MlsCryptoProvider,
         ciphersuite: MlsCiphersuite,
@@ -134,6 +139,7 @@ impl E2eiEnrollment {
             client_id,
             display_name,
             handle,
+            team,
             expiry,
             directory: None,
             account: None,
@@ -270,7 +276,14 @@ impl E2eiEnrollment {
             .wire_dpop_challenge
             .as_ref()
             .ok_or(E2eIdentityError::ImplementationError)?;
-        Ok(self.new_dpop_token(&self.client_id, dpop_challenge, backend_nonce, expiry)?)
+        Ok(self.new_dpop_token(
+            &self.client_id,
+            dpop_challenge,
+            backend_nonce,
+            self.handle.as_str(),
+            self.team.clone(),
+            expiry,
+        )?)
     }
 
     /// Creates a new challenge request.
@@ -443,6 +456,7 @@ pub mod tests {
                         E2EI_CLIENT_ID.into(),
                         E2EI_DISPLAY_NAME.to_string(),
                         E2EI_HANDLE.to_string(),
+                        Some(TEAM.to_string()),
                         E2EI_EXPIRY,
                         case.ciphersuite(),
                     )