From 37f584021469061e37794e5616a2e620d5bccbd6 Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Mon, 15 Apr 2024 01:07:36 -0700
Subject: [PATCH] update genkeypair

---
 .../modules/blueskyoauthclient/CryptoUtil.kt  | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/expo-bluesky-oauth-client/android/src/main/java/expo/modules/blueskyoauthclient/CryptoUtil.kt b/modules/expo-bluesky-oauth-client/android/src/main/java/expo/modules/blueskyoauthclient/CryptoUtil.kt
index 2abce43009..1c8ea0eaa5 100644
--- a/modules/expo-bluesky-oauth-client/android/src/main/java/expo/modules/blueskyoauthclient/CryptoUtil.kt
+++ b/modules/expo-bluesky-oauth-client/android/src/main/java/expo/modules/blueskyoauthclient/CryptoUtil.kt
@@ -22,8 +22,8 @@ class CryptoUtil {
     return random
   }
 
-  fun generateKeyPair(keyId: String?): Pair<String, String> {
-    val keyIdString = keyId ?: UUID.randomUUID().toString()
+  fun generateKeyPair(): Any {
+    val keyIdString = UUID.randomUUID().toString()
 
     val keyPairGen = KeyPairGenerator.getInstance("EC")
     keyPairGen.initialize(Curve.P_256.toECParameterSpec())
@@ -44,9 +44,26 @@ class CryptoUtil {
       .algorithm(Algorithm.parse("ES256"))
       .build()
 
-    return Pair(
-      publicJwk.toString(),
-      privateJwk.toString()
+
+    return JWKPair(
+      JWK(
+        alg = privateJwk.algorithm.toString(),
+        kty = privateJwk.keyType.toString(),
+        crv = privateJwk.curve.toString(),
+        x = privateJwk.x.toString(),
+        y = privateJwk.y.toString(),
+        use = privateJwk.keyUse.toString(),
+        kid = privateJwk.keyID
+      ),
+      JWK(
+        alg = publicJwk.algorithm.toString(),
+        kty = publicJwk.keyType.toString(),
+        crv = publicJwk.curve.toString(),
+        x = publicJwk.x.toString(),
+        y = publicJwk.y.toString(),
+        use = publicJwk.keyUse.toString(),
+        kid = publicJwk.keyID
+      )
     )
   }
 }