-
Notifications
You must be signed in to change notification settings - Fork 3
[codex] Add Pubky Ring auth callbacks #917
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ben-kaufman
wants to merge
1
commit into
master
Choose a base branch
from
codex-pubky-ring-callbacks-913
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+157
−9
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
49 changes: 49 additions & 0 deletions
49
app/src/main/java/to/bitkit/models/PubkyRingAuthCallback.kt
This file contains hidden or 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,49 @@ | ||
| package to.bitkit.models | ||
|
|
||
| import android.net.Uri | ||
|
|
||
| sealed interface PubkyRingAuthCallback { | ||
| companion object { | ||
| private const val BITKIT_SCHEME = "bitkit" | ||
| private const val PUBKY_AUTH_HOST = "pubky-auth" | ||
| private const val SUCCESS_PATH = "/success" | ||
| private const val CANCEL_PATH = "/cancel" | ||
| private const val ERROR_PATH = "/error" | ||
| private const val ERROR_MESSAGE_PARAM = "errorMessage" | ||
|
|
||
| fun parse(uri: Uri): PubkyRingAuthCallback? { | ||
| if (uri.scheme != BITKIT_SCHEME || uri.host != PUBKY_AUTH_HOST) return null | ||
|
|
||
| return when (uri.path) { | ||
| SUCCESS_PATH -> Success | ||
| CANCEL_PATH -> Cancel | ||
| ERROR_PATH -> Error(uri.getQueryParameter(ERROR_MESSAGE_PARAM)) | ||
| else -> null | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data object Success : PubkyRingAuthCallback | ||
| data object Cancel : PubkyRingAuthCallback | ||
| data class Error(val message: String?) : PubkyRingAuthCallback | ||
| } | ||
|
ben-kaufman marked this conversation as resolved.
|
||
|
|
||
| object PubkyRingAuthUrlBuilder { | ||
| const val SUCCESS_CALLBACK = "bitkit://pubky-auth/success" | ||
| const val CANCEL_CALLBACK = "bitkit://pubky-auth/cancel" | ||
| const val ERROR_CALLBACK = "bitkit://pubky-auth/error" | ||
| const val SOURCE = "Bitkit" | ||
|
|
||
| fun addCallbacks(authUrl: String): String? { | ||
| val uri = Uri.parse(authUrl) | ||
| if (uri.scheme.isNullOrBlank()) return null | ||
|
|
||
| return uri.buildUpon() | ||
| .appendQueryParameter("x-success", SUCCESS_CALLBACK) | ||
| .appendQueryParameter("x-cancel", CANCEL_CALLBACK) | ||
| .appendQueryParameter("x-error", ERROR_CALLBACK) | ||
| .appendQueryParameter("x-source", SOURCE) | ||
| .build() | ||
| .toString() | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
49 changes: 49 additions & 0 deletions
49
app/src/test/java/to/bitkit/models/PubkyRingAuthCallbackTest.kt
This file contains hidden or 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,49 @@ | ||
| package to.bitkit.models | ||
|
|
||
| import androidx.core.net.toUri | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
| import org.robolectric.annotation.Config | ||
| import kotlin.test.Test | ||
| import kotlin.test.assertEquals | ||
| import kotlin.test.assertNull | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| @Config(sdk = [34]) | ||
| class PubkyRingAuthCallbackTest { | ||
| @Test | ||
| fun `addCallbacks adds Ring x-callback params`() { | ||
| val url = checkNotNull( | ||
| PubkyRingAuthUrlBuilder.addCallbacks("pubkyauth://auth?relay=https%3A%2F%2Frelay.example"), | ||
| ) { "Auth URL should be valid" } | ||
| val uri = url.toUri() | ||
|
|
||
| assertEquals("https://relay.example", uri.getQueryParameter("relay")) | ||
| assertEquals(PubkyRingAuthUrlBuilder.SUCCESS_CALLBACK, uri.getQueryParameter("x-success")) | ||
| assertEquals(PubkyRingAuthUrlBuilder.CANCEL_CALLBACK, uri.getQueryParameter("x-cancel")) | ||
| assertEquals(PubkyRingAuthUrlBuilder.ERROR_CALLBACK, uri.getQueryParameter("x-error")) | ||
| assertEquals(PubkyRingAuthUrlBuilder.SOURCE, uri.getQueryParameter("x-source")) | ||
| } | ||
|
|
||
| @Test | ||
| fun `parse returns success cancel and error callbacks`() { | ||
| assertEquals( | ||
| PubkyRingAuthCallback.Success, | ||
| PubkyRingAuthCallback.parse("bitkit://pubky-auth/success".toUri()), | ||
| ) | ||
| assertEquals( | ||
| PubkyRingAuthCallback.Cancel, | ||
| PubkyRingAuthCallback.parse("bitkit://pubky-auth/cancel".toUri()), | ||
| ) | ||
| assertEquals( | ||
| PubkyRingAuthCallback.Error("Denied"), | ||
| PubkyRingAuthCallback.parse("bitkit://pubky-auth/error?errorMessage=Denied".toUri()), | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `parse rejects other deeplinks`() { | ||
| assertNull(PubkyRingAuthCallback.parse("bitkit://wallet/success".toUri())) | ||
| assertNull(PubkyRingAuthCallback.parse("https://pubky-auth/success".toUri())) | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.