feat: Rename SingleFactorAuthArgs to SFAParams

Signed-off-by: Gaurav Goel <[email protected]>
Web3Auth · Sep 2, 2024 · f8d8695 · f8d8695
1 parent 5ebe8cf
commit f8d8695
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 28 deletions.
diff --git a/app/src/main/java/com/web3auth/sfaexample/MainActivity.kt b/app/src/main/java/com/web3auth/sfaexample/MainActivity.kt
@@ -6,15 +6,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.web3auth.singlefactorauth.SingleFactorAuth
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var btnTorusKey: Button
     private lateinit var tv: TextView
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     var TEST_VERIFIER = "torus-test-health"
     var TORUS_TEST_EMAIL = "[email protected]"
@@ -31,7 +31,7 @@ class MainActivity : AppCompatActivity() {
         }
         val idToken = JwtUtils.generateIdToken(TORUS_TEST_EMAIL)
         sfaParams =
-            SingleFactorAuthArgs(Web3AuthNetwork.SAPPHIRE_MAINNET, "YOUR_CLIENT_ID", null,0)
+            SFAParams(Web3AuthNetwork.SAPPHIRE_MAINNET, "YOUR_CLIENT_ID", null, 0)
         singleFactorAuth = SingleFactorAuth(sfaParams, this)
         loginParams = LoginParams(TEST_VERIFIER, TORUS_TEST_EMAIL, idToken)
 

diff --git a/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/AquaTest.kt b/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/AquaTest.kt
@@ -4,7 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import com.auth0.jwt.algorithms.Algorithm
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import com.web3auth.singlefactorauth.utils.JwtUtils.generateIdToken
 import com.web3auth.singlefactorauth.utils.PemUtils.readPrivateKeyFromReader
