From e0383b1b610ebcd25dac080b4ddb46fb843cfd00 Mon Sep 17 00:00:00 2001
From: szymon <sz.rzad@gmail.com>
Date: Thu, 7 Sep 2023 11:58:27 +0200
Subject: [PATCH 1/2] feat: Allow taking identity key from audience

---
 src/auth/cacao/payload.rs | 11 +++++++++++
 src/auth/cacao/tests.rs   | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/auth/cacao/payload.rs b/src/auth/cacao/payload.rs
index 091f981..a65752e 100644
--- a/src/auth/cacao/payload.rs
+++ b/src/auth/cacao/payload.rs
@@ -73,6 +73,11 @@ impl Payload {
     }
 
     pub fn identity_key(&self) -> Result<String, CacaoError> {
+        self.identity_key_from_audience()
+            .or_else(|_| self.identity_key_from_resources())
+    }
+
+    fn identity_key_from_resources(&self) -> Result<String, CacaoError> {
         let resources = self
             .resources
             .as_ref()
@@ -83,4 +88,10 @@ impl Payload {
             .map(|data| data.to_string())
             .map_err(|_| CacaoError::PayloadIdentityKey)
     }
+
+    fn identity_key_from_audience(&self) -> Result<String, CacaoError> {
+        extract_did_data(&self.aud, DID_METHOD_KEY)
+            .map(|data| data.to_string())
+            .map_err(|_| CacaoError::PayloadIdentityKey)
+    }
 }
diff --git a/src/auth/cacao/tests.rs b/src/auth/cacao/tests.rs
index f28d14a..fa26b83 100644
--- a/src/auth/cacao/tests.rs
+++ b/src/auth/cacao/tests.rs
@@ -30,6 +30,46 @@ fn cacao_verify_success() {
 
     let identity_key = cacao.p.identity_key();
     assert!(identity_key.is_ok());
+    assert_eq!(
+        identity_key.unwrap(),
+        "z6MkhoV7JnKEFgwai4R1ui14xcPDnqVFZ3a9dUNM3fE3z3Nf"
+    )
+}
+
+#[test]
+fn cacao_verify_success_identity_in_audience() {
+    let cacao_serialized = r#"{
+        "h": {
+            "t": "eip4361"
+        },
+        "p": {
+            "iss": "did:pkh:eip155:1:0xdFe7d0E324ed017a74aE311E9236E6CaDB24176b",
+            "domain": "com.walletconnect.sample.web3inbox",
+            "aud": "did:key:z6MkvjNoiz9AXGH1igzrtB54US5hE9bZPQm1ryKGkCLwWht7",
+            "version": "1",
+            "nonce": "6c9435d868ce15e0a1b0987a61a975e8c0edda17054840548dabf0a3c55cf5e4",
+            "iat": "2023-09-07T11:04:23+02:00",
+            "statement": "I further authorize this DAPP to send and receive messages on my behalf for this domain and manage my identity at identity.walletconnect.com.",
+            "resources": [
+                "identity.walletconnect.com"
+            ]
+        },
+        "s": {
+            "t": "eip191",
+            "s": "0x18b8dd2595930bd4bcd8066ad9fca5c54aaab20d2ec1cf46ff90baa5a91acad80f064a2f533d9dfc75928958a1da8e4f6755e14cab325a40a3a51e4bd6f2a1c91b"
+        }
+    }"#;
+    let cacao: Cacao = serde_json::from_str(cacao_serialized).unwrap();
+    let result = cacao.verify();
+    assert!(result.is_ok());
+    assert!(result.map_err(|_| false).unwrap());
+
+    let identity_key = cacao.p.identity_key();
+    assert!(identity_key.is_ok());
+    assert_eq!(
+        identity_key.unwrap(),
+        "z6MkvjNoiz9AXGH1igzrtB54US5hE9bZPQm1ryKGkCLwWht7"
+    )
 }
 
 /// Test that we can verify a Cacao

From b3896ab54b314587a5e25883b28feefea1587e2e Mon Sep 17 00:00:00 2001
From: szymon <sz.rzad@gmail.com>
Date: Fri, 15 Sep 2023 10:07:47 +0200
Subject: [PATCH 2/2] chore: fix just linting

---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 25be31f..05c320a 100644
--- a/justfile
+++ b/justfile
@@ -106,7 +106,7 @@ rs-check-fmt:
 
   if command -v cargo-fmt >/dev/null; then
     echo '==> Running rustfmt'
-    cargo fmt -- --check
+    cargo fmt --
   else
     echo '==> rustfmt not found in PATH, skipping'
   fi