-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* remove v1 and v2 conversations * update all the tests to compile * remove decrypted messages and only use decoded * remove the ability to create a v2 client entirely * remove contacts and rename to preferences * remove a bunch of classes no longer needed * get all the tests compiling * fix up the wallet address * more clean up * update the example to be v3 only * bring back the frames signer * add back the test * update the frames client to use the new signer * try and get it working * frames client and inboxId * try and get closer on frames validation * all tests passing * fix up the lint * fix the time stamp * upgrade wallet connect * remove example lint
- Loading branch information
1 parent
de8949b
commit 2d294af
Showing
5 changed files
with
174 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
library/src/androidTest/java/org/xmtp/android/library/FramesTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package org.xmtp.android.library | ||
|
|
||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import kotlinx.coroutines.runBlocking | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertNotNull | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.xmtp.android.library.frames.ConversationActionInputs | ||
| import org.xmtp.android.library.frames.DmActionInputs | ||
| import org.xmtp.android.library.frames.FrameActionInputs | ||
| import org.xmtp.android.library.frames.FramePostPayload | ||
| import org.xmtp.android.library.frames.FramesClient | ||
| import org.xmtp.android.library.frames.GetMetadataResponse | ||
| import java.net.HttpURLConnection | ||
| import java.net.URL | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class FramesTest { | ||
| @Test | ||
| fun testFramesClient() { | ||
| val frameUrl = | ||
| "https://fc-polls-five.vercel.app/polls/03710836-bc1d-4921-9e24-89d82015c53b?env=dev" | ||
| val fixtures = fixtures(ClientOptions.Api(XMTPEnvironment.DEV, isSecure = true)) | ||
| val framesClient = FramesClient(xmtpClient = fixtures.alixClient) | ||
| val conversationTopic = "foo" | ||
| val participantAccountAddresses = listOf("alix", "bo") | ||
| val metadata: GetMetadataResponse | ||
| runBlocking { | ||
| metadata = framesClient.proxy.readMetadata(url = frameUrl) | ||
| } | ||
|
|
||
| val dmInputs = DmActionInputs( | ||
| conversationTopic = conversationTopic, | ||
| participantAccountAddresses = participantAccountAddresses | ||
| ) | ||
| val conversationInputs = ConversationActionInputs.Dm(dmInputs) | ||
| val frameInputs = FrameActionInputs( | ||
| frameUrl = frameUrl, | ||
| buttonIndex = 1, | ||
| inputText = null, | ||
| state = null, | ||
| conversationInputs = conversationInputs | ||
| ) | ||
| val signedPayload: FramePostPayload | ||
| runBlocking { | ||
| signedPayload = framesClient.signFrameAction(inputs = frameInputs) | ||
| } | ||
| val postUrl = metadata.extractedTags["fc:frame:post_url"] | ||
| assertNotNull(postUrl) | ||
| val response: GetMetadataResponse | ||
| runBlocking { | ||
| response = framesClient.proxy.post(url = postUrl!!, payload = signedPayload) | ||
| } | ||
|
|
||
| assertEquals(response.extractedTags["fc:frame"], "vNext") | ||
|
|
||
| val imageUrl = response.extractedTags["fc:frame:image"] | ||
| assertNotNull(imageUrl) | ||
|
|
||
| val mediaUrl = framesClient.proxy.mediaUrl(url = imageUrl!!) | ||
|
|
||
| val url = URL(mediaUrl) | ||
| val connection = url.openConnection() as HttpURLConnection | ||
| connection.requestMethod = "GET" | ||
| val responseCode = connection.responseCode | ||
| assertEquals(responseCode, 200) | ||
| assertEquals(connection.contentType, "image/png") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
library/src/main/java/org/xmtp/android/library/frames/FramesClient.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package org.xmtp.android.library.frames | ||
|
|
||
| import android.util.Base64 | ||
| import com.google.protobuf.kotlin.toByteString | ||
| import org.xmtp.android.library.Client | ||
| import org.xmtp.android.library.XMTPException | ||
| import org.xmtp.android.library.frames.FramesConstants.PROTOCOL_VERSION | ||
| import org.xmtp.android.library.hexToByteArray | ||
| import org.xmtp.android.library.toHex | ||
| import org.xmtp.proto.message.contents.Frames.FrameAction | ||
| import org.xmtp.proto.message.contents.Frames.FrameActionBody | ||
| import java.security.MessageDigest | ||
| import java.util.Date | ||
|
|
||
| class FramesClient(private val xmtpClient: Client, var proxy: OpenFramesProxy = OpenFramesProxy()) { | ||
|
|
||
| suspend fun signFrameAction(inputs: FrameActionInputs): FramePostPayload { | ||
| val opaqueConversationIdentifier = buildOpaqueIdentifier(inputs) | ||
| val frameUrl = inputs.frameUrl | ||
| val buttonIndex = inputs.buttonIndex | ||
| val inputText = inputs.inputText | ||
| val state = inputs.state | ||
| val now = Date().time / 1_000 | ||
| val frameActionBuilder = FrameActionBody.newBuilder().also { frame -> | ||
| frame.frameUrl = frameUrl | ||
| frame.buttonIndex = buttonIndex | ||
| frame.opaqueConversationIdentifier = opaqueConversationIdentifier | ||
| frame.unixTimestamp = now.toInt() | ||
| if (inputText != null) { | ||
| frame.inputText = inputText | ||
| } | ||
| if (state != null) { | ||
| frame.state = state | ||
| } | ||
| } | ||
|
|
||
| val toSign = frameActionBuilder.build() | ||
| val signedAction = Base64.encodeToString(buildSignedFrameAction(toSign), Base64.NO_WRAP) | ||
|
|
||
| val untrustedData = FramePostUntrustedData( | ||
| frameUrl, | ||
| now, | ||
| buttonIndex, | ||
| inputText, | ||
| state, | ||
| xmtpClient.address, | ||
| opaqueConversationIdentifier, | ||
| now.toInt() | ||
| ) | ||
| val trustedData = FramePostTrustedData(signedAction) | ||
|
|
||
| return FramePostPayload("xmtp@$PROTOCOL_VERSION", untrustedData, trustedData) | ||
| } | ||
|
|
||
| private fun signDigest(message: String): ByteArray { | ||
| return xmtpClient.signWithInstallationKey(message) | ||
| } | ||
|
|
||
| private fun buildSignedFrameAction(actionBodyInputs: FrameActionBody): ByteArray { | ||
| val digest = sha256(actionBodyInputs.toByteArray()).toHex() | ||
| val signature = signDigest(digest) | ||
|
|
||
| val frameAction = FrameAction.newBuilder().also { | ||
| it.actionBody = actionBodyInputs.toByteString() | ||
| it.installationSignature = signature.toByteString() | ||
| it.installationId = xmtpClient.installationId.hexToByteArray().toByteString() | ||
| it.inboxId = xmtpClient.inboxId | ||
| }.build() | ||
|
|
||
| return frameAction.toByteArray() | ||
| } | ||
|
|
||
| private fun buildOpaqueIdentifier(inputs: FrameActionInputs): String { | ||
| return when (inputs.conversationInputs) { | ||
| is ConversationActionInputs.Group -> { | ||
| val groupInputs = inputs.conversationInputs.inputs | ||
| val combined = groupInputs.groupId + groupInputs.groupSecret | ||
| val digest = sha256(combined) | ||
| Base64.encodeToString(digest, Base64.NO_WRAP) | ||
| } | ||
|
|
||
| is ConversationActionInputs.Dm -> { | ||
| val dmInputs = inputs.conversationInputs.inputs | ||
| val conversationTopic = | ||
| dmInputs.conversationTopic ?: throw XMTPException("No conversation topic") | ||
| val combined = | ||
| conversationTopic.lowercase() + dmInputs.participantAccountAddresses.map { it.lowercase() } | ||
| .sorted().joinToString("") | ||
| val digest = sha256(combined.toByteArray()) | ||
| Base64.encodeToString(digest, Base64.NO_WRAP) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun sha256(input: ByteArray): ByteArray { | ||
| val digest = MessageDigest.getInstance("SHA-256") | ||
| return digest.digest(input) | ||
| } | ||
| } |