Skip to content

Commit 2312438

Browse files
Merge pull request #70 from Web3Auth/bugfix/mfasettings
fix: add mfaSettings in initOptions
2 parents e41cd2b + 04f0cf2 commit 2312438

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
5252
extraLoginOptions = ExtraLoginOptions(login_hint = hintEmail)
5353
}
5454
val loginCompletableFuture: CompletableFuture<Web3AuthResponse> = web3Auth.login(
55-
LoginParams(selectedLoginProvider, extraLoginOptions = extraLoginOptions)
55+
LoginParams(
56+
selectedLoginProvider,
57+
extraLoginOptions = extraLoginOptions,
58+
mfaLevel = MFALevel.OPTIONAL
59+
)
5660
)
5761
loginCompletableFuture.whenComplete { _, error ->
5862
if (error == null) {
@@ -130,7 +134,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
130134
"loginConfig" to LoginConfigItem(
131135
"torus",
132136
typeOfLogin = TypeOfLogin.GOOGLE,
133-
name = ""
137+
name = "",
138+
clientId = ""
134139
)
135140
)
136141
)

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,18 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
4444
gson.toJson(web3AuthOption.loginConfig)
4545
if (web3AuthOption.buildEnv != null) initOptions["buildEnv"] =
4646
web3AuthOption.buildEnv.toString().lowercase()
47+
if (web3AuthOption.mfaSettings != null) initOptions["mfaSettings"] =
48+
gson.toJson(web3AuthOption.mfaSettings)
49+
if (params?.sessionTime != null) initOptions["sessionTime"] =
50+
params.sessionTime.toString()
4751

4852
val initParams = mutableMapOf(
4953
"loginProvider" to params?.loginProvider,
5054
"extraLoginOptions" to params?.extraLoginOptions,
51-
"redirectUrl" to if (params?.redirectUrl != null) params.redirectUrl.toString() else initOptions["redirectUrl"].toString()
55+
"redirectUrl" to if (params?.redirectUrl != null) params.redirectUrl.toString() else initOptions["redirectUrl"].toString(),
56+
"mfaLevel" to params?.mfaLevel,
57+
"curve" to params?.curve,
58+
"dappShare" to params?.dappShare
5259
)
5360

5461
val paramMap = mapOf(

0 commit comments

Comments
 (0)