Mobile auth fix (#527)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit 504cd4195b23 · 2025-11-16T11:10:00.000-03:00
* Mobile auth fix

* taking token correctly

* ktlint - code clean

---------

Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/application/core/auth_core/src/androidMain/kotlin/io/writeopia/auth/core/repository/RoomAuthRepository.kt b/application/core/auth_core/src/androidMain/kotlin/io/writeopia/auth/core/repository/RoomAuthRepository.kt
@@ -13,7 +13,7 @@ class RoomAuthRepository(
     private val tokenCommonDao: TokenCommonDao,
     private val workspaceCommonDao: WorkspaceCommonDao
 ) : AuthRepository {
-    override suspend fun getUser(): WriteopiaUser = userDao.selectCurrentUser()
+    override suspend fun getUser(): WriteopiaUser = userDao.selectedCurrentUser()
 
     override suspend fun isLoggedIn(): Boolean = getUser().id != WriteopiaUser.DISCONNECTED
 
@@ -47,6 +47,10 @@ class RoomAuthRepository(
     }
 
     override suspend fun unselectAllWorkspaces() {
+        workspaceCommonDao.unselectAllWorkspaces()
+    }
 
+    override suspend fun unselectAllUsers() {
+        userDao.unselectAllUsers()
     }
 }
diff --git a/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt b/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt
@@ -34,4 +34,6 @@ interface AuthRepository : UserRepository {
     suspend fun saveWorkspace(workspace: Workspace)
 
     suspend fun unselectAllWorkspaces()
+
+    suspend fun unselectAllUsers()
 }
diff --git a/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt b/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt
@@ -39,16 +39,13 @@ internal class SqlDelightAuthRepository(
     }
 
     override suspend fun saveUser(user: WriteopiaUser, selected: Boolean) {
-        writeopiaDb?.writeopiaUserEntityQueries?.run {
-            unselectAllUsers()
-            insertUser(
-                id = user.id,
-                name = user.name,
-                email = user.email,
-                selected = selected.toLong(),
-                tier = user.tier.tierName()
-            )
-        }
+        writeopiaDb?.writeopiaUserEntityQueries?.insertUser(
+            id = user.id,
+            name = user.name,
+            email = user.email,
+            selected = selected.toLong(),
+            tier = user.tier.tierName()
+        )
     }
 
     override suspend fun getAuthToken(): String? =
@@ -96,4 +93,8 @@ internal class SqlDelightAuthRepository(
     override suspend fun unselectAllWorkspaces() {
         writeopiaDb?.workspaceEntityQueries?.unselectAll()
     }
+
+    override suspend fun unselectAllUsers() {
+        writeopiaDb?.writeopiaUserEntityQueries?.unselectAllUsers()
+    }
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/TokenDao.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/TokenDao.kt
@@ -1,6 +1,8 @@
 package io.writeopia.persistence.room.data.daos
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import io.writeopia.persistence.room.data.entities.TOKEN_ENTITY
 import io.writeopia.persistence.room.data.entities.TokenEntity
@@ -11,6 +13,6 @@ interface TokenDao {
     @Query("SELECT * FROM $TOKEN_ENTITY WHERE user_id = :userId")
     suspend fun getTokenByUserId(userId: String): TokenEntity?
 
-    @Query("INSERT INTO $TOKEN_ENTITY (user_id, token) VALUES (:userId, :token)")
-    suspend fun insertToken(userId: String, token: String)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertToken(tokenEntity: TokenEntity)
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/TokenDaoDelegator.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/TokenDaoDelegator.kt
@@ -1,12 +1,13 @@
 package io.writeopia.persistence.room.data.daos
 
 import io.writeopia.common.utils.persistence.daos.TokenCommonDao
+import io.writeopia.persistence.room.data.entities.TokenEntity
 
 class TokenDaoDelegator(private val tokenDao: TokenDao): TokenCommonDao {
     override suspend fun getTokenByUserId(userId: String): String? =
         tokenDao.getTokenByUserId(userId)?.token
 
     override suspend fun saveToken(token: String, userId: String) {
-        tokenDao.insertToken(userId, token)
+        tokenDao.insertToken(TokenEntity(userId, token))
     }
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/UserDao.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/UserDao.kt
@@ -21,4 +21,7 @@ interface UserDao {
 
     @Query("SELECT * FROM $USER_ENTITY WHERE selected = 1")
     suspend fun getCurrentUser(): UserEntity?
+
+    @Query("UPDATE $USER_ENTITY SET selected = 0")
+    suspend fun unselectAllUsers()
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/UserDaoDelegator.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/UserDaoDelegator.kt
@@ -23,6 +23,10 @@ class UserDaoDelegator(private val delegate: UserDao): UserCommonDao {
         }
     }
 
-    override suspend fun selectCurrentUser(): WriteopiaUser =
+    override suspend fun selectedCurrentUser(): WriteopiaUser =
         delegate.getCurrentUser()?.toModel()?.first ?: WriteopiaUser.disconnectedUser()
+
+    override suspend fun unselectAllUsers() {
+        delegate.unselectAllUsers()
+    }
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/WorkspaceDao.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/WorkspaceDao.kt
@@ -13,8 +13,11 @@ interface WorkspaceDao {
     suspend fun getWorkspaceById(id: String): WorkspaceEntity?
 
     @Query("SELECT * FROM workspace_entity WHERE selected = 1 LIMIT 1")
-    suspend fun selectCurrentWorkspace(): WorkspaceEntity?
+    suspend fun currentWorkspace(): WorkspaceEntity?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(workspace: WorkspaceEntity)
+
+    @Query("UPDATE workspace_entity SET selected = 0")
+    suspend fun unselectAllWorkspaces()
 }
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/WorkspaceDaoDelegator.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/WorkspaceDaoDelegator.kt
@@ -22,5 +22,9 @@ class WorkspaceDaoDelegator(private val workspaceDao: WorkspaceDao): WorkspaceCo
     }
 
     override suspend fun selectCurrentWorkspace(): Workspace? =
-        workspaceDao.selectCurrentWorkspace()?.toDomain()
+        workspaceDao.currentWorkspace()?.toDomain()
+
+    override suspend fun unselectAllWorkspaces() {
+        workspaceDao.unselectAllWorkspaces()
+    }
 }
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/daos/UserCommonDao.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/daos/UserCommonDao.kt
@@ -10,5 +10,7 @@ interface UserCommonDao {
 
     suspend fun deleteUser(userId: String)
 
-    suspend fun selectCurrentUser(): WriteopiaUser
+    suspend fun selectedCurrentUser(): WriteopiaUser
+
+    suspend fun unselectAllUsers()
 }
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/daos/WorkspaceCommonDao.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/daos/WorkspaceCommonDao.kt
@@ -11,4 +11,6 @@ interface WorkspaceCommonDao {
     suspend fun deleteWorkspace(workspaceId: String)
 
     suspend fun selectCurrentWorkspace(): Workspace?
+
+    suspend fun unselectAllWorkspaces()
 }
diff --git a/application/features/auth/src/commonMain/kotlin/io/writeopia/auth/menu/AuthMenuViewModel.kt b/application/features/auth/src/commonMain/kotlin/io/writeopia/auth/menu/AuthMenuViewModel.kt
@@ -75,6 +75,7 @@ class AuthMenuViewModel(
                     is ResultData.Complete -> {
                         val user = result.data.writeopiaUser.toModel()
 
+                        authRepository.unselectAllUsers()
                         authRepository.saveUser(
                             user = user.copy(tier = Tier.PREMIUM),
                             selected = true

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class RoomAuthRepository(`
`13`	`13`	`private val tokenCommonDao: TokenCommonDao,`
`14`	`14`	`private val workspaceCommonDao: WorkspaceCommonDao`
`15`	`15`	`) : AuthRepository {`
`16`		`- override suspend fun getUser(): WriteopiaUser = userDao.selectCurrentUser()`
	`16`	`+ override suspend fun getUser(): WriteopiaUser = userDao.selectedCurrentUser()`
`17`	`17`
`18`	`18`	`override suspend fun isLoggedIn(): Boolean = getUser().id != WriteopiaUser.DISCONNECTED`
`19`	`19`
`@@ -47,6 +47,10 @@ class RoomAuthRepository(`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`override suspend fun unselectAllWorkspaces() {`
	`50`	`+ workspaceCommonDao.unselectAllWorkspaces()`
	`51`	`+ }`
`50`	`52`
	`53`	`+ override suspend fun unselectAllUsers() {`
	`54`	`+ userDao.unselectAllUsers()`
`51`	`55`	`}`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,6 @@ interface AuthRepository : UserRepository {`
`34`	`34`	`suspend fun saveWorkspace(workspace: Workspace)`
`35`	`35`
`36`	`36`	`suspend fun unselectAllWorkspaces()`
	`37`	`+`
	`38`	`+ suspend fun unselectAllUsers()`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`package io.writeopia.persistence.room.data.daos`
`2`	`2`
`3`	`3`	`import io.writeopia.common.utils.persistence.daos.TokenCommonDao`
	`4`	`+import io.writeopia.persistence.room.data.entities.TokenEntity`
`4`	`5`
`5`	`6`	`class TokenDaoDelegator(private val tokenDao: TokenDao): TokenCommonDao {`
`6`	`7`	`override suspend fun getTokenByUserId(userId: String): String? =`
`7`	`8`	`tokenDao.getTokenByUserId(userId)?.token`
`8`	`9`
`9`	`10`	`override suspend fun saveToken(token: String, userId: String) {`
`10`		`- tokenDao.insertToken(userId, token)`
	`11`	`+ tokenDao.insertToken(TokenEntity(userId, token))`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,7 @@ interface UserDao {`
`21`	`21`
`22`	`22`	`@Query("SELECT * FROM $USER_ENTITY WHERE selected = 1")`
`23`	`23`	`suspend fun getCurrentUser(): UserEntity?`
	`24`	`+`
	`25`	`+ @Query("UPDATE $USER_ENTITY SET selected = 0")`
	`26`	`+ suspend fun unselectAllUsers()`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ class UserDaoDelegator(private val delegate: UserDao): UserCommonDao {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- override suspend fun selectCurrentUser(): WriteopiaUser =`
	`26`	`+ override suspend fun selectedCurrentUser(): WriteopiaUser =`
`27`	`27`	`delegate.getCurrentUser()?.toModel()?.first ?: WriteopiaUser.disconnectedUser()`
	`28`	`+`
	`29`	`+ override suspend fun unselectAllUsers() {`
	`30`	`+ delegate.unselectAllUsers()`
	`31`	`+ }`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,9 @@ class WorkspaceDaoDelegator(private val workspaceDao: WorkspaceDao): WorkspaceCo`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`override suspend fun selectCurrentWorkspace(): Workspace? =`
`25`		`- workspaceDao.selectCurrentWorkspace()?.toDomain()`
	`25`	`+ workspaceDao.currentWorkspace()?.toDomain()`
	`26`	`+`
	`27`	`+ override suspend fun unselectAllWorkspaces() {`
	`28`	`+ workspaceDao.unselectAllWorkspaces()`
	`29`	`+ }`
`26`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,7 @@ interface UserCommonDao {`
`10`	`10`
`11`	`11`	`suspend fun deleteUser(userId: String)`
`12`	`12`
`13`		`- suspend fun selectCurrentUser(): WriteopiaUser`
	`13`	`+ suspend fun selectedCurrentUser(): WriteopiaUser`
	`14`	`+`
	`15`	`+ suspend fun unselectAllUsers()`
`14`	`16`	`}`