InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-06-29 04:47:48 +00:00
Code Releases Activity

update passport data to use Base64StringSerializer

Browse Source
This commit is contained in:
InsanusMokrassar 2021-01-15 16:02:16 +06:00
parent ef22735894
commit 5d87b86afe
10 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/EncryptedData.kt
View File

@ -1,20 +1,23 @@
package dev.inmo.tgbotapi.types.passport package dev.inmo.tgbotapi.types.passport
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
typealias Base64EncodedData = String
typealias EncryptedAndBase64EncodedData = String typealias EncryptedAndBase64EncodedData = String
typealias EncryptedByBotRSAAndBase64EncodedData = String typealias EncryptedByBotPublicKeyData = String
typealias EncryptedData = String typealias EncryptedData = String
@Serializable @Serializable
data class EncryptedCredentials( data class EncryptedCredentials(
@SerialName(dataField) @SerialName(dataField)
val data: EncryptedAndBase64EncodedData, @Serializable(Base64StringSerializer::class)
val data: EncryptedData,
@SerialName(hashField) @SerialName(hashField)
val hash: Base64EncodedData, @Serializable(Base64StringSerializer::class)
val hash: String,
@SerialName(secretField) @SerialName(secretField)
val secret: EncryptedByBotRSAAndBase64EncodedData @Serializable(Base64StringSerializer::class)
val secret: EncryptedByBotPublicKeyData
) )

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Email.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.Base64EncodedData import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithEmail import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithEmail
@ -11,6 +12,7 @@ data class Email(
@SerialName(emailField) @SerialName(emailField)
override val email: String, override val email: String,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : WithEmail { ) : WithEmail {
} }

8
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedAddress.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.dataField import dev.inmo.tgbotapi.types.dataField
import dev.inmo.tgbotapi.types.hashField
import dev.inmo.tgbotapi.types.passport.* import dev.inmo.tgbotapi.types.passport.*
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class EncryptedAddress( data class EncryptedAddress(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, override val data: EncryptedData,
@SerialName(hashField) @Serializable(Base64StringSerializer::class)
override val hash: Base64EncodedData override val hash: String
) : WithData ) : WithData

12
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/EncryptedPersonalDetails.kt
View File

