From cd5a080a900865f7bc832b0fa58f0e6f8bcd566e Mon Sep 17 00:00:00 2001 From: aminbenmansour Date: Mon, 8 May 2023 14:59:21 +0100 Subject: [PATCH] refactor: Add prefix to determine account's ecosystem --- .../webwallet/backend/auth/AuthController.kt | 1 + .../walt/webwallet/backend/auth/UserInfo.kt | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/id/walt/webwallet/backend/auth/AuthController.kt b/src/main/kotlin/id/walt/webwallet/backend/auth/AuthController.kt index de548196..4a68522f 100644 --- a/src/main/kotlin/id/walt/webwallet/backend/auth/AuthController.kt +++ b/src/main/kotlin/id/walt/webwallet/backend/auth/AuthController.kt @@ -43,6 +43,7 @@ object AuthController { } } ctx.json(UserInfo(userInfo.id).apply { + if (id.contains("##")){ id = userInfo.id.split("##")[1]} token = JWTService.toJWT(userInfo) }) } diff --git a/src/main/kotlin/id/walt/webwallet/backend/auth/UserInfo.kt b/src/main/kotlin/id/walt/webwallet/backend/auth/UserInfo.kt index b26ae973..948afdc8 100644 --- a/src/main/kotlin/id/walt/webwallet/backend/auth/UserInfo.kt +++ b/src/main/kotlin/id/walt/webwallet/backend/auth/UserInfo.kt @@ -1,24 +1,31 @@ package id.walt.webwallet.backend.auth - import kotlinx.serialization.Serializable @Serializable -class UserInfo( - val id: String -) { +class UserInfo(var id: String ) { var email: String? = null var password: String? = null var token: String? = null var ethAccount: String? = null var did: String? = null var tezosAccount: String? = null + var polkadotAccount: String? = null + var polkadotEvmAccount: String? = null + var flowAccount: String? = null init { when { id.contains("@") -> email = id - id.lowercase().contains("0x") -> ethAccount = id - id.lowercase().startsWith("did:") -> did = id + id.startsWith("did") -> { + did = id + } + id.split("##")[0].lowercase().startsWith("eth") -> {ethAccount = id.split("##")[1] } + id.split("##")[0].lowercase().startsWith("pol") -> {polkadotAccount = id.split("##")[1]} + id.split("##")[0].lowercase().startsWith("polevm") -> {polkadotEvmAccount = id.split("##")[1]} + id.split("##")[0].lowercase().startsWith("flow") -> {flowAccount = id.split("##")[1]} id.lowercase().startsWith("tz") -> tezosAccount = id + } + } -} +} \ No newline at end of file