TF-1606 Convert downloadUrl and uploadUrl to qualified url

(cherry picked from commit eb912f4e7100b411c4167b1d575a793327ad356c)
This commit is contained in:
dab246
2023-03-20 17:25:18 +07:00
committed by Dat Vu
parent 009ab2b889
commit 9675f39659
3 changed files with 24 additions and 12 deletions
+14 -4
View File
@@ -1,4 +1,5 @@
import 'package:core/presentation/extensions/uri_extension.dart';
import 'package:core/utils/app_logger.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
@@ -8,8 +9,13 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:uri/uri.dart';
extension SessionExtension on Session {
String getDownloadUrl() {
var baseUrl = '${downloadUrl.origin}${downloadUrl.path}?${downloadUrl.query}';
String getDownloadUrl({String? jmapUrl}) {
final downloadUrlValid = jmapUrl != null
? downloadUrl.toQualifiedUrl(baseUrl: Uri.parse(jmapUrl))
: downloadUrl;
log('SessionExtension::getDownloadUrl():downloadUrlValid: $downloadUrlValid');
var baseUrl = '${downloadUrlValid.origin}${downloadUrlValid.path}?${downloadUrlValid.query}';
if (baseUrl.endsWith('/')) {
baseUrl = baseUrl.substring(0, baseUrl.length - 1);
}
@@ -19,8 +25,12 @@ extension SessionExtension on Session {
return downloadUrlDecode;
}
Uri getUploadUri(AccountId accountId) {
final baseUrl = '${uploadUrl.origin}${uploadUrl.path}';
Uri getUploadUri(AccountId accountId, {String? jmapUrl}) {
final uploadUrlValid = jmapUrl != null
? uploadUrl.toQualifiedUrl(baseUrl: Uri.parse(jmapUrl))
: uploadUrl;
log('SessionExtension::getUploadUri():downloadUrlValid: $uploadUrlValid');
final baseUrl = '${uploadUrlValid.origin}${uploadUrlValid.path}';
final uploadUriTemplate = UriTemplate(Uri.decodeFull(baseUrl));
final uploadUri = uploadUriTemplate.expand({
'accountId' : accountId.id.value