-
Notifications
You must be signed in to change notification settings - Fork 0
fix(tv): open VLC with the account download token, not the access token #281
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
Merged
Merged
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
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
80 changes: 80 additions & 0 deletions
80
app/src/test/kotlin/io/putdotio/android/files/SdkFilesStreamUrlsTest.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,80 @@ | ||
| package io.putdotio.android.files | ||
|
|
||
| import io.putdotio.sdk.PutioClient | ||
| import io.putdotio.sdk.PutioConfig | ||
| import kotlinx.coroutines.runBlocking | ||
| import okhttp3.Interceptor | ||
| import okhttp3.MediaType.Companion.toMediaType | ||
| import okhttp3.OkHttpClient | ||
| import okhttp3.Protocol | ||
| import okhttp3.Response | ||
| import okhttp3.ResponseBody.Companion.toResponseBody | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Test | ||
|
|
||
| class SdkFilesStreamUrlsTest { | ||
| @Test | ||
| fun externalPlayerUrlsCarryTheDownloadTokenNeverTheAccessToken() = runBlocking { | ||
| val requests = mutableListOf<String>() | ||
| val client = client(requests, downloadToken = "\"$DOWNLOAD_TOKEN\"") | ||
|
|
||
| val result = SdkFilesStreamUrls(client).originalStreamUrl(FilesItemId(42L)) | ||
|
|
||
| val url = (result as FilesStreamUrlResult.Ready).url | ||
| assertEquals("https://api.put.io/v2/files/42/stream?oauth_token=$DOWNLOAD_TOKEN", url) | ||
| assertFalse(url.contains(ACCESS_TOKEN)) | ||
| assertFalse(result.toString().contains(DOWNLOAD_TOKEN)) | ||
| assertTrue(requests.single().endsWith("/account/info?download_token=1")) | ||
| } | ||
|
|
||
| @Test | ||
| fun aMissingDownloadTokenFailsInsteadOfFallingBackToTheAccessToken() = runBlocking { | ||
| val result = SdkFilesStreamUrls(client(mutableListOf(), downloadToken = null)) | ||
| .originalStreamUrl(FilesItemId(42L)) | ||
|
|
||
| assertEquals(FilesStreamUrlResult.DownloadTokenUnavailable, result) | ||
| } | ||
|
|
||
| @Test | ||
| fun aRejectedSessionIsTheSessionVerdict() = runBlocking { | ||
| val result = SdkFilesStreamUrls(client(mutableListOf(), downloadToken = null, status = 401)) | ||
| .originalStreamUrl(FilesItemId(42L)) | ||
|
|
||
| assertTrue((result as FilesStreamUrlResult.Failure).failure is FilesFailure.AuthenticationRequired) | ||
| } | ||
|
|
||
| private fun client(requests: MutableList<String>, downloadToken: String?, status: Int = 200): PutioClient { | ||
| val body = if (status == 200) accountInfo(downloadToken) else UNAUTHORIZED | ||
| val http = OkHttpClient.Builder() | ||
| .addInterceptor( | ||
| Interceptor { chain -> | ||
| requests += chain.request().url.toString() | ||
| Response.Builder() | ||
| .request(chain.request()) | ||
| .protocol(Protocol.HTTP_1_1) | ||
| .code(status) | ||
| .message("") | ||
| .body(body.toResponseBody("application/json".toMediaType())) | ||
| .build() | ||
| }, | ||
| ) | ||
| .build() | ||
| return PutioClient(PutioConfig(accessToken = ACCESS_TOKEN), http) | ||
| } | ||
|
|
||
| private fun accountInfo(downloadToken: String?): String = | ||
| """ | ||
| {"status":"OK","info":{"user_id":1,"username":"u","mail":"u@example.com","avatar_url":"", | ||
| "disk":{"avail":1,"size":1,"used":0},"settings":{"sort_by":"NAME_ASC"}, | ||
| "account_status":"active","download_token":${downloadToken ?: "null"}}} | ||
| """.trimIndent() | ||
|
|
||
| private companion object { | ||
| const val ACCESS_TOKEN = "full-oauth-access-token" | ||
| const val DOWNLOAD_TOKEN = "narrow-download-token" | ||
| const val UNAUTHORIZED = | ||
| """{"status":"ERROR","error_type":"invalid_grant","error_message":"Unauthorized","status_code":401}""" | ||
| } | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added in 65c8a8d:
TvSessionViewModelTestnow stubs a 401 stream lookup and asserts it becomes the session verdict that survives dismissal, which fails with the wiring removed. It also checks that a missing download token or another failure records no verdict.