From 8439b5a6a6eac10db9c96b391147dbe408713e0b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 7 Nov 2023 12:54:49 +0200 Subject: [PATCH] Updated on 2026-08-14 --- .../tap/network/auth/ExpressAuthProviderImpl.kt | 12 ++++-------- .../com/tangem/tap/network/auth/di/AuthModule.kt | 16 ++++++++++++++++ .../datasource/config/ConfigManagerImpl.kt | 1 + .../tangem/datasource/config/models/Config.kt | 1 + .../datasource/config/models/JsonModels.kt | 1 + .../ExpressSessionIdGenerator.kt} | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) rename libs/auth/src/main/java/com/tangem/lib/auth/{ExpressSessionIdRefresher.kt => sessionId/ExpressSessionIdGenerator.kt} (65%) diff --git a/app/src/main/java/com/tangem/tap/network/auth/ExpressAuthProviderImpl.kt b/app/src/main/java/com/tangem/tap/network/auth/ExpressAuthProviderImpl.kt index 9d7e70badc..53ed14fdbd 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/ExpressAuthProviderImpl.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/ExpressAuthProviderImpl.kt @@ -1,24 +1,20 @@ package com.tangem.tap.network.auth -import com.tangem.common.extensions.toHexString +import com.tangem.datasource.config.ConfigManager import com.tangem.datasource.local.userwallet.UserWalletsStore -import com.tangem.domain.wallets.legacy.WalletsStateHolder -import com.tangem.lib.auth.AuthProvider import com.tangem.lib.auth.ExpressAuthProvider -import com.tangem.lib.auth.ExpressSessionIdGenerator -import com.tangem.tap.proxy.AppStateHolder +import com.tangem.lib.auth.sessionId.ExpressSessionIdGenerator import java.util.UUID class ExpressAuthProviderImpl( - private val walletStateHolder: WalletsStateHolder, private val userWalletsStore: UserWalletsStore, - private val appStateHolder: AppStateHolder + private val configManager: ConfigManager ) : ExpressAuthProvider, ExpressSessionIdGenerator { private var uuid = UUID.randomUUID() override fun getApiKey(): String { - TODO() + return configManager.config.tangemExpressApiKey } override fun getUserId(): String { diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt index 6e9eabd1f1..7efa406601 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt @@ -1,7 +1,11 @@ package com.tangem.tap.network.auth.di +import com.tangem.datasource.config.ConfigManager +import com.tangem.datasource.local.userwallet.UserWalletsStore import com.tangem.lib.auth.AuthProvider +import com.tangem.lib.auth.ExpressAuthProvider import com.tangem.tap.network.auth.AuthProviderImpl +import com.tangem.tap.network.auth.ExpressAuthProviderImpl import com.tangem.tap.proxy.AppStateHolder import dagger.Module import dagger.Provides @@ -18,4 +22,16 @@ class AuthModule { fun provideAuthProvider(appStateHolder: AppStateHolder): AuthProvider { return AuthProviderImpl(appStateHolder) } + + @Provides + @Singleton + fun provideExpressAuthProvider( + userWalletsStore: UserWalletsStore, + configManager: ConfigManager, + ): ExpressAuthProvider { + return ExpressAuthProviderImpl( + userWalletsStore = userWalletsStore, + configManager = configManager + ) + } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt index 493d6b2e9e..20bd72d674 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt @@ -106,6 +106,7 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager { swapReferrerAccount = configValues.swapReferrerAccount, walletConnectProjectId = configValues.walletConnectProjectId, tangemComAuthorization = configValues.tangemComAuthorization, + tangemExpressApiKey = configValues.tangemExpressApiKey ) } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/models/Config.kt b/core/datasource/src/main/java/com/tangem/datasource/config/models/Config.kt index 3d0bf5be7f..a4d08b27a3 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/models/Config.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/models/Config.kt @@ -19,4 +19,5 @@ data class Config( val swapReferrerAccount: SwapReferrerAccount? = null, val walletConnectProjectId: String = "", val tangemComAuthorization: String? = null, + val tangemExpressApiKey: String = "" ) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt index 83ffe5d09a..9a73d6ee83 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt @@ -40,6 +40,7 @@ class ConfigValueModel( val tangemComAuthorization: String?, val chiaFireAcademyApiKey: String?, val chiaTangemApiKey: String?, + val tangemExpressApiKey: String, ) data class AppsFlyer( diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/ExpressSessionIdRefresher.kt b/libs/auth/src/main/java/com/tangem/lib/auth/sessionId/ExpressSessionIdGenerator.kt similarity index 65% rename from libs/auth/src/main/java/com/tangem/lib/auth/ExpressSessionIdRefresher.kt rename to libs/auth/src/main/java/com/tangem/lib/auth/sessionId/ExpressSessionIdGenerator.kt index 0a8adb6718..be7270b4c7 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/ExpressSessionIdRefresher.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/sessionId/ExpressSessionIdGenerator.kt @@ -1,4 +1,4 @@ -package com.tangem.lib.auth +package com.tangem.lib.auth.sessionId interface ExpressSessionIdGenerator {