DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Structure fix

Browse Source
This commit is contained in:
Universall 2025-02-18 18:26:22 +03:00
parent 67c19c7edd
commit d06d9acb35
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenManager.java → app/src/main/java/com/displaynone/acss/components/auth/internal_utils/AuthTokenManager.java
View File

@ -1,4 +1,4 @@
package com.displaynone.acss.components.auth.models.user; package com.displaynone.acss.components.auth.internal_utils;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -8,6 +8,8 @@ import androidx.security.crypto.EncryptedSharedPreferences;
import androidx.security.crypto.MasterKeys; import androidx.security.crypto.MasterKeys;
import com.displaynone.acss.components.auth.models.AuthTokenPair;
import java.io.IOException; import java.io.IOException;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;

2
app/src/main/java/com/displaynone/acss/components/auth/models/user/AuthTokenPair.kt → app/src/main/java/com/displaynone/acss/components/auth/models/AuthTokenPair.kt
View File

@ -1,4 +1,4 @@
package com.displaynone.acss.components.auth.models.user package com.displaynone.acss.components.auth.models
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

5
app/src/main/java/com/displaynone/acss/components/auth/models/user/TokenManager.kt
View File

@ -1,5 +0,0 @@
package com.displaynone.acss.components.auth.models.user
class TokenManager {
//TODO()
}

6
app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt
View File

@ -1,6 +1,7 @@
package com.displaynone.acss.components.auth.models.user package com.displaynone.acss.components.auth.models.user
import android.content.Context import android.content.Context
import com.displaynone.acss.components.auth.internal_utils.AuthTokenManager
import com.displaynone.acss.components.auth.models.user.repository.UserRepository import com.displaynone.acss.components.auth.models.user.repository.UserRepository
import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO
@ -15,7 +16,10 @@ class UserServiceST(
fun createInstance(context: Context) { fun createInstance(context: Context) {
if (instance == null) { if (instance == null) {
val tokenManager = AuthTokenManager(context) val tokenManager =
AuthTokenManager(
context
)
instance = UserServiceST(tokenManager) instance = UserServiceST(tokenManager)
} }
} }

6
app/src/main/java/com/displaynone/acss/components/auth/models/user/repository/UserRepository.kt
View File

@ -1,13 +1,11 @@
package com.displaynone.acss.components.auth.models.user.repository package com.displaynone.acss.components.auth.models.user.repository
import android.util.Log import android.util.Log
import com.displaynone.acss.components.auth.models.user.AuthTokenManager import com.displaynone.acss.components.auth.models.AuthTokenPair
import com.displaynone.acss.components.auth.models.user.AuthTokenPair
import com.displaynone.acss.config.Constants.serverUrl import com.displaynone.acss.config.Constants.serverUrl
import com.displaynone.acss.config.Network import com.displaynone.acss.config.Network
import com.displaynone.acss.components.auth.models.user.repository.dto.RegisterUserDto import com.displaynone.acss.components.auth.models.user.repository.dto.RegisterUserDto
import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO import com.displaynone.acss.components.auth.models.user.repository.dto.UserDTO
import com.google.gson.Gson
import io.ktor.client.call.body import io.ktor.client.call.body
import io.ktor.client.request.get import io.ktor.client.request.get
import io.ktor.client.request.headers import io.ktor.client.request.headers
@ -24,8 +22,6 @@ import io.ktor.http.encodeURLPath
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlin.math.log
class UserRepository( class UserRepository(