@ -1,9 +1,8 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.dataField import dev.inmo.tgbotapi.types.dataField
import dev.inmo.tgbotapi.types.hashField import dev.inmo.tgbotapi.types.passport.*
import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithData
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -11,7 +10,8 @@ import kotlinx.serialization.Serializable
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class EncryptedPersonalDetails( data class EncryptedPersonalDetails(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, @Serializable(Base64StringSerializer::class)
@SerialName(hashField) override val data: EncryptedData,
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : WithData ) : WithData

11
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/Passport.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.* import dev.inmo.tgbotapi.types.passport.*
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.* import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
@ -12,7 +13,7 @@ sealed class Passport : WithData, WithFrontSide, WithSelfie, Translatable
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class CommonPassport( data class CommonPassport(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, override val data: EncryptedData,
@SerialName(frontSideField) @SerialName(frontSideField)
override val frontSide: PassportFile?, override val frontSide: PassportFile?,
@SerialName(selfieField) @SerialName(selfieField)
@ -20,12 +21,13 @@ data class CommonPassport(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : Passport() ) : Passport()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class InternalPassport( data class InternalPassport(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, override val data: EncryptedData,
@SerialName(frontSideField) @SerialName(frontSideField)
override val frontSide: PassportFile?, override val frontSide: PassportFile?,
@SerialName(selfieField) @SerialName(selfieField)
@ -33,5 +35,6 @@ data class InternalPassport(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : Passport() ) : Passport()

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/PhoneNumber.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.hashField import dev.inmo.tgbotapi.types.hashField
import dev.inmo.tgbotapi.types.passport.Base64EncodedData import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithPhoneNumber import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.WithPhoneNumber
@ -12,6 +13,7 @@ data class PhoneNumber(
@SerialName(phoneNumberField) @SerialName(phoneNumberField)
override val phoneNumber: String, override val phoneNumber: String,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : WithPhoneNumber { ) : WithPhoneNumber {
} }

16
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableFilesCollection.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.Base64EncodedData import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.FilesCollection import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.FilesCollection
@ -17,7 +18,8 @@ data class UtilityBill(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableFilesCollection() ) : TranslatableFilesCollection()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class BankStatement( data class BankStatement(
@ -26,7 +28,8 @@ data class BankStatement(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableFilesCollection() ) : TranslatableFilesCollection()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class RentalAgreement( data class RentalAgreement(
@ -35,7 +38,8 @@ data class RentalAgreement(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableFilesCollection() ) : TranslatableFilesCollection()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class PassportRegistration( data class PassportRegistration(
@ -44,7 +48,8 @@ data class PassportRegistration(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableFilesCollection() ) : TranslatableFilesCollection()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class TemporaryRegistration( data class TemporaryRegistration(
@ -53,6 +58,7 @@ data class TemporaryRegistration(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableFilesCollection() ) : TranslatableFilesCollection()

13
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/TranslatableIDDocument.kt
View File

@ -1,8 +1,9 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data package dev.inmo.tgbotapi.types.passport.encrypted_data
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.Base64EncodedData import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData import dev.inmo.tgbotapi.types.passport.EncryptedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.* import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -13,7 +14,7 @@ sealed class TranslatableIDDocument : WithData, WithFrontSide, WithReverseSide,
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class DriverLicense( data class DriverLicense(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, override val data: EncryptedData,
@SerialName(frontSideField) @SerialName(frontSideField)
override val frontSide: PassportFile?, override val frontSide: PassportFile?,
@SerialName(reverseSideField) @SerialName(reverseSideField)
@ -23,13 +24,14 @@ data class DriverLicense(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableIDDocument() ) : TranslatableIDDocument()
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class IdentityCard( data class IdentityCard(
@SerialName(dataField) @SerialName(dataField)
override val data: EncryptedAndBase64EncodedData, override val data: EncryptedData,
@SerialName(frontSideField) @SerialName(frontSideField)
override val frontSide: PassportFile?, override val frontSide: PassportFile?,
@SerialName(reverseSideField) @SerialName(reverseSideField)
@ -39,5 +41,6 @@ data class IdentityCard(
@SerialName(translationField) @SerialName(translationField)
override val translations: List<PassportFile>, override val translations: List<PassportFile>,
@SerialName(hashField) @SerialName(hashField)
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : TranslatableIDDocument() ) : TranslatableIDDocument()

6
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/EncryptedPassportElement.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.passport.Base64EncodedData import dev.inmo.tgbotapi.types.passport.Base64EncodedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -7,11 +8,12 @@ import kotlinx.serialization.json.JsonObject
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
interface EncryptedPassportElement { interface EncryptedPassportElement {
val hash: Base64EncodedData val hash: String
} }
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
data class UnknownEncryptedPassportElement( data class UnknownEncryptedPassportElement(
val rawJson: JsonObject, val rawJson: JsonObject,
override val hash: Base64EncodedData @Serializable(Base64StringSerializer::class)
override val hash: String
) : EncryptedPassportElement ) : EncryptedPassportElement

3
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted_data/abstracts/WithData.kt
View File

@ -1,10 +1,11 @@
package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts package dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts
import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData import dev.inmo.tgbotapi.types.passport.EncryptedAndBase64EncodedData
import dev.inmo.tgbotapi.types.passport.EncryptedData
import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer import dev.inmo.tgbotapi.types.passport.encrypted_data.EncryptedElementSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@Serializable(EncryptedElementSerializer::class) @Serializable(EncryptedElementSerializer::class)
interface WithData : EncryptedPassportElement { interface WithData : EncryptedPassportElement {
val data: EncryptedAndBase64EncodedData val data: EncryptedData
} }