Just a test commit for investigation

orchestr7 · Sep 8, 2024 · 93c9158 · 93c9158
1 parent bf62d7d
commit 93c9158
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/backend/src/main/kotlin/ru/posidata/backend/controller/UserController.kt b/backend/src/main/kotlin/ru/posidata/backend/controller/UserController.kt
@@ -18,11 +18,11 @@ class UserController(
 ) {
     @GetMapping("/get")
     fun getResults(
-        @RequestParam authDate: Int,
+        @RequestParam authDate: Long,
         @RequestParam firstName: String,
         @RequestParam lastName: String,
         @RequestParam hash: String,
-        @RequestParam id: Int,
+        @RequestParam id: Long,
         @RequestParam photoUrl: String,
         @RequestParam username: String,
     ): ResponseEntity<Any> {
@@ -38,6 +38,7 @@ class UserController(
         println("Received a request to get results from $user. Converted to map: ${user.convertToMap()}")
 
         if(!telegramAuthService.isValidHash(user.convertToMap(), user.hash)) {
+            println("Validation unsuccessful for ${user.username}")
             return ResponseEntity(HttpStatus.FORBIDDEN)
         }
 
@@ -49,11 +50,11 @@ class UserController(
 
     @GetMapping("/update")
     fun submitAnswer(
-        @RequestParam authDate: Int,
+        @RequestParam authDate: Long,
         @RequestParam firstName: String,
         @RequestParam lastName: String,
         @RequestParam hash: String,
-        @RequestParam id: Int,
+        @RequestParam id: Long,
         @RequestParam photoUrl: String,
         @RequestParam username: String,
         @RequestParam isNextRound: Boolean

diff --git a/common/src/commonMain/kotlin/ru/posidata/common/UserDataFromTelegram.kt b/common/src/commonMain/kotlin/ru/posidata/common/UserDataFromTelegram.kt
@@ -4,11 +4,11 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class UserDataFromTelegram (
-    val authDate: Int,
+    val authDate: Long,
     val firstName: String,
     val lastName: String,
     val hash: String,
-    val id: Int,
+    val id: Long,
     val photoUrl: String,
     val username: String,
 ) {

diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/main/Welcome.kt
@@ -156,6 +156,7 @@ val welcomeCard = FC<WelcomeCardProps> { props ->
                             photoUrl = user.photo_url,
                             username = user.username,
                         )
+                        console.log(feUser.convertToMap())
                         props.setTgUser(feUser)
                     }
                 }

diff --git a/frontend/src/jsMain/kotlin/ru/posidata/views/utils/externals/telegram/TUser.kt b/frontend/src/jsMain/kotlin/ru/posidata/views/utils/externals/telegram/TUser.kt
@@ -5,11 +5,11 @@ package ru.posidata.views.utils.externals.telegram
 
 @JsName("TUser")
 external interface TUser {
-    var auth_date: Int
+    var auth_date: Long
     var first_name: String
     var last_name: String
     var hash: String
-    var id: Int
+    var id: Long
     var photo_url: String
     var username: String
 }