From d074f29b825d6c8b546e51bc4554d45845bdb643 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 22 Jan 2021 23:52:16 +0600 Subject: [PATCH 1/4] start 0.4.21 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74476c33e82..a8a780d8d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.4.21 + ## 0.4.20 * `Serialization` diff --git a/gradle.properties b/gradle.properties index cec7824686e..79800e2f326 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,5 +40,5 @@ dokka_version=1.4.20 # Project data group=dev.inmo -version=0.4.20 -android_code_version=24 +version=0.4.21 +android_code_version=25 From a4020cb4842dc32476a26d9f5786f5be6342256f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 23 Jan 2021 11:43:40 +0600 Subject: [PATCH 2/4] create crypto project --- .../micro_utils/common/ByteArrayDataView.kt | 15 ++++ .../ByteArrayBlob.kt | 10 +++ crypto/build.gradle | 30 ++++++++ .../dev/inmo/micro_utils/crypto/Base64.kt | 77 +++++++++++++++++++ .../dev/inmo/micro_utils/crypto/Common.kt | 11 +++ .../kotlin/dev/inmo/micro_utils/crypto/MD5.kt | 6 ++ .../dev/inmo/micro_utils/crypto/MD5Test.kt | 17 ++++ .../dev/inmo/micro_utils/crypto/CryptoJs.kt | 9 +++ .../inmo/micro_utils/crypto/MD5Realization.kt | 3 + .../inmo/micro_utils/crypto/MD5Realization.kt | 9 +++ crypto/src/main/AndroidManifest.xml | 1 + gradle.properties | 4 + settings.gradle | 1 + 13 files changed, 193 insertions(+) create mode 100644 common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ByteArrayDataView.kt create mode 100644 coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/ByteArrayBlob.kt create mode 100644 crypto/build.gradle create mode 100644 crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Base64.kt create mode 100644 crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Common.kt create mode 100644 crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/MD5.kt create mode 100644 crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/MD5Test.kt create mode 100644 crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt create mode 100644 crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt create mode 100644 crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt create mode 100644 crypto/src/main/AndroidManifest.xml diff --git a/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ByteArrayDataView.kt b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ByteArrayDataView.kt new file mode 100644 index 00000000000..71cb0468f89 --- /dev/null +++ b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ByteArrayDataView.kt @@ -0,0 +1,15 @@ +package dev.inmo.micro_utils.common + +import org.khronos.webgl.* + +fun DataView.toByteArray() = ByteArray(this.byteLength) { + getInt8(it) +} + +fun ArrayBuffer.toByteArray() = Int8Array(this) as ByteArray + +fun ByteArray.toDataView() = DataView(ArrayBuffer(size)).also { + forEachIndexed { i, byte -> it.setInt8(i, byte) } +} + +fun ByteArray.toArrayBuffer() = toDataView().buffer diff --git a/coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/ByteArrayBlob.kt b/coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/ByteArrayBlob.kt new file mode 100644 index 00000000000..e118398d56e --- /dev/null +++ b/coroutines/src/jsMain/kotlin/dev.inmo.micro_utils.coroutines/ByteArrayBlob.kt @@ -0,0 +1,10 @@ +package dev.inmo.micro_utils.coroutines + +import kotlinx.coroutines.await +import org.khronos.webgl.Int8Array +import org.w3c.fetch.Response +import org.w3c.files.Blob + +suspend fun Blob.toByteArray() = Int8Array( + Response(this).arrayBuffer().await() +) as ByteArray diff --git a/crypto/build.gradle b/crypto/build.gradle new file mode 100644 index 00000000000..5759368da46 --- /dev/null +++ b/crypto/build.gradle @@ -0,0 +1,30 @@ +plugins { + id "org.jetbrains.kotlin.multiplatform" + id "org.jetbrains.kotlin.plugin.serialization" + id "com.android.library" +} + +apply from: "$mppProjectWithSerializationPresetPath" + +kotlin { + sourceSets { + commonMain { + dependencies { + api project(":micro_utils.common") + } + } + jsMain { + dependencies { + api npm("crypto-js", "$crypto_js_version") + } + } + } +} + +android { + sourceSets { + main { + java.srcDirs += [ "src/jvmMain/kotlin" ] + } + } +} diff --git a/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Base64.kt b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Base64.kt new file mode 100644 index 00000000000..8eff015e7b6 --- /dev/null +++ b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Base64.kt @@ -0,0 +1,77 @@ +package dev.inmo.micro_utils.crypto + +import kotlin.experimental.and + +private const val BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" +private const val BASE64_MASK: Byte = 0x3f +private const val BASE64_PAD = '=' +private val BASE64_INVERSE_ALPHABET = IntArray(256) { + BASE64_ALPHABET.indexOf(it.toChar()) +} + +internal fun Int.toBase64(): Char = BASE64_ALPHABET[this] +internal fun Byte.fromBase64(): Byte = BASE64_INVERSE_ALPHABET[toInt() and 0xff].toByte() and BASE64_MASK + +typealias EncodedBase64String = String +typealias EncodedByteArray = ByteArray + +fun SourceString.encodeBase64String(): EncodedBase64String = encodeToByteArray().encodeBase64String() +fun SourceString.encodeBase64(): EncodedByteArray = encodeToByteArray().encodeBase64() + +fun SourceBytes.encodeBase64String(): EncodedBase64String = buildString { + var i = 0 + while (this@encodeBase64String.size > i) { + val read = kotlin.math.min(3, this@encodeBase64String.size - i) + val data = ByteArray(3) { + if (it < read) { + this@encodeBase64String[it + i] + } else { + 0 + } + } + + val padSize = (data.size - read) * 8 / 6 + val chunk = ((data[0].toInt() and 0xFF) shl 16) or + ((data[1].toInt() and 0xFF) shl 8) or + (data[2].toInt() and 0xFF) + + for (index in data.size downTo padSize) { + val char = (chunk shr (6 * index)) and BASE64_MASK.toInt() + append(char.toBase64()) + } + + repeat(padSize) { append(BASE64_PAD) } + + i += read + } +} +fun SourceBytes.encodeBase64(): EncodedByteArray = encodeBase64String().encodeToByteArray() + +fun EncodedBase64String.decodeBase64(): SourceBytes = dropLastWhile { it == BASE64_PAD }.encodeToByteArray().decodeBase64() +fun EncodedBase64String.decodeBase64String(): SourceString = decodeBase64().decodeToString() + +fun EncodedByteArray.decodeBase64(): SourceBytes { + val result = mutableListOf() + val data = ByteArray(4) + (0 until size step 4).forEach { i -> + var read = 0 + for (j in 0 until 4) { + if (j + i < size) { + data[j] = get(j + i) + read++ + } else { + break + } + } + val chunk = data.foldIndexed(0) { index, result, current -> + result or (current.fromBase64().toInt() shl ((3 - index) * 6)) + } + for (index in data.size - 2 downTo (data.size - read)) { + val origin = (chunk shr (8 * index)) and 0xff + result.add(origin.toByte()) + } + } + + return result.toByteArray() +} +fun EncodedByteArray.decodeBase64String(): SourceString = decodeBase64().decodeToString() diff --git a/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Common.kt b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Common.kt new file mode 100644 index 00000000000..aa5556096f1 --- /dev/null +++ b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Common.kt @@ -0,0 +1,11 @@ +package dev.inmo.micro_utils.crypto + +/** + * This typealias shows that corresponding [ByteArray] is an raw data + */ +typealias SourceBytes = ByteArray +/** + * This typealias shows that corresponding [String] is an raw data + */ +typealias SourceString = String + diff --git a/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/MD5.kt b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/MD5.kt new file mode 100644 index 00000000000..76ad1fa9560 --- /dev/null +++ b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/MD5.kt @@ -0,0 +1,6 @@ +package dev.inmo.micro_utils.crypto + +typealias MD5 = String + +expect fun SourceBytes.md5(): MD5 +fun SourceString.md5(): MD5 = encodeToByteArray().md5() diff --git a/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/MD5Test.kt b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/MD5Test.kt new file mode 100644 index 00000000000..73eda2b665f --- /dev/null +++ b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/MD5Test.kt @@ -0,0 +1,17 @@ +package dev.inmo.micro_utils.crypto + +import kotlin.test.Test +import kotlin.test.assertEquals + +class MD5Test { + val source = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + val expectedMD5 = "db89bb5ceab87f9c0fcc2ab36c189c2c" + @Test + fun testMD5() { + var i = 0 + source.md5().forEach { + assertEquals(expectedMD5[i], it) + i++ + } + } +} diff --git a/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt new file mode 100644 index 00000000000..3f5e90439f8 --- /dev/null +++ b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt @@ -0,0 +1,9 @@ +package dev.inmo.micro_utils.crypto + +external interface CryptoJs { + fun MD5(data: String): String +} + +@JsModule("crypto-js") +@JsNonModule +external val CryptoJS: CryptoJs diff --git a/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt new file mode 100644 index 00000000000..76b6ab556d8 --- /dev/null +++ b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt @@ -0,0 +1,3 @@ +package dev.inmo.micro_utils.crypto + +actual fun SourceBytes.md5(): MD5 = CryptoJS.MD5(decodeToString()) diff --git a/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt b/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt new file mode 100644 index 00000000000..f81644cdf4d --- /dev/null +++ b/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/MD5Realization.kt @@ -0,0 +1,9 @@ +package dev.inmo.micro_utils.crypto + +import java.math.BigInteger +import java.security.MessageDigest + +actual fun SourceBytes.md5(): MD5 = BigInteger( + 1, + MessageDigest.getInstance("MD5").digest(this) +).toString(16) diff --git a/crypto/src/main/AndroidManifest.xml b/crypto/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..20f225901d6 --- /dev/null +++ b/crypto/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 79800e2f326..09bed5cb818 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,6 +33,10 @@ junit_version=4.12 test_ext_junit_version=1.1.2 espresso_core=3.3.0 +# JS NPM + +crypto_js_version=4.0.0 + # Dokka dokka_version=1.4.20 diff --git a/settings.gradle b/settings.gradle index 6034af3c57d..7b43068aaa5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,7 @@ rootProject.name='micro_utils' String[] includes = [ ":common", + ":crypto", ":selector:common", ":pagination:common", ":pagination:exposed", From 48a4246aac55457e1dbfc1bc05404d32f68c3351 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 23 Jan 2021 11:56:58 +0600 Subject: [PATCH 3/4] fill changelog, deprecate base64 in common and update serialization dependencies --- CHANGELOG.md | 15 +++++++++++++++ .../kotlin/dev/inmo/micro_utils/common/Base64.kt | 12 ++++++++++++ .../dev/inmo/micro_utils/common/Base64Text.kt | 2 ++ serialization/base64/build.gradle | 2 +- .../serialization/base64/Base64Serializer.kt | 2 +- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a780d8d2e..23739bba7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ ## 0.4.21 +* `Common` + * `JS` + * Extension `DataView#toByteArray` has been added + * Extension `ArrayBuffer#toByteArray` has been added + * Extension `ByteArray#toDataView` has been added + * Extension `ByteArray#toArrayBuffer` has been added +* `Coroutines` + * `JS` + * Extension `Blob#toByteArray` has been added +* `Crypto` + * Subproject has been created +* `Serialization` + * `Base64` + * Currently, it is not depended on `common` project and use `crypto` instead + ## 0.4.20 * `Serialization` diff --git a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt index cba5c9c01a7..26bdf061c77 100644 --- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt +++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Base64.kt @@ -12,12 +12,19 @@ private val BASE64_INVERSE_ALPHABET = IntArray(256) { internal fun Int.toBase64(): Char = BASE64_ALPHABET[this] internal fun Byte.fromBase64(): Byte = BASE64_INVERSE_ALPHABET[toInt() and 0xff].toByte() and BASE64_MASK +const val replacedInCrypto = "Replaced in crypto subproject" + +@Deprecated(replacedInCrypto, ReplaceWith("EncodedBase64String", "dev.inmo.micro_utils.crypto")) typealias EncodedBase64String = String +@Deprecated(replacedInCrypto, ReplaceWith("EncodedByteArray", "dev.inmo.micro_utils.crypto")) typealias EncodedByteArray = ByteArray +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64String()", "dev.inmo.micro_utils.crypto")) fun String.encodeBase64String(): EncodedBase64String = encodeToByteArray().encodeBase64String() +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64()", "dev.inmo.micro_utils.crypto")) fun String.encodeBase64(): EncodedByteArray = encodeToByteArray().encodeBase64() +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64String()", "dev.inmo.micro_utils.crypto")) fun ByteArray.encodeBase64String(): EncodedBase64String = buildString { var i = 0 while (this@encodeBase64String.size > i) { @@ -45,11 +52,15 @@ fun ByteArray.encodeBase64String(): EncodedBase64String = buildString { i += read } } +@Deprecated(replacedInCrypto, ReplaceWith("encodeBase64()", "dev.inmo.micro_utils.crypto")) fun ByteArray.encodeBase64(): EncodedByteArray = encodeBase64String().encodeToByteArray() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64()", "dev.inmo.micro_utils.crypto")) fun EncodedBase64String.decodeBase64() = dropLastWhile { it == BASE64_PAD }.encodeToByteArray().decodeBase64() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64String()", "dev.inmo.micro_utils.crypto")) fun EncodedBase64String.decodeBase64String() = decodeBase64().decodeToString() +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64()", "dev.inmo.micro_utils.crypto")) fun EncodedByteArray.decodeBase64(): ByteArray { val result = mutableListOf() val data = ByteArray(4) @@ -74,4 +85,5 @@ fun EncodedByteArray.decodeBase64(): ByteArray { return result.toByteArray() } +@Deprecated(replacedInCrypto, ReplaceWith("decodeBase64String()", "dev.inmo.micro_utils.crypto")) fun EncodedByteArray.decodeBase64String() = decodeBase64().decodeToString() diff --git a/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt index 69104f077a1..8fdc9b95b7d 100644 --- a/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt +++ b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/Base64Text.kt @@ -11,6 +11,7 @@ class Base64Text { val testText = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?""" val base64Text = """TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVuaWFtLCBxdWlzIG5vc3RydWQgZXhlcmNpdGF0aW9uIHVsbGFtY28gbGFib3JpcyBuaXNpIHV0IGFsaXF1aXAgZXggZWEgY29tbW9kbyBjb25zZXF1YXQuIER1aXMgYXV0ZSBpcnVyZSBkb2xvciBpbiByZXByZWhlbmRlcml0IGluIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIGNpbGx1bSBkb2xvcmUgZXUgZnVnaWF0IG51bGxhIHBhcmlhdHVyLiBFeGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBzdW50IGluIGN1bHBhIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlkIGVzdCBsYWJvcnVtLgpTZWQgdXQgcGVyc3BpY2lhdGlzIHVuZGUgb21uaXMgaXN0ZSBuYXR1cyBlcnJvciBzaXQgdm9sdXB0YXRlbSBhY2N1c2FudGl1bSBkb2xvcmVtcXVlIGxhdWRhbnRpdW0sIHRvdGFtIHJlbSBhcGVyaWFtLCBlYXF1ZSBpcHNhIHF1YWUgYWIgaWxsbyBpbnZlbnRvcmUgdmVyaXRhdGlzIGV0IHF1YXNpIGFyY2hpdGVjdG8gYmVhdGFlIHZpdGFlIGRpY3RhIHN1bnQgZXhwbGljYWJvLiBOZW1vIGVuaW0gaXBzYW0gdm9sdXB0YXRlbSBxdWlhIHZvbHVwdGFzIHNpdCBhc3Blcm5hdHVyIGF1dCBvZGl0IGF1dCBmdWdpdCwgc2VkIHF1aWEgY29uc2VxdXVudHVyIG1hZ25pIGRvbG9yZXMgZW9zIHF1aSByYXRpb25lIHZvbHVwdGF0ZW0gc2VxdWkgbmVzY2l1bnQuIE5lcXVlIHBvcnJvIHF1aXNxdWFtIGVzdCwgcXVpIGRvbG9yZW0gaXBzdW0gcXVpYSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIsIGFkaXBpc2NpIHZlbGl0LCBzZWQgcXVpYSBub24gbnVtcXVhbSBlaXVzIG1vZGkgdGVtcG9yYSBpbmNpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hbSBhbGlxdWFtIHF1YWVyYXQgdm9sdXB0YXRlbS4gVXQgZW5pbSBhZCBtaW5pbWEgdmVuaWFtLCBxdWlzIG5vc3RydW0gZXhlcmNpdGF0aW9uZW0gdWxsYW0gY29ycG9yaXMgc3VzY2lwaXQgbGFib3Jpb3NhbSwgbmlzaSB1dCBhbGlxdWlkIGV4IGVhIGNvbW1vZGkgY29uc2VxdWF0dXI/IFF1aXMgYXV0ZW0gdmVsIGV1bSBpdXJlIHJlcHJlaGVuZGVyaXQgcXVpIGluIGVhIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIHF1YW0gbmloaWwgbW9sZXN0aWFlIGNvbnNlcXVhdHVyLCB2ZWwgaWxsdW0gcXVpIGRvbG9yZW0gZXVtIGZ1Z2lhdCBxdW8gdm9sdXB0YXMgbnVsbGEgcGFyaWF0dXI/""" + @Test fun decodeEncode() { val encoded = testText.encodeBase64String() @@ -21,6 +22,7 @@ Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium dolor val urlTestText = "https://example.com?isitexample=1" val urlTestBase64Text = "aHR0cHM6Ly9leGFtcGxlLmNvbT9pc2l0ZXhhbXBsZT0x" + @Test fun decodeEncodeUrl() { val encoded = urlTestText.encodeBase64String() diff --git a/serialization/base64/build.gradle b/serialization/base64/build.gradle index 082ce99346a..403f8887d7b 100644 --- a/serialization/base64/build.gradle +++ b/serialization/base64/build.gradle @@ -10,7 +10,7 @@ kotlin { sourceSets { commonMain { dependencies { - api project(":micro_utils.common") + api project(":micro_utils.crypto") } } } diff --git a/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt index 1a623699599..435730f24ac 100644 --- a/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt +++ b/serialization/base64/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/base64/Base64Serializer.kt @@ -1,6 +1,6 @@ package dev.inmo.micro_utils.serialization.base64 -import dev.inmo.micro_utils.common.* +import dev.inmo.micro_utils.crypto.* import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializer import kotlinx.serialization.builtins.serializer From 602ae2385bd3d9a84b8fb1a65035110f92f24818 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 23 Jan 2021 12:02:19 +0600 Subject: [PATCH 4/4] copy base64 test in crypto --- .../dev/inmo/micro_utils/crypto/Base64Text.kt | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Base64Text.kt diff --git a/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Base64Text.kt b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Base64Text.kt new file mode 100644 index 00000000000..92c9170d714 --- /dev/null +++ b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Base64Text.kt @@ -0,0 +1,32 @@ +package dev.inmo.micro_utils.crypto + +import kotlin.test.Test +import kotlin.test.assertEquals + + + +class Base64Text { + + val testText = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?""" + val base64Text = """TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVuaWFtLCBxdWlzIG5vc3RydWQgZXhlcmNpdGF0aW9uIHVsbGFtY28gbGFib3JpcyBuaXNpIHV0IGFsaXF1aXAgZXggZWEgY29tbW9kbyBjb25zZXF1YXQuIER1aXMgYXV0ZSBpcnVyZSBkb2xvciBpbiByZXByZWhlbmRlcml0IGluIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIGNpbGx1bSBkb2xvcmUgZXUgZnVnaWF0IG51bGxhIHBhcmlhdHVyLiBFeGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBzdW50IGluIGN1bHBhIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlkIGVzdCBsYWJvcnVtLgpTZWQgdXQgcGVyc3BpY2lhdGlzIHVuZGUgb21uaXMgaXN0ZSBuYXR1cyBlcnJvciBzaXQgdm9sdXB0YXRlbSBhY2N1c2FudGl1bSBkb2xvcmVtcXVlIGxhdWRhbnRpdW0sIHRvdGFtIHJlbSBhcGVyaWFtLCBlYXF1ZSBpcHNhIHF1YWUgYWIgaWxsbyBpbnZlbnRvcmUgdmVyaXRhdGlzIGV0IHF1YXNpIGFyY2hpdGVjdG8gYmVhdGFlIHZpdGFlIGRpY3RhIHN1bnQgZXhwbGljYWJvLiBOZW1vIGVuaW0gaXBzYW0gdm9sdXB0YXRlbSBxdWlhIHZvbHVwdGFzIHNpdCBhc3Blcm5hdHVyIGF1dCBvZGl0IGF1dCBmdWdpdCwgc2VkIHF1aWEgY29uc2VxdXVudHVyIG1hZ25pIGRvbG9yZXMgZW9zIHF1aSByYXRpb25lIHZvbHVwdGF0ZW0gc2VxdWkgbmVzY2l1bnQuIE5lcXVlIHBvcnJvIHF1aXNxdWFtIGVzdCwgcXVpIGRvbG9yZW0gaXBzdW0gcXVpYSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIsIGFkaXBpc2NpIHZlbGl0LCBzZWQgcXVpYSBub24gbnVtcXVhbSBlaXVzIG1vZGkgdGVtcG9yYSBpbmNpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hbSBhbGlxdWFtIHF1YWVyYXQgdm9sdXB0YXRlbS4gVXQgZW5pbSBhZCBtaW5pbWEgdmVuaWFtLCBxdWlzIG5vc3RydW0gZXhlcmNpdGF0aW9uZW0gdWxsYW0gY29ycG9yaXMgc3VzY2lwaXQgbGFib3Jpb3NhbSwgbmlzaSB1dCBhbGlxdWlkIGV4IGVhIGNvbW1vZGkgY29uc2VxdWF0dXI/IFF1aXMgYXV0ZW0gdmVsIGV1bSBpdXJlIHJlcHJlaGVuZGVyaXQgcXVpIGluIGVhIHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIHF1YW0gbmloaWwgbW9sZXN0aWFlIGNvbnNlcXVhdHVyLCB2ZWwgaWxsdW0gcXVpIGRvbG9yZW0gZXVtIGZ1Z2lhdCBxdW8gdm9sdXB0YXMgbnVsbGEgcGFyaWF0dXI/""" + + @Test + fun decodeEncode() { + val encoded = testText.encodeBase64String() + assertEquals(base64Text, encoded) + val decoded = encoded.decodeBase64String() + assertEquals(testText, decoded) + } + + val urlTestText = "https://example.com?isitexample=1" + val urlTestBase64Text = "aHR0cHM6Ly9leGFtcGxlLmNvbT9pc2l0ZXhhbXBsZT0x" + + @Test + fun decodeEncodeUrl() { + val encoded = urlTestText.encodeBase64String() + assertEquals(urlTestBase64Text, encoded) + val decoded = encoded.decodeBase64String() + assertEquals(urlTestText, decoded) + } +} \ No newline at end of file