PostsSystem/core
1
0
Fork 0
Code Issues Pull Requests1 Projects Releases Wiki Activity

fixes in auth

Browse Source
This commit is contained in:
InsanusMokrassar
2022-05-20 00:15:49 +06:00
parent f835dc1557
commit b73df49925
18 changed files with 52 additions and 27 deletions
features
auth
client
src
commonMain
kotlin
dev
inmo
postssystem
features
auth
client
ModuleLoader.kt
jsMain
kotlin
dev
inmo
postssystem
features
auth
client
AuthView.kt
server
src
jvmMain
kotlin
dev
inmo
postssystem
features
auth
server
AuthenticationRoutingConfigurator.kt
common
client
src
commonMain
kotlin
dev
inmo
postssystem
features
common
common
DefaultModules.ktDefaultQualifiers.ktModuleLoader.kt
ui
fsm
UIFSM.kt
server
src
jvmMain
kotlin
dev
inmo
postssystem
features
common
server
ApplicationAuthenticationConfigurator.ktQualifiers.ktServerModuleLoader.kt
content
binary
server
src
jvmMain
kotlin
dev
inmo
postssystem
features
content
binary
server
BinaryContentServerModuleLoader.kt
text
server
src
jvmMain
kotlin
dev
inmo
postssystem
features
content
text
server
TextContentServerModuleLoader.kt
roles
server
src
jvmMain
kotlin
dev
inmo
postssystem
features
roles
server
UsersRolesAuthenticationConfigurator.kt
gradle
libs.versions.toml
publicators/simple/server/src/jvmMain/kotlin/dev/inmo/postssystem/publicators/simple/server
SimplePublicationTriggerLoaderServer.kt
server/src/main/java/dev/inmo/postssystem/server
Config.ktDI.kt
targets/telegram/loader/server/src/jvmMain/kotlin/dev/inmo/postssystem/targets/telegram/loader/server
TelegramTargetServerModuleLoader.kt

2
server/src/main/java/dev/inmo/postssystem/server/Config.kt

@ -1,6 +1,6 @@
package dev.inmo.postssystem.server
import dev.inmo.postssystem.features.common.server.sessions.ServerModuleLoader
import dev.inmo.postssystem.features.common.server.ServerModuleLoader
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import java.io.File

18
server/src/main/java/dev/inmo/postssystem/server/DI.kt

@ -3,10 +3,9 @@ package dev.inmo.postssystem.server
import dev.inmo.postssystem.features.auth.server.AuthenticationRoutingConfigurator
import dev.inmo.postssystem.features.auth.server.SessionAuthenticationConfigurator
import dev.inmo.postssystem.features.auth.server.tokens.*
import dev.inmo.postssystem.features.common.server.sessions.ApplicationAuthenticationConfigurator
import dev.inmo.postssystem.features.common.server.ApplicationAuthenticationConfigurator
import dev.inmo.postssystem.features.files.common.*
import dev.inmo.postssystem.features.files.common.storage.*
import dev.inmo.postssystem.features.files.common.storage.WriteFilesStorage
import dev.inmo.postssystem.features.files.server.FilesRoutingConfigurator
import dev.inmo.postssystem.features.roles.common.*
import dev.inmo.postssystem.features.roles.common.keyvalue.KeyValuesRolesOriginalRepo
@ -25,7 +24,7 @@ import dev.inmo.micro_utils.ktor.server.createKtorServer
import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo
import dev.inmo.postssystem.features.common.common.*
import dev.inmo.postssystem.features.common.server.sessions.Qualifiers
import dev.inmo.postssystem.features.common.server.Qualifiers
import dev.inmo.postssystem.features.content.common.*
import dev.inmo.postssystem.features.content.server.ServerContentStorageAggregator
import dev.inmo.postssystem.features.content.server.storage.*
@ -49,6 +48,7 @@ import org.jetbrains.exposed.sql.Database
import org.koin.core.module.Module
import org.koin.core.parameter.ParametersHolder
import org.koin.core.qualifier.StringQualifier
import org.koin.core.qualifier.named
import org.koin.dsl.*
import java.io.File
@ -94,6 +94,7 @@ fun getDIModule(
singleWithBinds { get<Config>().databaseConfig }
singleWithBinds { get<Config>().authConfig }
singleWithBinds(Qualifiers.filesFolderQualifier) { get<Config>().filesFolderFile }
singleWithBinds(Qualifiers.commonFilesFolderQualifier) { File(get<Config>().filesFolderFile, "common").apply { mkdirs() } }
singleWithBinds { get<DatabaseConfig>().database }
singleWithBinds { ExposedUsersStorage(get()) }
@ -141,6 +142,17 @@ fun getDIModule(
)
}
singleWithBinds<FilesStorage> {
val metasRepo = MetasKeyValueRepo(
get(),
ExposedKeyValueRepo(get(), { text("fileid") }, { text("metaInfo") }, "CommonFilesMetaInfoTable")
)
DefaultFilesStorage(
DiskReadFilesStorage(get(Qualifiers.commonFilesFolderQualifier), metasRepo),
WriteDistFilesStorage(get(Qualifiers.commonFilesFolderQualifier), metasRepo)
)
}
// Routing configurators
singleWithBinds { FilesRoutingConfigurator(get(), null, get()) }
singleWithBinds { StatusRoutingConfigurator }