From 122d654f29b5df96f9a78aec43918f6a3efbcb9b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 27 Jun 2023 20:20:07 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tap/network/auth/LazyAuthProviderImpl.kt | 16 ---------------- .../com/tangem/tap/network/auth/di/AuthModule.kt | 8 -------- .../com/tangem/datasource/di/NetworkModule.kt | 4 ++-- .../com/tangem/datasource/utils/RequestHeader.kt | 7 +++---- .../java/com/tangem/lib/auth/LazyAuthProvider.kt | 14 -------------- 5 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt delete mode 100644 libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt diff --git a/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt b/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt deleted file mode 100644 index dfe9d32307..0000000000 --- a/app/src/main/java/com/tangem/tap/network/auth/LazyAuthProviderImpl.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.tangem.tap.network.auth - -import com.tangem.common.extensions.toHexString -import com.tangem.lib.auth.LazyAuthProvider -import com.tangem.tap.proxy.AppStateHolder - -class LazyAuthProviderImpl(private val appStateHolder: AppStateHolder) : LazyAuthProvider { - - override fun getCardPublicKeyProvider(): () -> String { - return { appStateHolder.getActualCard()?.cardPublicKey?.toHexString() ?: "" } - } - - override fun getCardIdProvider(): () -> String { - return { appStateHolder.getActualCard()?.cardId ?: "" } - } -} \ No newline at end of file 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 b36bc1f85c..6e9eabd1f1 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,9 +1,7 @@ package com.tangem.tap.network.auth.di import com.tangem.lib.auth.AuthProvider -import com.tangem.lib.auth.LazyAuthProvider import com.tangem.tap.network.auth.AuthProviderImpl -import com.tangem.tap.network.auth.LazyAuthProviderImpl import com.tangem.tap.proxy.AppStateHolder import dagger.Module import dagger.Provides @@ -20,10 +18,4 @@ class AuthModule { fun provideAuthProvider(appStateHolder: AppStateHolder): AuthProvider { return AuthProviderImpl(appStateHolder) } - - @Provides - @Singleton - fun provideLazyAuthProvider(appStateHolder: AppStateHolder): LazyAuthProvider { - return LazyAuthProviderImpl(appStateHolder) - } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt index 595ddbdca9..87e05a62fb 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt @@ -9,8 +9,8 @@ import com.tangem.datasource.utils.RequestHeader.* import com.tangem.datasource.utils.addHeaders import com.tangem.datasource.utils.addLazyHeaders import com.tangem.datasource.utils.allowLogging +import com.tangem.lib.auth.AuthProvider import com.tangem.lib.auth.BuildConfig -import com.tangem.lib.auth.LazyAuthProvider import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -63,7 +63,7 @@ class NetworkModule { @Provides @Singleton @PromotionOneInch - fun providePromotionOneInchApi(authProvider: LazyAuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi { + fun providePromotionOneInchApi(authProvider: AuthProvider, @NetworkMoshi moshi: Moshi): PromotionApi { val okClient = OkHttpClient.Builder() .addLazyHeaders( LazyRequestHeader.LazyAuthenticationHeader(authProvider), diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt index 3c460035f5..cb19ed1fd4 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt @@ -1,7 +1,6 @@ package com.tangem.datasource.utils import com.tangem.lib.auth.AuthProvider -import com.tangem.lib.auth.LazyAuthProvider /** * Presentation of request header @@ -25,8 +24,8 @@ sealed class LazyRequestHeader(vararg pairs: Pair String>) { val values: List String>> = pairs.toList() - class LazyAuthenticationHeader(authProvider: LazyAuthProvider) : LazyRequestHeader( - "card_id" to authProvider.getCardIdProvider(), - "card_public_key" to authProvider.getCardPublicKeyProvider(), + class LazyAuthenticationHeader(authProvider: AuthProvider) : LazyRequestHeader( + "card_id" to { authProvider.getCardId() }, + "card_public_key" to { authProvider.getCardPublicKey() }, ) } \ No newline at end of file diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt deleted file mode 100644 index 8dcc383e30..0000000000 --- a/libs/auth/src/main/java/com/tangem/lib/auth/LazyAuthProvider.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tangem.lib.auth - -/** - * Provides auth for tangemTech API - */ -interface LazyAuthProvider { - - /** - * Returns authToken for tangem tech api - */ - fun getCardPublicKeyProvider(): () -> String - - fun getCardIdProvider(): () -> String -} \ No newline at end of file