Skip to content

Fixing JWT token #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 2 commits into from
Nov 6, 2025
Merged

Fixing JWT token #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96ba7d3
Fixing JWT token
ftrtyfytfjh Nov 6, 2025
8ae8860
code clean
ftrtyfytfjh Nov 6, 2025
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
8 changes: 0 additions & 8 deletions application/common_flows/wide_screen_common/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="src/commonMain/kotlin/io/writeopia/notes/desktop/components/App.kt">
<error line="119" column="32" source="standard:chain-method-continuation" />
<error line="290" column="37" source="standard:chain-method-continuation" />
<error line="310" column="37" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/notes/desktop/components/GlobalHeader.kt">
<error line="35" column="28" source="standard:chain-method-continuation" />
</file>
</baseline>
13 changes: 0 additions & 13 deletions application/composeApp/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="171" column="42" source="standard:chain-method-continuation" />
<error line="171" column="48" source="standard:chain-method-continuation" />
<error line="179" column="44" source="standard:chain-method-continuation" />
<error line="179" column="50" source="standard:chain-method-continuation" />
</file>
<file name="src/androidInstrumentedTest/kotlin/io/writeopia/robots/AndroidDocumentEditPageRobot.kt">
<error line="8" column="36" source="standard:class-signature" />
<error line="8" column="80" source="standard:class-signature" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/mobile/AppMobile.kt">
<error line="64" column="50" source="standard:chain-method-continuation" />
<error line="88" column="63" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/navigation/MobileNavigationViewModel.kt">
<error line="9" column="35" source="standard:class-signature" />
<error line="9" column="48" source="standard:class-signature" />
Expand All @@ -22,9 +12,6 @@
<error line="5" column="24" source="standard:class-signature" />
<error line="5" column="41" source="standard:class-signature" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/navigation/StartUp.kt">
<error line="39" column="33" source="standard:chain-method-continuation" />
</file>
<file name="src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt">
<error line="25" column="1" source="standard:no-unused-imports" />
</file>
Expand Down
10 changes: 4 additions & 6 deletions application/composeApp/src/commonMain/kotlin/io/writeopia/navigation/StartUp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ import androidx.compose.ui.Modifier
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import io.writeopia.auth.core.di.AuthCoreInjectionNeo
import io.writeopia.auth.di.AuthInjection
import io.writeopia.auth.menu.AuthMenuViewModel
import io.writeopia.common.utils.Destinations
import io.writeopia.di.AppConnectionInjection
import io.writeopia.model.ColorThemeOption
import io.writeopia.model.isDarkTheme
import io.writeopia.theme.WrieopiaTheme
Expand All @@ -36,10 +34,10 @@ fun NavGraphBuilder.startScreen(
IntroScreen(colorTheme.value)

LaunchedEffect(Unit) {
AuthCoreInjectionNeo.singleton()
.provideAuthRepository()
.getAuthToken()
?.let(AppConnectionInjection.singleton()::setJwtToken)
// AuthCoreInjectionNeo.singleton()
// .provideAuthRepository()
// .getAuthToken()
// ?.let(AppConnectionInjection.singleton()::setJwtToken)

authMenuViewModel.isLoggedIn().collect { loggedIn ->
delay(300)
Expand Down
14 changes: 0 additions & 14 deletions application/core/auth_core/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="87" column="42" source="standard:chain-method-continuation" />
<error line="87" column="48" source="standard:chain-method-continuation" />
</file>
<file name="src/androidMain/kotlin/io/writeopia/auth/core/repository/RoomAuthRepository.kt">
<error line="50" column="1" source="standard:no-blank-line-before-rbrace" />
<error line="50" column="1" source="standard:no-empty-first-line-in-method-block" />
Expand All @@ -13,31 +9,21 @@
<error line="21" column="47" source="standard:class-signature" />
<error line="21" column="74" source="standard:class-signature" />
<error line="22" column="82" source="standard:function-expression-body" />
<error line="24" column="34" source="standard:chain-method-continuation" />
<error line="42" column="33" source="standard:function-expression-body" />
<error line="44" column="34" source="standard:chain-method-continuation" />
<error line="56" column="85" source="standard:function-expression-body" />
<error line="75" column="67" source="standard:function-expression-body" />
<error line="77" column="34" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/auth/core/data/WorkspaceApi.kt">
<error line="24" column="20" source="standard:class-signature" />
<error line="24" column="52" source="standard:class-signature" />
<error line="24" column="79" source="standard:class-signature" />
<error line="52" column="84" source="standard:function-expression-body" />
<error line="54" column="34" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt">
<error line="14" column="76" source="standard:curly-spacing" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt">
<error line="16" column="51" source="standard:function-expression-body" />
<error line="17" column="27" source="standard:chain-method-continuation" />
<error line="28" column="24" source="standard:chain-method-continuation" />
<error line="56" column="50" source="standard:function-expression-body" />
<error line="57" column="27" source="standard:chain-method-continuation" />
<error line="72" column="20" source="standard:chain-method-continuation" />
<error line="87" column="20" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/auth/core/utils/UserExtensions.kt">
<error line="7" column="52" source="standard:function-expression-body" />
Expand Down
7 changes: 2 additions & 5 deletions ...uth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ internal class SqlDelightAuthRepository(
}

override suspend fun saveUser(user: WriteopiaUser, selected: Boolean) {
println("saving user: ${user.id}, selected: ${selected.toLong()}")

writeopiaDb?.writeopiaUserEntityQueries?.run {
unselectAllUsers()
insertUser(
Expand All @@ -53,11 +51,10 @@ internal class SqlDelightAuthRepository(
}
}

override suspend fun getAuthToken(): String? {
return writeopiaDb?.tokenEntityQueries
override suspend fun getAuthToken(): String? =
writeopiaDb?.tokenEntityQueries
?.selectTokenByUserId(getUser().id)
?.executeAsOneOrNull()
}

override suspend fun saveToken(userId: String, token: String) {
writeopiaDb?.tokenEntityQueries?.insertToken(userId, token)
Expand Down
21 changes: 8 additions & 13 deletions application/core/connection/src/commonMain/kotlin/io/writeopia/di/AppConnectionInjection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ class AppConnectionInjection private constructor(
) {
private var httpClient: HttpClient? = null

private var _tokenJwt: String? = null
private fun token() = _tokenJwt

fun setJwtToken(token: String) {
_tokenJwt = token
}
// private var _tokenJwt: String? = null
// private fun token() = _tokenJwt
//
// fun setJwtToken(token: String) {
// _tokenJwt = token
// }

fun provideJson() = json

fun provideHttpClient(): HttpClient = httpClient ?:
ApiInjectorDefaults.httpClient(json, apiLogger, token() ?: "").also {
ApiInjectorDefaults.httpClient(json, apiLogger).also {
httpClient = it
}

Expand All @@ -51,18 +51,13 @@ class AppConnectionInjection private constructor(
object ApiInjectorDefaults {
fun httpClient(
json: Json,
apiLogger: Logger,
tokenJwt: String
apiLogger: Logger
) = HttpClient {
install(HttpTimeout) {
requestTimeoutMillis = 300000
socketTimeoutMillis = 300000
}

install(DefaultRequest) {
header(HttpHeaders.Authorization, "Bearer $tokenJwt")
}

install(ContentNegotiation) {
json(json = json)
}
Expand Down
15 changes: 0 additions & 15 deletions application/core/documents/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="61" column="42" source="standard:chain-method-continuation" />
<error line="61" column="48" source="standard:chain-method-continuation" />
</file>
<file name="src/androidMain/kotlin/io/writeopia/core/folders/di/InDocumentSearchInjection.android.kt">
<error line="7" column="74" source="standard:function-expression-body" />
</file>
Expand All @@ -17,25 +13,14 @@
</file>
<file name="src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/FolderRepositorySqlDelight.kt">
<error line="21" column="21" source="standard:function-expression-body" />
<error line="60" column="18" source="standard:chain-method-continuation" />
<error line="66" column="40" source="standard:function-expression-body" />
<error line="67" column="25" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/InMemoryFolderRepository.kt">
<error line="39" column="40" source="standard:function-expression-body" />
<error line="75" column="51" source="standard:function-expression-body" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/NotesUseCase.kt">
<error line="41" column="25" source="standard:chain-method-continuation" />
<error line="52" column="27" source="standard:chain-method-continuation" />
<error line="91" column="20" source="standard:chain-method-continuation" />
<error line="218" column="20" source="standard:chain-method-continuation" />
<error line="218" column="47" source="standard:chain-method-continuation" />
<error line="270" column="31" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/RoomFolderRepository.kt">
<error line="14" column="23" source="standard:class-signature" />
<error line="112" column="22" source="standard:chain-method-continuation" />
</file>
<file name="src/jsMain/kotlin/io/writeopia/core/folders/di/InDocumentSearchInjection.js.kt">
<error line="7" column="74" source="standard:function-expression-body" />
Expand Down
9 changes: 0 additions & 9 deletions application/core/forcegraph/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="55" column="42" source="standard:chain-method-continuation" />
<error line="55" column="48" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/forcegraph/ForceDirectedGraph.kt">
<error line="68" column="30" source="standard:chain-method-continuation" />
<error line="79" column="13" source="standard:chain-method-continuation" />
<error line="83" column="45" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/forcegraph/model/Graph.kt">
<error line="6" column="18" source="standard:class-signature" />
<error line="6" column="55" source="standard:class-signature" />
Expand Down
8 changes: 0 additions & 8 deletions application/core/navigation/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="54" column="42" source="standard:chain-method-continuation" />
<error line="54" column="48" source="standard:chain-method-continuation" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/navigation/notes/NoteNavigation.kt">
<error line="11" column="42" source="standard:chain-method-continuation" />
<error line="11" column="54" source="standard:chain-method-continuation" />
</file>
</baseline>
7 changes: 0 additions & 7 deletions application/core/ollama/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
<error line="56" column="83" source="standard:function-expression-body" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/api/OllamaApi.kt">
<error line="58" column="15" source="standard:chain-method-continuation" />
<error line="69" column="19" source="standard:chain-method-continuation" />
<error line="78" column="43" source="standard:chain-method-continuation" />
<error line="83" column="33" source="standard:chain-method-continuation" />
<error line="112" column="35" source="standard:chain-method-continuation" />
<error line="116" column="17" source="standard:chain-method-continuation" />
<error line="132" column="23" source="standard:chain-method-continuation" />
<error line="193" column="72" source="standard:function-expression-body" />
</file>
<file name="src/commonMain/kotlin/io/writeopia/model/OllamaConfig.kt">
Expand Down
4 changes: 0 additions & 4 deletions application/core/persistence_bridge/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build.gradle.kts">
<error line="56" column="42" source="standard:chain-method-continuation" />
<error line="56" column="48" source="standard:chain-method-continuation" />
</file>
</baseline>
Loading