Skip to content

Commit dfaad6b

Browse files
committed
feat: adding null checks for initparams parameters
Signed-off-by: Gaurav Goel <[email protected]>
1 parent 8a45357 commit dfaad6b

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
2727
}
2828

2929
private fun request(
30-
path: String, params: LoginParams? = null, extraParams: Map<String, Any>? = null
30+
path: String, params: LoginParams, extraParams: Map<String, Any>? = null
3131
) {
3232
val sdkUrl = Uri.parse(web3AuthOption.sdkUrl)
3333
val context = web3AuthOption.context
@@ -55,15 +55,21 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
5555
)
5656

5757
val initParams = JSONObject()
58-
initParams.put("loginProvider", params?.loginProvider?.name?.lowercase(Locale.ROOT))
59-
initParams.put("extraLoginOptions", gson.toJson(params?.extraLoginOptions))
58+
initParams.put("loginProvider", params.loginProvider.name.lowercase(Locale.ROOT))
59+
if (params.extraLoginOptions != null) initParams.put(
60+
"extraLoginOptions",
61+
gson.toJson(params.extraLoginOptions)
62+
)
6063
initParams.put(
6164
"redirectUrl",
62-
if (params?.redirectUrl != null) params.redirectUrl.toString() else initOptions["redirectUrl"].toString()
65+
if (params.redirectUrl != null) params.redirectUrl.toString() else initOptions["redirectUrl"].toString()
66+
)
67+
if (params.mfaLevel != null) initParams.put(
68+
"mfaLevel",
69+
params.mfaLevel.name.lowercase(Locale.ROOT)
6370
)
64-
initParams.put("mfaLevel", params?.mfaLevel?.name?.lowercase(Locale.ROOT))
65-
initParams.put("curve", params?.curve?.name?.lowercase(Locale.ROOT))
66-
initParams.put("dappShare", params?.dappShare)
71+
if (params.curve != null) initParams.put("curve", params.curve.name.lowercase(Locale.ROOT))
72+
if (params.dappShare != null) initParams.put("dappShare", params.dappShare)
6773

6874

6975
val paramMap = JSONObject()

0 commit comments

Comments
 (0)