EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2510 from dpalou/MOBILE-3508

Browse Source 
MOBILE-3508 core: Fix external repositories files download
This commit is contained in:
Juan Leyva 2020-09-09 16:33:23 +02:00 committed by GitHub
commit 88281b14cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/course/providers/helper.ts
View File

@ -614,7 +614,7 @@ export class CoreCourseHelperProvider {
// Not online, get the offline file. It will fail if not found.
return this.filepoolProvider.getInternalUrlByUrl(siteId, fileUrl).then((path) => {
return this.utils.openFile(path);
}).catch((error) => {
}, (error) => {
return Promise.reject(this.translate.instant('core.networkerrormsg'));
});
}

26
src/providers/utils/url.ts
View File

@ -182,33 +182,19 @@ export class CoreUrlUtilsProvider {
return url;
}
// Check if is a valid URL (contains the pluginfile endpoint) and belongs to the site.
if (!this.isPluginFileUrl(url) || url.indexOf(this.textUtils.addEndingSlash(siteUrl)) !== 0) {
return url;
}
if (canUseTokenPluginFile) {
// Use tokenpluginfile.php.
url = url.replace(/(\/webservice)?\/pluginfile\.php/, '/tokenpluginfile.php/' + accessKey);
return url;
}
// No access key, use pluginfile.php. Check if the URL already has params.
if (url.match(/\?[^=]+=/)) {
url += '&';
} else {
url += '?';
}
// Always send offline=1 (for external repositories). It shouldn't cause problems for local files or old Moodles.
url += 'token=' + token + '&offline=1';
// Use pluginfile.php. Some webservices returns directly the correct download url, others not.
if (url.indexOf(this.textUtils.concatenatePaths(siteUrl, 'pluginfile.php')) === 0) {
url = url.replace('/pluginfile', '/webservice/pluginfile');
}
// Some webservices returns directly the correct download url, others not.
if (url.indexOf(this.textUtils.concatenatePaths(siteUrl, 'pluginfile.php')) === 0) {
url = url.replace('/pluginfile', '/webservice/pluginfile');
url = this.addParamsToUrl(url, {token: token});
}
return url;
return this.addParamsToUrl(url, {offline: 1}); // Always send offline=1 (it's for external repositories).
}
/**