Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import assertk.assertions.containsExactly
import com.hedvig.android.auth.AuthStatus
import com.hedvig.android.auth.AuthTokenService
import com.hedvig.android.auth.MemberIdService
import com.hedvig.android.auth.storage.AuthTokenStorage
import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage
import com.hedvig.android.auth.token.AuthTokens
import com.hedvig.android.auth.token.LocalAccessToken
import com.hedvig.android.auth.token.LocalRefreshToken
Expand Down Expand Up @@ -98,7 +98,7 @@ internal class SessionReconcilerTest {
controller: BackstackController,
isDemoMode: Boolean = false,
): SessionReconciler {
val authTokenStorage = AuthTokenStorage(
val authTokenStorage = DataStoreAuthTokenStorage(
TestPreferencesDataStore(
datastoreTestFileDirectory = testFolder.newFolder(),
coroutineScope = backgroundScope,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
package com.hedvig.android.auth

import com.hedvig.android.core.common.ApplicationScope
import com.hedvig.android.core.common.di.AppScope
import com.hedvig.android.logger.logcat
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn
import kotlinx.coroutines.launch

interface LogoutUseCase {
fun invoke()
}

@ContributesBinding(AppScope::class)
@SingleIn(AppScope::class)
@Inject
internal class LogoutUseCaseImpl(
private val authTokenService: AuthTokenService,
private val applicationScope: ApplicationScope,
) : LogoutUseCase {
override fun invoke() {
logcat { "Logout usecase called" }
applicationScope.launch { authTokenService.logoutAndInvalidateTokens() }
}
}
Original file line number Diff line number Diff line change
@@ -1,84 +1,14 @@
package com.hedvig.android.auth.storage

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import com.hedvig.android.auth.token.AuthTokens
import com.hedvig.android.auth.token.LocalAccessToken
import com.hedvig.android.auth.token.LocalRefreshToken
import com.hedvig.android.authlib.AccessToken
import com.hedvig.android.authlib.RefreshToken
import com.hedvig.android.core.common.di.AppScope
import com.hedvig.android.logger.LogPriority
import com.hedvig.android.logger.logcat
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn
import kotlin.time.Clock
import kotlin.time.Duration.Companion.seconds
import kotlin.time.Instant
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map

@SingleIn(AppScope::class)
@Inject
class AuthTokenStorage(
private val dataStore: DataStore<Preferences>,
private val clock: Clock = Clock.System,
) {
fun getTokens(): Flow<AuthTokens?> {
return dataStore.data
.map { preferences ->
val accessTokenString = preferences[accessTokenPreferenceKey] ?: return@map null
val accessTokenExpirationIso8601 = preferences[accessTokenExpirationIso8601PreferenceKey] ?: return@map null
val accessTokenExpirationInstant = Instant.parse(accessTokenExpirationIso8601)
interface AuthTokenStorage {
fun getTokens(): Flow<AuthTokens?>

val refreshTokenString = preferences[refreshTokenPreferenceKey] ?: return@map null
val refreshTokenExpirationIso8601 = preferences[refreshTokenExpirationIso8601PreferenceKey] ?: return@map null
val refreshTokenExpirationInstant = Instant.parse(refreshTokenExpirationIso8601)
suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken)

AuthTokens(
LocalAccessToken(accessTokenString, accessTokenExpirationInstant),
LocalRefreshToken(refreshTokenString, refreshTokenExpirationInstant),
)
}
}

suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken) {
dataStore.edit { preferences ->
val now = clock.now()

preferences[accessTokenPreferenceKey] = accessToken.token
val accessTokenExpirationInstant = now + accessToken.expiryInSeconds.seconds
preferences[accessTokenExpirationIso8601PreferenceKey] = accessTokenExpirationInstant.toString()

preferences[refreshTokenPreferenceKey] = refreshToken.token
val refreshTokenExpirationInstant = now + refreshToken.expiryInSeconds.seconds
preferences[refreshTokenExpirationIso8601PreferenceKey] = refreshTokenExpirationInstant.toString()
logcat(LogPriority.VERBOSE) {
buildString {
append("Saved tokens with expiration instants: ")
append("Access token:$accessTokenExpirationInstant")
append(" | ")
append("Refresh token:$refreshTokenExpirationInstant")
}
}
}
}

suspend fun clearTokens() {
dataStore.edit { preferences ->
preferences.remove(accessTokenPreferenceKey)
preferences.remove(refreshTokenPreferenceKey)
}
}

companion object {
private val accessTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN")
private val accessTokenExpirationIso8601PreferenceKey =
stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN_EXPIRATION_ISO_8601")
private val refreshTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN")
private val refreshTokenExpirationIso8601PreferenceKey =
stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN_EXPIRATION_ISO_8601")
}
suspend fun clearTokens()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.hedvig.android.auth

import com.hedvig.android.core.common.ApplicationScope
import com.hedvig.android.core.common.di.AppScope
import com.hedvig.android.logger.logcat
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn
import kotlinx.coroutines.launch

@ContributesBinding(AppScope::class)
@SingleIn(AppScope::class)
@Inject
internal class LogoutUseCaseImpl(
private val authTokenService: AuthTokenService,
private val applicationScope: ApplicationScope,
) : LogoutUseCase {
override fun invoke() {
logcat { "Logout usecase called" }
applicationScope.launch { authTokenService.logoutAndInvalidateTokens() }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package com.hedvig.android.auth.storage

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import com.hedvig.android.auth.token.AuthTokens
import com.hedvig.android.auth.token.LocalAccessToken
import com.hedvig.android.auth.token.LocalRefreshToken
import com.hedvig.android.authlib.AccessToken
import com.hedvig.android.authlib.RefreshToken
import com.hedvig.android.core.common.di.AppScope
import com.hedvig.android.logger.LogPriority
import com.hedvig.android.logger.logcat
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.SingleIn
import kotlin.time.Clock
import kotlin.time.Duration.Companion.seconds
import kotlin.time.Instant
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map

@ContributesBinding(AppScope::class)
@SingleIn(AppScope::class)
@Inject
class DataStoreAuthTokenStorage(
private val dataStore: DataStore<Preferences>,
private val clock: Clock = Clock.System,
) : AuthTokenStorage {
override fun getTokens(): Flow<AuthTokens?> {
return dataStore.data
.map { preferences ->
val accessTokenString = preferences[accessTokenPreferenceKey] ?: return@map null
val accessTokenExpirationIso8601 = preferences[accessTokenExpirationIso8601PreferenceKey] ?: return@map null
val accessTokenExpirationInstant = Instant.parse(accessTokenExpirationIso8601)

val refreshTokenString = preferences[refreshTokenPreferenceKey] ?: return@map null
val refreshTokenExpirationIso8601 = preferences[refreshTokenExpirationIso8601PreferenceKey] ?: return@map null
val refreshTokenExpirationInstant = Instant.parse(refreshTokenExpirationIso8601)

AuthTokens(
LocalAccessToken(accessTokenString, accessTokenExpirationInstant),
LocalRefreshToken(refreshTokenString, refreshTokenExpirationInstant),
)
}
}

override suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken) {
dataStore.edit { preferences ->
val now = clock.now()

preferences[accessTokenPreferenceKey] = accessToken.token
val accessTokenExpirationInstant = now + accessToken.expiryInSeconds.seconds
preferences[accessTokenExpirationIso8601PreferenceKey] = accessTokenExpirationInstant.toString()

preferences[refreshTokenPreferenceKey] = refreshToken.token
val refreshTokenExpirationInstant = now + refreshToken.expiryInSeconds.seconds
preferences[refreshTokenExpirationIso8601PreferenceKey] = refreshTokenExpirationInstant.toString()
logcat(LogPriority.VERBOSE) {
buildString {
append("Saved tokens with expiration instants: ")
append("Access token:$accessTokenExpirationInstant")
append(" | ")
append("Refresh token:$refreshTokenExpirationInstant")
}
}
}
}

override suspend fun clearTokens() {
dataStore.edit { preferences ->
preferences.remove(accessTokenPreferenceKey)
preferences.remove(refreshTokenPreferenceKey)
}
}

companion object {
private val accessTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN")
private val accessTokenExpirationIso8601PreferenceKey =
stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN_EXPIRATION_ISO_8601")
private val refreshTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN")
private val refreshTokenExpirationIso8601PreferenceKey =
stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN_EXPIRATION_ISO_8601")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import assertk.assertions.isNotNull
import assertk.assertions.isNull
import com.hedvig.android.auth.event.AuthEventStorage
import com.hedvig.android.auth.storage.AuthTokenStorage
import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage
import com.hedvig.android.auth.test.FakeAuthRepository
import com.hedvig.android.authlib.AccessToken
import com.hedvig.android.authlib.AuthRepository
Expand Down Expand Up @@ -128,7 +129,7 @@ internal class AuthTokenServiceImplTest {
clock,
)

private fun TestScope.authTokenStorage(clock: Clock) = AuthTokenStorage(
private fun TestScope.authTokenStorage(clock: Clock) = DataStoreAuthTokenStorage(
TestPreferencesDataStore(
datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"),
coroutineScope = backgroundScope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.hedvig.android.auth.AuthTokenService
import com.hedvig.android.auth.AuthTokenServiceImpl
import com.hedvig.android.auth.event.AuthEventStorage
import com.hedvig.android.auth.storage.AuthTokenStorage
import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage
import com.hedvig.android.auth.test.FakeAuthRepository
import com.hedvig.android.authlib.AccessToken
import com.hedvig.android.authlib.AuthTokenResult
Expand Down Expand Up @@ -193,7 +194,7 @@ class AndroidAccessTokenProviderTest {
)
}

private fun TestScope.authTokenStorage(clock: Clock) = AuthTokenStorage(
private fun TestScope.authTokenStorage(clock: Clock) = DataStoreAuthTokenStorage(
TestPreferencesDataStore(
datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"),
coroutineScope = backgroundScope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ internal class AuthTokenStorageTest {
}

private fun TestScope.authTokenStorage(clock: Clock): AuthTokenStorage {
return AuthTokenStorage(
return DataStoreAuthTokenStorage(
TestPreferencesDataStore(
datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"),
coroutineScope = backgroundScope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,12 @@ internal class CommonHedvigBuildConstants(
override val buildApiVersion: Int = appBuildConfig.osSdkVersion
override val platformName: String = appBuildConfig.platformName
override val userAgent: String
get() = makeUserAgent(languageService.getLanguage().toBcp47Format(), appBuildConfig)
get() = platformUserAgent(languageService.getLanguage().toBcp47Format(), appBuildConfig)
override val model: String = "${appBuildConfig.manufacturer} ${appBuildConfig.model}"
}

internal expect val defaultPlatformName: String

private fun makeUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String = buildString {
append(appBuildConfig.applicationId)
append(" ")
append(appBuildConfig.versionName)
append(" ")
append("(Android")
append(" ")
append(appBuildConfig.osReleaseVersion)
append("; ")
append(appBuildConfig.brand)
append(" ")
append(appBuildConfig.model)
append("; ")
append(appBuildConfig.device)
append("; ")
append(languageBCP47)
append(")")
}

private interface UrlHolder {
fun urlGraphqlOctopus(flavor: Flavor): String

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.hedvig.android.core.buildconstants

/**
* The value of the `User-Agent` header, in the format the platform's app sends.
*/
internal expect fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.hedvig.android.core.buildconstants

internal actual fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String = buildString {
append(appBuildConfig.applicationId)
append(" ")
append(appBuildConfig.versionName)
append(" ")
append("(Android")
append(" ")
append(appBuildConfig.osReleaseVersion)
append("; ")
append(appBuildConfig.brand)
append(" ")
append(appBuildConfig.model)
append("; ")
append(appBuildConfig.device)
append("; ")
append(languageBCP47)
append(")")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.hedvig.android.core.buildconstants

internal actual fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String =
"${appBuildConfig.applicationId} ${appBuildConfig.versionName} (iOS ${appBuildConfig.osReleaseVersion})"
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.hedvig.android.core.buildconstants

import kotlin.test.Test
import kotlin.test.assertEquals

class NativeUserAgentTest {
@Test
fun `user agent matches the iOS format`() {
val config = object : AppBuildConfig {
override val debug: Boolean = true
override val applicationId: String = "com.hedvig.test"
override val buildType: String = "debug"
override val versionCode: Int = 1
override val versionName: String = "14.6.3"
override val appFlavor: Flavor = Flavor.Develop
override val osReleaseVersion: String = "26.4"
override val osSdkVersion: Int = 0
override val brand: String = "Apple"
override val model: String = "iPhone"
override val device: String = "iPhone18,1"
override val manufacturer: String = "Apple"
}

assertEquals("com.hedvig.test 14.6.3 (iOS 26.4)", platformUserAgent("en-SE", config))
}
}
6 changes: 4 additions & 2 deletions app/core/core-demo-mode/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ plugins {
kotlin {
sourceSets {
commonMain.dependencies {
implementation(libs.androidx.datastore.core)
implementation(libs.androidx.datastore.preferencesCore)
implementation(libs.coroutines.core)
implementation(projects.authEventCore)
implementation(projects.coreCommonPublic)
}
jvmMain.dependencies {
implementation(libs.androidx.datastore.core)
implementation(libs.androidx.datastore.preferencesCore)
}
}
}
Loading
Loading