feat: Password protected public share #1922
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /* | ||
| * Infomaniak kDrive - Android | ||
| * Copyright (C) 2022-2026 Infomaniak Network SA | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -114,7 +114,7 @@ object ApiRoutes { | |
| //region File url | ||
| fun getDownloadFileUrl(file: File): String = with(file) { | ||
| val downloadUrl = if (isPublicShared()) { | ||
| downloadPublicShareFile(driveId, publicShareUuid, id, publicShareAuthToken) | ||
| } else { | ||
| downloadFile(file) | ||
| } | ||
|
|
@@ -124,25 +124,25 @@ object ApiRoutes { | |
|
|
||
| fun getThumbnailUrl(file: File) = with(file) { | ||
| when { | ||
| isPublicShared() -> getPublicShareFileThumbnail(driveId, publicShareUuid, id, publicShareAuthToken) | ||
| isTrashed() -> thumbnailTrashFile(file) | ||
| else -> thumbnailFile(file) | ||
| } | ||
| } | ||
|
|
||
| fun getImagePreviewUrl(file: File): String = with(file) { | ||
| val url = if (isPublicShared()) { | ||
| getPublicShareFilePreview(driveId, publicShareUuid, id, publicShareAuthToken) | ||
| } else { | ||
| imagePreviewFile(file) | ||
| } | ||
|
|
||
| return url.appendQuery("width=2500&height=1500&quality=80") | ||
| } | ||
|
|
||
| fun getOnlyOfficeUrl(file: File) = with(file) { | ||
| if (isPublicShared()) { | ||
| showPublicShareOfficeFile(driveId, publicShareUuid, id, publicShareAuthToken) | ||
| } else { | ||
| "$AUTOLOG_URL?url=${showOffice(file)}" | ||
| } | ||
|
|
@@ -313,38 +313,48 @@ object ApiRoutes { | |
|
|
||
| /** Public Share */ | ||
| //region Public share | ||
| fun getPublicShareInfo(driveId: Int, linkUuid: String): String = "${getPublicShareUrlV2(driveId, linkUuid)}/init" | ||
|
|
||
| fun submitPublicSharePassword(driveId: Int, linkUuid: String) = "${getPublicShareUrlV2(driveId, linkUuid)}/auth" | ||
|
|
||
| fun getPublicShareRootFile(driveId: Int, linkUuid: String, fileId: Int): String { | ||
| return "$SHARE_URL_V3/$driveId/share/$linkUuid/files/$fileId?$sharedFileWithQuery" | ||
| } | ||
|
|
||
| fun getPublicShareChildrenFiles( | ||
| driveId: Int, | ||
| linkUuid: String, | ||
| fileId: Int, | ||
| sortType: SortType, | ||
| authToken: String?, | ||
| ): String { | ||
| val orderQuery = "order_by=${sortType.orderBy}&order=${sortType.order}" | ||
| val authParam = authToken?.let { "&sharelink_token=$it" } ?: "" | ||
| return "$SHARE_URL_V3/$driveId/share/$linkUuid/files/$fileId/files?$sharedFileWithQuery&$orderQuery$authParam" | ||
| } | ||
|
|
||
| fun getPublicShareFileCount(driveId: Int, linkUuid: String, fileId: Int): String { | ||
| return "${publicShareFile(driveId, linkUuid, fileId)}/count" | ||
| } | ||
|
|
||
| private fun getPublicShareFileThumbnail(driveId: Int, linkUuid: String, fileId: Int, authToken: String? = null): String { | ||
| val authParam = authToken?.let { "?sharelink_token=$it" } ?: "" | ||
| return "${publicShareFile(driveId, linkUuid, fileId)}/thumbnail$authParam" | ||
| } | ||
|
|
||
| private fun getPublicShareFilePreview(driveId: Int, linkUuid: String, fileId: Int, authToken: String? = null): String { | ||
| val authParam = authToken?.let { "?sharelink_token=$it" } ?: "" | ||
| return "${publicShareFile(driveId, linkUuid, fileId)}/preview$authParam" | ||
| } | ||
|
|
||
| private fun downloadPublicShareFile(driveId: Int, linkUuid: String, fileId: Int, authToken: String? = null): String { | ||
| val authParam = authToken?.let { "?sharelink_token=$it" } ?: "" | ||
| return "${publicShareFile(driveId, linkUuid, fileId)}/download$authParam" | ||
| } | ||
|
|
||
| private fun showPublicShareOfficeFile(driveId: Int, linkUuid: String, fileId: Int, authToken: String? = null): String { | ||
| val authParam = authToken?.let { "?sharelink_token=$it" } ?: "" | ||
| return "$SHARE_URL_V1/share/$driveId/$linkUuid/preview/text/$fileId$authParam" | ||
|
Comment on lines
+340
to
+357
There was a problem hiding this comment. Several helpers ( |
||
| } | ||
|
|
||
| fun importPublicShareFiles(driveId: Int) = "${driveURLV2(driveId)}/imports/sharelink" | ||
|
|
@@ -353,8 +363,14 @@ object ApiRoutes { | |
| return "${getPublicShareUrlV2(driveId, linkUuid)}/archive" | ||
| } | ||
|
|
||
| fun downloadPublicShareArchive( | ||
| driveId: Int, | ||
| publicShareUuid: String, | ||
| archiveUuid: String, | ||
| authToken: String? = null, | ||
| ): String { | ||
| val authParam = authToken?.let { "?sharelink_token=$it" } ?: "" | ||
| return "${buildPublicShareArchive(driveId, publicShareUuid)}/$archiveUuid/download$authParam" | ||
| } | ||
|
|
||
| private fun publicShareFile(driveId: Int, linkUuid: String, fileId: Int): String { | ||
|
|
@@ -446,4 +462,9 @@ object ApiRoutes { | |
|
|
||
| private fun showOffice(file: File) = "${OFFICE_URL}/${file.driveId}/${file.id}" | ||
| //endregion | ||
|
|
||
| fun String.appendQuery(query: String): String { | ||
| val querySeparator = if (contains("?")) "&" else "?" | ||
| return this + querySeparator + query | ||
| } | ||
|
Comment on lines
+466
to
+469
Contributor
There was a problem hiding this comment. Why not use Uri.Builder or buildUrl from ktor to manage all the case of ApiRoutes ? |
||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Infomaniak kDrive - Android | ||
| * Copyright (C) 2025-2026 Infomaniak Network SA | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.infomaniak.drive.data.api.publicshare | ||
|
|
||
| import android.os.Parcelable | ||
| import kotlinx.parcelize.Parcelize | ||
|
|
||
| @Parcelize | ||
| data class PublicShareToken( | ||
| val token: String = "", | ||
| ) : Parcelable |
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.
getPublicShareChildrenFilesappendssharelink_tokendirectly into the URL without URL-encoding. If the token contains reserved characters, the resulting URL can be invalid or interpreted incorrectly. Prefer building the query viaappendQuery(...)(with proper encoding) or using anHttpUrlbuilder; also avoid appending when the token is blank.