@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException
 class AquaTest {
 
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     lateinit var algorithmRs: Algorithm
     var TEST_VERIFIER = "torus-test-health"
@@ -37,7 +37,7 @@ class AquaTest {
     fun shouldGetTorusKey() {
 
         val context = getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.AQUA, "YOUR_CLIENT_ID", null, 0)
+        sfaParams = SFAParams(Web3AuthNetwork.AQUA, "YOUR_CLIENT_ID", null, 0)
         singleFactorAuth = SingleFactorAuth(sfaParams, context)
         val privateKey = readPrivateKeyFromReader(
             WellKnownSecret.pem(),
@@ -67,7 +67,7 @@ class AquaTest {
     @Test
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldAggregrateGetTorusKey() {
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.AQUA, "YOUR_CLIENT_ID")
+        sfaParams = SFAParams(Web3AuthNetwork.AQUA, "YOUR_CLIENT_ID")
         val context = getInstrumentation().context
         singleFactorAuth = SingleFactorAuth(sfaParams, context)
         val privateKey = readPrivateKeyFromReader(

diff --git a/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/CyanTest.kt b/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/CyanTest.kt
@@ -3,7 +3,7 @@ package com.web3auth.singlefactorauth
 import androidx.test.platform.app.InstrumentationRegistry
 import com.auth0.jwt.algorithms.Algorithm
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import com.web3auth.singlefactorauth.utils.JwtUtils.generateIdToken
 import com.web3auth.singlefactorauth.utils.PemUtils.readPrivateKeyFromReader
@@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException
 class CyanTest {
 
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     lateinit var algorithmRs: Algorithm
     var TEST_VERIFIER = "torus-test-health"
@@ -32,7 +32,7 @@ class CyanTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.CYAN, "YOUR_CLIENT_ID", null, 0)
+        sfaParams = SFAParams(Web3AuthNetwork.CYAN, "YOUR_CLIENT_ID", null, 0)
         singleFactorAuth = SingleFactorAuth(sfaParams,context)
         val privateKey = readPrivateKeyFromReader(
             WellKnownSecret.pem(),
@@ -62,7 +62,7 @@ class CyanTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldAggregrateGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.CYAN, "YOUR_CLIENT_ID")
+        sfaParams = SFAParams(Web3AuthNetwork.CYAN, "YOUR_CLIENT_ID")
         singleFactorAuth = SingleFactorAuth(sfaParams, context)
         val privateKey = readPrivateKeyFromReader(
             WellKnownSecret.pem(),

diff --git a/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SapphireDevnetTest.kt b/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SapphireDevnetTest.kt
@@ -3,7 +3,7 @@ package com.web3auth.singlefactorauth
 import androidx.test.platform.app.InstrumentationRegistry
 import com.auth0.jwt.algorithms.Algorithm
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import com.web3auth.singlefactorauth.utils.JwtUtils.generateIdToken
 import com.web3auth.singlefactorauth.utils.PemUtils.readPrivateKeyFromReader
@@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException
 class SapphireDevnetTest {
 
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     lateinit var algorithmRs: Algorithm
     var TEST_VERIFIER = "torus-test-health"
@@ -32,7 +32,7 @@ class SapphireDevnetTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(
+        sfaParams = SFAParams(
             Web3AuthNetwork.SAPPHIRE_DEVNET,
             "CLIENT ID", null, 0
         )
@@ -65,7 +65,7 @@ class SapphireDevnetTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldAggregrateGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(
+        sfaParams = SFAParams(
             Web3AuthNetwork.SAPPHIRE_DEVNET,
             "CLIENT_ID"
         )

diff --git a/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SapphireMainnetTest.kt b/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SapphireMainnetTest.kt
@@ -3,7 +3,7 @@ package com.web3auth.singlefactorauth
 import androidx.test.platform.app.InstrumentationRegistry
 import com.auth0.jwt.algorithms.Algorithm
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import com.web3auth.singlefactorauth.utils.JwtUtils.generateIdToken
 import com.web3auth.singlefactorauth.utils.PemUtils.readPrivateKeyFromReader
@@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException
 class SapphireMainnetTest {
 
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     lateinit var algorithmRs: Algorithm
     var TEST_VERIFIER = "torus-test-health"
@@ -32,7 +32,7 @@ class SapphireMainnetTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(
+        sfaParams = SFAParams(
             Web3AuthNetwork.SAPPHIRE_MAINNET,
             "CLIENT ID",
             null, 0
@@ -66,7 +66,7 @@ class SapphireMainnetTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldAggregrateGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(
+        sfaParams = SFAParams(
             Web3AuthNetwork.SAPPHIRE_MAINNET,
             "CLIENT_ID"
         )

diff --git a/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SingleFactorAuthTest.kt b/singlefactorauth/src/androidTest/java/com/web3auth/singlefactorauth/SingleFactorAuthTest.kt
@@ -3,7 +3,7 @@ package com.web3auth.singlefactorauth
 import androidx.test.platform.app.InstrumentationRegistry
 import com.auth0.jwt.algorithms.Algorithm
 import com.web3auth.singlefactorauth.types.LoginParams
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import com.web3auth.singlefactorauth.utils.JwtUtils.generateIdToken
 import com.web3auth.singlefactorauth.utils.PemUtils.readPrivateKeyFromReader
@@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException
 class SingleFactorAuthTest {
 
     lateinit var singleFactorAuth: SingleFactorAuth
-    private lateinit var sfaParams: SingleFactorAuthArgs
+    private lateinit var sfaParams: SFAParams
     lateinit var loginParams: LoginParams
     lateinit var algorithmRs: Algorithm
     var TEST_VERIFIER = "torus-test-health"
@@ -32,7 +32,7 @@ class SingleFactorAuthTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.MAINNET, "CLIENT_ID", null, 0)
+        sfaParams = SFAParams(Web3AuthNetwork.MAINNET, "CLIENT_ID", null, 0)
         singleFactorAuth = SingleFactorAuth(sfaParams, context)
         val privateKey = readPrivateKeyFromReader(
             WellKnownSecret.pem(),
@@ -62,7 +62,7 @@ class SingleFactorAuthTest {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun shouldAggregrateGetTorusKey() {
         val context = InstrumentationRegistry.getInstrumentation().context
-        sfaParams = SingleFactorAuthArgs(Web3AuthNetwork.MAINNET, "YOUR_CLIENT_ID")
+        sfaParams = SFAParams(Web3AuthNetwork.MAINNET, "YOUR_CLIENT_ID")
         singleFactorAuth = SingleFactorAuth(sfaParams, context)
         val privateKey = readPrivateKeyFromReader(
             WellKnownSecret.pem(),

diff --git a/singlefactorauth/src/main/java/com/web3auth/singlefactorauth/SingleFactorAuth.kt b/singlefactorauth/src/main/java/com/web3auth/singlefactorauth/SingleFactorAuth.kt
@@ -6,7 +6,7 @@ import com.web3auth.session_manager_android.SessionManager
 import com.web3auth.singlefactorauth.types.ErrorCode
 import com.web3auth.singlefactorauth.types.LoginParams
 import com.web3auth.singlefactorauth.types.SFAError
-import com.web3auth.singlefactorauth.types.SingleFactorAuthArgs
+import com.web3auth.singlefactorauth.types.SFAParams
 import com.web3auth.singlefactorauth.types.TorusSFAKey
 import com.web3auth.singlefactorauth.types.TorusSubVerifierInfo
 import org.json.JSONObject
@@ -21,7 +21,7 @@ import org.torusresearch.torusutils.types.common.TorusOptions
 import org.torusresearch.torusutils.types.common.TorusPublicKey
 import org.web3j.crypto.Hash
 
-class SingleFactorAuth(sfaParams: SingleFactorAuthArgs, ctx: Context) {
+class SingleFactorAuth(sfaParams: SFAParams, ctx: Context) {
     private var nodeDetailManager: FetchNodeDetails =
         FetchNodeDetails(sfaParams.getNetwork())
     private val torusUtils: TorusUtils

diff --git a/...efactorauth/types/SingleFactorAuthArgs.kt → ...3auth/singlefactorauth/types/SFAParams.kt b/...efactorauth/types/SingleFactorAuthArgs.kt → ...3auth/singlefactorauth/types/SFAParams.kt
@@ -2,16 +2,19 @@ package com.web3auth.singlefactorauth.types
 
 import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 
-class SingleFactorAuthArgs(network: Web3AuthNetwork, clientid: String, networkUrl: String? = null, serverTimeOffset: Int = 0) {
-    private var network: Web3AuthNetwork
+class SFAParams(
+    private var network: Web3AuthNetwork,
+    clientid: String,
+    networkUrl: String? = null,
+    serverTimeOffset: Int = 0
+) {
     private var clientid: String = "torus-default"
     private var networkUrl: String? = networkUrl
     private var enableOneKey: Boolean
     private var serverTimeOffset: Int = serverTimeOffset
 
 
     init {
-        this.network = network
         this.clientid = clientid
         this.enableOneKey = true
         this.networkUrl = networkUrl