TF-2305 Fixed getUploadUri and getDownloadUri not working with Cyrus
This commit is contained in:
committed by
Dat H. Pham
parent
c3887b7705
commit
327af38fb0
@@ -5,23 +5,20 @@ extension URIExtension on Uri {
|
||||
|
||||
Uri toQualifiedUrl({required Uri baseUrl}) {
|
||||
log('SessionUtils::toQualifiedUrl():baseUrl: $baseUrl | sourceUrl: $this');
|
||||
if (toString().startsWith(baseUrl.toString())) {
|
||||
final qualifiedUrl = toString().removeLastSlashOfUrl();
|
||||
if (hasOrigin) {
|
||||
final qualifiedUrl = toString();
|
||||
log('SessionUtils::toQualifiedUrl():qualifiedUrl: $qualifiedUrl');
|
||||
return Uri.parse(qualifiedUrl);
|
||||
} else if (toString().isEmpty) {
|
||||
log('SessionUtils::toQualifiedUrl():qualifiedUrl: $baseUrl');
|
||||
return baseUrl;
|
||||
} else {
|
||||
if (!hasOrigin) {
|
||||
final baseUrlValid = baseUrl.toString().removeLastSlashOfUrl();
|
||||
final sourceUrlValid = toString().addFirstSlashOfUrl().removeLastSlashOfUrl();
|
||||
log('SessionUtils::toQualifiedUrl():baseUrlValid: $baseUrlValid | sourceUrlValid: $sourceUrlValid');
|
||||
final qualifiedUrl = baseUrlValid + sourceUrlValid;
|
||||
log('SessionUtils::toQualifiedUrl():qualifiedUrl: $qualifiedUrl');
|
||||
return Uri.parse(qualifiedUrl);
|
||||
} else {
|
||||
final qualifiedUrl = toString().removeLastSlashOfUrl();
|
||||
log('SessionUtils::toQualifiedUrl():qualifiedUrl: $qualifiedUrl');
|
||||
return Uri.parse(qualifiedUrl);
|
||||
}
|
||||
final baseUrlValid = baseUrl.toString().removeLastSlashOfUrl();
|
||||
final sourceUrlValid = toString().addFirstSlashOfUrl();
|
||||
log('SessionUtils::toQualifiedUrl():baseUrlValid: $baseUrlValid | sourceUrlValid: $sourceUrlValid');
|
||||
final qualifiedUrl = baseUrlValid + sourceUrlValid;
|
||||
log('SessionUtils::toQualifiedUrl():qualifiedUrl: $qualifiedUrl');
|
||||
return Uri.parse(qualifiedUrl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user