Merge pull request #50 from Web3Auth/feature/PD-2003-add-corekit-flag

Adding coreKitKey and coreKitEd25519PrivKey in Web3AuthResponse.kt

Author: chaitanyapotti

app/src/main/java/com/web3auth/app/MainActivity.kt

@@ -55,6 +55,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         loginCompletableFuture.whenComplete { loginResponse, error ->
             if (error == null) {
                 reRender(loginResponse)
+                println("PrivKey: " + web3Auth.getPrivkey())
+                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
@@ -133,6 +135,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         sessionResponse.whenComplete { loginResponse, error ->
             if (error == null) {
                 reRender(loginResponse)
+                println("PrivKey: " + web3Auth.getPrivkey())
+                println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }

core/src/main/java/com/web3auth/core/Web3Auth.kt

@@ -33,7 +33,21 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
         TESTNET,
 
         @SerializedName("cyan")
-        CYAN
+        CYAN,
+
+        @SerializedName("aqua")
+        AQUA,
+
+        @SerializedName("celeste")
+        CELESTE
+    }
+
+    enum class ChainNamespace {
+        @SerializedName("eip155")
+        EIP155,
+
+        @SerializedName("solana")
+        SOLANA
     }
 
     private val gson = GsonBuilder().disableHtmlEscaping().create()
@@ -136,6 +150,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
             decodeBase64URLString(hash).toString(Charsets.UTF_8),
             Web3AuthResponse::class.java
         )
+
         if (web3AuthResponse.error?.isNotBlank() == true) {
             loginCompletableFuture.completeExceptionally(
                 UnKnownException(
@@ -318,6 +333,24 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
         }
     }
 
+    fun getPrivkey(): String {
+        val privKey: String = if (web3AuthOption.useCoreKitKey == true) {
+            web3AuthResponse.coreKitKey.toString()
+        } else {
+            web3AuthResponse.privKey.toString()
+        }
+        return privKey
+    }
+
+    fun getEd25519PrivKey(): String {
+        val ed25519Key: String = if (web3AuthOption.useCoreKitKey == true) {
+            web3AuthResponse.coreKitEd25519PrivKey.toString()
+        } else {
+            web3AuthResponse.ed25519PrivKey.toString()
+        }
+        return ed25519Key
+    }
+
     fun logout(
         redirectUrl: Uri? = null,
         appState: String? = null

core/src/main/java/com/web3auth/core/keystore/KeyStoreManagerUtils.kt

@@ -36,13 +36,17 @@ object KeyStoreManagerUtils {
     private lateinit var sharedPreferences: EncryptedSharedPreferences
 
     fun initializePreferences(context: Context) {
-        sharedPreferences = EncryptedSharedPreferences.create(
-            "Web3Auth",
-            masterKeyAlias,
-            context,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-        ) as EncryptedSharedPreferences
+        try {
+            sharedPreferences = EncryptedSharedPreferences.create(
+                "Web3Auth",
+                masterKeyAlias,
+                context,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            ) as EncryptedSharedPreferences
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
     }
 
     /**

core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt

@@ -4,12 +4,24 @@ import android.content.Context
 import android.net.Uri
 import com.web3auth.core.Web3Auth
 
-data class Web3AuthOptions (
+data class Web3AuthOptions(
     var context: Context,
     val clientId: String,
     val network: Web3Auth.Network,
     @Transient var redirectUrl: Uri? = null,
-    var sdkUrl: String = "https://sdk.openlogin.com",
+    var sdkUrl: String = getSdkUrl(network),
     val whiteLabel: WhiteLabelData? = null,
     val loginConfig: HashMap<String, LoginConfigItem>? = null,
-)
+    val useCoreKitKey: Boolean? = false,
+    val chainNamespace: Web3Auth.ChainNamespace? = Web3Auth.ChainNamespace.EIP155
+)
+
+fun getSdkUrl(network: Web3Auth.Network): String {
+    var sdkUrl = ""
+    sdkUrl = if (network == Web3Auth.Network.TESTNET) {
+        "https://dev-sdk.openlogin.com"
+    } else {
+        "https://sdk.openlogin.com"
+    }
+    return sdkUrl
+}

core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt

@@ -4,9 +4,11 @@ import androidx.annotation.Keep
 
 @Keep
 data class Web3AuthResponse(
-    val privKey: String? = null,
-    val ed25519PrivKey: String? = null,
+    var privKey: String? = null,
+    var ed25519PrivKey: String? = null,
     val userInfo: UserInfo? = null,
     val error: String? = null,
-    val sessionId: String? = null
+    val sessionId: String? = null,
+    val coreKitKey: String? = null,
+    val coreKitEd25519PrivKey: String? = null
 )