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

MOBILE-3860 login: Deprecate login/token.php checks

main
Dani Palou 2021-09-15 14:50:59 +02:00
parent 534bbbb289
commit 3109c93b64
3 changed files with 76 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/classes/errors/ajaxerror.ts
View File

@ -20,9 +20,12 @@ import { CoreError } from '@classes/errors/error';
export class CoreAjaxError extends CoreError {
available = 1; // @deprecated since app 4.0. AJAX endpoint should always be available in supported Moodle versions.
status?: number;
constructor(message: string) {
constructor(message: string, available?: number, status?: number) {
super(message);
this.status = status;
}
}

130
src/core/services/sites.ts
View File

@ -54,6 +54,8 @@ import { CoreSitesFactory } from './sites-factory';
import { CoreText } from '@singletons/text';
import { CoreLoginHelper } from '@features/login/services/login-helper';
import { CoreErrorWithTitle } from '@classes/errors/errorwithtitle';
import { CoreAjaxError } from '@classes/errors/ajaxerror';
import { CoreAjaxWSError } from '@classes/errors/ajaxwserror';
export const CORE_SITE_SCHEMAS = new InjectionToken<CoreSiteSchema[]>('CORE_SITE_SCHEMAS');
@ -183,33 +185,30 @@ export class CoreSitesProvider {
// Now, replace the siteUrl with the protocol.
siteUrl = siteUrl.replace(/^https?:\/\//i, protocol);
try {
await this.siteExists(siteUrl);
} catch (error) {
// Do not continue checking if WS are not enabled.
if (error.errorcode == 'enablewsdescription') {
error.critical = true;
// Create a temporary site to fetch site info.
let temporarySite = CoreSitesFactory.makeSite(undefined, siteUrl);
let config: CoreSitePublicConfigResponse | undefined;
throw error;
try {
config = await temporarySite.getPublicConfig();
} catch (error) {
const treatedError = await this.treatGetPublicConfigError(temporarySite.getURL(), error);
if (treatedError.critical) {
throw treatedError; // App received a WS error, stop.
}
// Site doesn't exist. Try to add or remove 'www'.
const treatedUrl = CoreUrlUtils.addOrRemoveWWW(siteUrl);
// Try to add or remove 'www'.
temporarySite = CoreSitesFactory.makeSite(undefined, CoreUrlUtils.addOrRemoveWWW(siteUrl));
try {
await this.siteExists(treatedUrl);
// Success, use this new URL as site url.
siteUrl = treatedUrl;
config = await temporarySite.getPublicConfig();
} catch (secondError) {
// Do not continue checking if WS are not enabled.
if (secondError.errorcode == 'enablewsdescription') {
secondError.critical = true;
throw secondError;
const treatedSecondError = await this.treatGetPublicConfigError(temporarySite.getURL(), secondError);
if (treatedSecondError.critical) {
throw treatedSecondError; // App received a WS error, stop.
}
// Return the error.
// App didn't receive a WS response, probably cannot connect. Prioritize first error if it's valid.
if (CoreTextUtils.getErrorMessageFromError(error)) {
throw error;
} else {
@ -218,49 +217,25 @@ export class CoreSitesProvider {
}
}
// Site exists. Create a temporary site to fetch its info.
const temporarySite = CoreSitesFactory.makeSite(undefined, siteUrl);
let config: CoreSitePublicConfigResponse | undefined;
try {
config = await temporarySite.getPublicConfig();
// Check that the user can authenticate.
if (!config.enablewebservices) {
throw new CoreSiteError({
message: Translate.instant('core.login.webservicesnotenabled'),
});
} else if (!config.enablemobilewebservice) {
throw new CoreSiteError({
message: Translate.instant('core.login.mobileservicesnotenabled'),
});
} else if (config.maintenanceenabled) {
let message = Translate.instant('core.sitemaintenance');
if (config.maintenancemessage) {
message += config.maintenancemessage;
}
throw new CoreSiteError({
message,
});
}
} catch (error) {
// Service supported but an error happened. Return error.
if (error.errorcode == 'codingerror') {
// This could be caused by a redirect. Check if it's the case.
const redirect = await CoreUtils.checkRedirect(siteUrl);
if (redirect) {
error.message = Translate.instant('core.login.sitehasredirect');
} else {
// We can't be sure if there is a redirect or not. Display cannot connect error.
error.message = Translate.instant('core.cannotconnecttrouble');
}
// Check that the user can authenticate.
if (!config.enablewebservices) {
throw new CoreSiteError({
message: Translate.instant('core.login.webservicesnotenabled'),
critical: true,
});
} else if (!config.enablemobilewebservice) {
throw new CoreSiteError({
message: Translate.instant('core.login.mobileservicesnotenabled'),
critical: true,
});
} else if (config.maintenanceenabled) {
let message = Translate.instant('core.sitemaintenance');
if (config.maintenancemessage) {
message += config.maintenancemessage;
}
throw new CoreSiteError({
message: error.message,
errorcode: error.errorcode,
message,
critical: true,
});
}
@ -270,11 +245,48 @@ export class CoreSitesProvider {
return { siteUrl, code: config?.typeoflogin || 0, service: CoreConstants.CONFIG.wsservice, config };
}
/**
* Treat an error returned by getPublicConfig in checkSiteWithProtocol. Converts the error to a CoreSiteError.
*
* @param siteUrl Site URL.
* @param error Error returned.
* @return Promise resolved with the treated error.
*/
protected async treatGetPublicConfigError(siteUrl: string, error: CoreAjaxError | CoreAjaxWSError): Promise<CoreSiteError> {
if (!('errorcode' in error)) {
// The WS didn't return data, probably cannot connect.
return new CoreSiteError({
message: error.message || '',
critical: 'status' in error && error.status === -2, // Certificate error.
});
}
// Service supported but an error happened. Return error.
if (error.errorcode == 'codingerror') {
// This could be caused by a redirect. Check if it's the case.
const redirect = await CoreUtils.checkRedirect(siteUrl);
if (redirect) {
error.message = Translate.instant('core.login.sitehasredirect');
} else {
// We can't be sure if there is a redirect or not. Display cannot connect error.
error.message = Translate.instant('core.cannotconnecttrouble');
}
}
return new CoreSiteError({
message: error.message,
errorcode: error.errorcode,
critical: true,
});
}
/**
* Check if a site exists.
*
* @param siteUrl URL of the site to check.
* @return A promise to be resolved if the site exists.
* @deprecated since app 4.0. Now the app calls uses tool_mobile_get_public_config to check if site exists.
*/
async siteExists(siteUrl: string): Promise<void> {
let data: CoreSitesLoginTokenResponse;

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

@ -491,7 +491,7 @@ export class CoreWSProvider {
message = Translate.instant('core.serverconnection');
}
throw new CoreAjaxError(message);
throw new CoreAjaxError(message, 1, data.status);
});
}