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

Merge pull request #3725 from NoelDeMartin/MOBILE-4341 

MOBILE-4341 core: Ignore native error codes in web
main
Juan Leyva 2023-07-06 17:41:20 +02:00 committed by GitHub
parent 26147e85ec 844d03924f
commit 670bb10330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/services/ws.ts
View File

@ -512,6 +512,7 @@ export class CoreWSProvider {
supportConfig: await CoreUserGuestSupportConfig.forSite(preSets.siteUrl), supportConfig: await CoreUserGuestSupportConfig.forSite(preSets.siteUrl),
}; };
if (CorePlatform.isMobile()) {
switch (data.status) { switch (data.status) {
case NativeHttp.ErrorCode.SSL_EXCEPTION: case NativeHttp.ErrorCode.SSL_EXCEPTION:
options.errorcode = 'invalidcertificate'; options.errorcode = 'invalidcertificate';
@ -544,9 +545,16 @@ export class CoreWSProvider {
options.errorcode = 'requestprocessingfailed'; options.errorcode = 'requestprocessingfailed';
options.errorDetails = CoreTextUtils.getErrorMessageFromError(data.error) ?? 'Request processing failed'; options.errorDetails = CoreTextUtils.getErrorMessageFromError(data.error) ?? 'Request processing failed';
break; break;
}
}
if (!options.errorcode) {
switch (data.status) {
case 404: case 404:
options.errorcode = 'endpointnotfound'; options.errorcode = 'endpointnotfound';
options.errorDetails = Translate.instant('core.ajaxendpointnotfound', { $a: CoreSite.MINIMUM_MOODLE_VERSION }); options.errorDetails = Translate.instant('core.ajaxendpointnotfound', {
$a: CoreSite.MINIMUM_MOODLE_VERSION,
});
break; break;
default: { default: {
const details = CoreTextUtils.getErrorMessageFromError(data.error) ?? 'Unknown error'; const details = CoreTextUtils.getErrorMessageFromError(data.error) ?? 'Unknown error';
@ -558,6 +566,7 @@ export class CoreWSProvider {
} }
break; break;
} }
}
throw new CoreAjaxError(options, 1, data.status); throw new CoreAjaxError(options, 1, data.status);
}); });