Merge pull request #103 from Web3Auth/feat/minor-fix

feat: handle invalid sessionId
Web3Auth · Dec 2, 2024 · 76ca316 · 76ca316
2 parents 18fd358 + 7caf665
commit 76ca316
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -206,6 +206,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                 println("ed25519PrivKey: " + web3Auth.getEd25519PrivKey())
                 println("Web3Auth UserInfo" + web3Auth.getUserInfo())
             } else {
+                //handle retry login
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
             }
         }

diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -176,6 +176,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                                 web3AuthResponse = resp
                                 initializeCf.complete(null)
                             } else {
+                                SessionManager.deleteSessionIdFromStorage()
+                                sessionManager.setSessionId("")
                                 initializeCf.completeExceptionally(error)
                             }
                         }
@@ -343,15 +345,15 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         val sessionResponse: CompletableFuture<String> =
             sessionManager.authorizeSession(origin, context)
         sessionResponse.whenComplete { response, error ->
-            if (response.contains("Error")) {
+            if (error != null) {
                 sessionCompletableFuture.completeExceptionally(
                     Exception(
                         Web3AuthError.getError(
                             ErrorCode.NOUSERFOUND
                         )
                     )
                 )
-            } else if (error == null) {
+            } else {
                 val tempJson = JSONObject(response)
                 web3AuthResponse = gson.fromJson(tempJson.toString(), Web3AuthResponse::class.java)
                 if (web3AuthResponse?.error?.isNotBlank() == true) {
@@ -371,14 +373,6 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                 } else {
                     sessionCompletableFuture.complete(web3AuthResponse)
                 }
-            } else {
-                sessionCompletableFuture.completeExceptionally(
-                    Exception(
-                        Web3AuthError.getError(
-                            ErrorCode.NOUSERFOUND
-                        )
-                    )
-                )
             }
         }
         return sessionCompletableFuture