From 9be9f01f1f2ceddc4be969dff07fce387362a728 Mon Sep 17 00:00:00 2001
From: student-d-sherstnev <sherstnev.denis.v@gmail.com>
Date: Wed, 25 Feb 2026 14:59:43 +0300
Subject: [PATCH] aes encryption returned

---
 .../ru/myitschool/work/data/AESEncryption.kt  | 58 +++++++++++++++++++
 .../work/data/repo/AuthRepository.kt          | 12 +++-
 .../work/data/source/NetworkDataSource.kt     |  2 -
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/ru/myitschool/work/data/AESEncryption.kt

diff --git a/app/src/main/java/ru/myitschool/work/data/AESEncryption.kt b/app/src/main/java/ru/myitschool/work/data/AESEncryption.kt
new file mode 100644
index 0000000..00e2a8b
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/data/AESEncryption.kt
@@ -0,0 +1,58 @@
+package ru.myitschool.work.data
+
+import android.util.Base64
+import javax.crypto.Cipher
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+
+object AESEncyption {
+
+    const val secretKey = "tK5Ugskdkipokuodvknfdk3434weofnf="
+    const val salt = "QLlGNHNhYTJTQWZ2bGhpV3U="
+    const val iv = "bVQqNFNhRkQ1Njc4UUFaPA=="
+
+    fun encrypt(strToEncrypt: String): String? {
+        try {
+            val ivParameterSpec = IvParameterSpec(Base64.decode(iv, Base64.DEFAULT))
+
+            val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1")
+            val spec =
+                PBEKeySpec(secretKey.toCharArray(), Base64.decode(salt, Base64.DEFAULT), 10000, 256)
+            val tmp = factory.generateSecret(spec)
+            val secretKey = SecretKeySpec(tmp.encoded, "AES")
+
+            val cipher = Cipher.getInstance("AES/CBC/PKCS7Padding")
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivParameterSpec)
+            return Base64.encodeToString(
+                cipher.doFinal(strToEncrypt.toByteArray(Charsets.UTF_8)),
+                Base64.DEFAULT
+            )
+        } catch (e: Exception) {
+            println("Error while encrypting: $e")
+        }
+        return null
+    }
+
+    fun decrypt(strToDecrypt: String?): String? {
+        try {
+
+            val ivParameterSpec = IvParameterSpec(Base64.decode(iv, Base64.DEFAULT))
+
+            val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1")
+            val spec =
+                PBEKeySpec(secretKey.toCharArray(), Base64.decode(salt, Base64.DEFAULT), 10000, 256)
+            val tmp = factory.generateSecret(spec)
+            val secretKey = SecretKeySpec(tmp.encoded, "AES")
+
+            val cipher = Cipher.getInstance("AES/CBC/PKCS7Padding")
+            cipher.init(Cipher.DECRYPT_MODE, secretKey, ivParameterSpec)
+            return String(cipher.doFinal(Base64.decode(strToDecrypt, Base64.DEFAULT)))
+        } catch (e: Exception) {
+            println("Error while decrypting: $e")
+        }
+        return null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt b/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt
index 4bc2869..8dffc44 100644
--- a/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt
+++ b/app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt
@@ -8,6 +8,7 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.firstOrNull
 import ru.myitschool.work.App
+import ru.myitschool.work.data.AESEncyption
 import ru.myitschool.work.data.dto.AuthRequestDto
 import ru.myitschool.work.data.dto.AuthResponseDto
 import ru.myitschool.work.data.source.NetworkDataSource
@@ -21,10 +22,12 @@ object AuthRepository {
     suspend fun checkAndSave(login: String, password: String): Result<AuthResponseDto> {
         val data = AuthRequestDto(login=login, password=password)
         return NetworkDataSource.checkAuth(data).onSuccess { success ->
-            if (tokenCache != null) {
+            val encryptedTokenCache = AESEncyption.encrypt(success.token)
+            tokenCache = encryptedTokenCache
+            if (encryptedTokenCache != null) {
                 App.context.userDataStore.edit { preferences ->
                     val prefKey = stringPreferencesKey(TOKEN_KEY)
-                    preferences[prefKey] = success.token
+                    preferences[prefKey] = encryptedTokenCache
                 }
             }
         }
@@ -38,7 +41,10 @@ object AuthRepository {
                     preferences[stringPreferencesKey(TOKEN_KEY)]
                 }
         }
-        return tokenCache
+        if (tokenCache != null) {
+            return AESEncyption.decrypt(tokenCache)
+        }
+        return null
     }
 
     suspend fun logout() {
diff --git a/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt b/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
index a69e7b4..dee42cb 100644
--- a/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
+++ b/app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
@@ -1,6 +1,5 @@
 package ru.myitschool.work.data.source
 
-import android.util.Log
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.cio.CIO
@@ -47,7 +46,6 @@ object NetworkDataSource {
                 contentType(ContentType.Application.Json)
                 setBody(data)
             }
-            Log.d("testlog", response.status.toString())
             when (response.status) {
                 HttpStatusCode.OK -> response.body<AuthResponseDto>()
                 else -> error(response.bodyAsText())