Merge pull request #4705 from dpalou/MOBILE-4974

Mobile 4974

Author: crazyserver

src/core/classes/errors/ajaxerror.ts

@@ -21,7 +21,7 @@ export class CoreAjaxError extends CoreSiteError {
 
     status?: number;
 
-    constructor(messageOrOptions: string | CoreSiteErrorOptions, available?: number, status?: number) {
+    constructor(messageOrOptions: string | CoreSiteErrorOptions, status?: number) {
         super(typeof messageOrOptions === 'string' ? { message: messageOrOptions } : messageOrOptions);
 
         this.status = status;

src/core/features/login/pages/site/site.ts

@@ -68,7 +68,7 @@ export default class CoreLoginSitePage implements OnInit {
     siteForm!: FormGroup;
     fixedSites?: CoreLoginSiteInfoExtended[];
     filteredSites?: CoreLoginSiteInfoExtended[];
-    siteSelector: CoreLoginSiteSelectorListMethod = 'sitefinder';
+    siteSelector = CoreLoginSiteSelectorListMethod.SITE_FINDER;
     showKeyboard = false;
     filter = '';
     sites: CoreLoginSiteInfoExtended[] = [];
@@ -149,7 +149,7 @@ export default class CoreLoginSitePage implements OnInit {
     protected async initSiteSelector(): Promise<string> {
         const availableSites = await CoreLoginHelper.getAvailableSites();
         this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> availableSites);
-        this.siteSelector = 'list'; // In case it's not defined
+        this.siteSelector = CoreLoginSiteSelectorListMethod.LIST; // In case it's not defined
 
         // Do not show images if none are set.
         if (!this.fixedSites.some((site) => !!site.imageurl)) {
@@ -304,7 +304,7 @@ export default class CoreLoginSitePage implements OnInit {
                 // Attempt guessing the domain if the initial check failed
                 const domain = CoreUrl.guessMoodleDomain(url);
 
-                if (domain && domain != url) {
+                if (domain && domain !== url) {
                     try {
                         checkResult = await CoreSites.checkSite(domain, undefined, 'Site URL page');
                     } catch (secondError) {
@@ -540,7 +540,7 @@ export default class CoreLoginSitePage implements OnInit {
         // Not a custom URL scheme, check if it's a URL scheme to another app.
         const scheme = CoreUrl.getUrlProtocol(text);
 
-        if (scheme && scheme != 'http' && scheme != 'https') {
+        if (scheme && scheme !== 'http' && scheme !== 'https') {
             CoreAlerts.showError(Translate.instant('core.errorurlschemeinvalidscheme', { $a: text }));
 
             return;

src/core/features/login/services/login-helper.ts

@@ -106,22 +106,6 @@ export class CoreLoginHelperProvider {
         this.cleanUpPasswordResets();
     }
 
-    /**
-     * Check if a site allows requesting a password reset through the app.
-     *
-     * @param siteUrl URL of the site.
-     * @returns Promise resolved with boolean: whether can be done through the app.
-     */
-    async canRequestPasswordReset(siteUrl: string): Promise<boolean> {
-        try {
-            await this.requestPasswordReset(siteUrl);
-
-            return true;
-        } catch (error) {
-            return error.available == 1 || (error.errorcode && error.errorcode != 'invalidrecord');
-        }
-    }
-
     /**
      * Function called when an SSO InAppBrowser is closed or the app is resumed. Check if user needs to be logged out.
      */
@@ -157,19 +141,13 @@ export class CoreLoginHelperProvider {
         const modal = await CoreLoadings.show();
 
         try {
-            const canReset = await this.canRequestPasswordReset(siteUrl);
-
-            if (canReset) {
-                await CoreNavigator.navigate('/login/forgottenpassword', {
-                    params: {
-                        siteUrl,
-                        siteConfig,
-                        username,
-                    },
-                });
-            } else {
-                this.openForgottenPassword(siteUrl);
-            }
+            await CoreNavigator.navigate('/login/forgottenpassword', {
+                params: {
+                    siteUrl,
+                    siteConfig,
+                    username,
+                },
+            });
         } finally {
             modal.dismiss();
         }
@@ -196,7 +174,7 @@ export class CoreLoginHelperProvider {
         site = site || CoreSites.getCurrentSite();
         const config = site?.getStoredConfig();
 
-        return `core.mainmenu.${config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'switchaccount'}`;
+        return `core.mainmenu.${config && config.tool_mobile_forcelogout === '1' ? 'logout' : 'switchaccount'}`;
     }
 
     /**
@@ -402,8 +380,11 @@ export class CoreLoginHelperProvider {
 
             return sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url)) ||
                 (!!demoModeSite && CoreUrl.sameDomainAndPath(siteUrl, demoModeSite.url));
-        } else if (CoreConstants.CONFIG.multisitesdisplay == 'sitefinder' && CoreConstants.CONFIG.onlyallowlistedsites &&
-                checkSiteFinder) {
+        } else if (
+            CoreConstants.CONFIG.multisitesdisplay === CoreLoginSiteSelectorListMethod.SITE_FINDER &&
+            CoreConstants.CONFIG.onlyallowlistedsites &&
+            checkSiteFinder
+        ) {
             // Call the sites finder to validate the site.
             const result = await CoreSites.findSites(siteUrl.replace(/^https?:\/\/|\.\w{2,3}\/?$/g, ''));
 
@@ -418,20 +399,20 @@ export class CoreLoginHelperProvider {
      * Check if SSO login should use an embedded browser.
      *
      * @param code Code to check.
-     * @returns True if embedded browser, false othwerise.
+     * @returns True if embedded browser, false otherwise.
      */
     isSSOEmbeddedBrowser(code: TypeOfLogin): boolean {
-        return code == TypeOfLogin.EMBEDDED;
+        return code === TypeOfLogin.EMBEDDED;
     }
 
     /**
      * Check if SSO login is needed based on code returned by the WS.
      *
      * @param code Code to check.
-     * @returns True if SSO login is needed, false othwerise.
+     * @returns True if SSO login is needed, false otherwise.
      */
     isSSOLoginNeeded(code: TypeOfLogin): boolean {
-        return code == TypeOfLogin.BROWSER || code == TypeOfLogin.EMBEDDED;
+        return code === TypeOfLogin.BROWSER || code === TypeOfLogin.EMBEDDED;
     }
 
     /**
@@ -541,15 +522,6 @@ export class CoreLoginHelperProvider {
         CoreOpener.openInApp(`${siteUrl}/login/change_password.php`);
     }
 
-    /**
-     * Open forgotten password in inappbrowser.
-     *
-     * @param siteUrl URL of the site.
-     */
-    openForgottenPassword(siteUrl: string): void {
-        CoreOpener.openInApp(`${siteUrl}/login/forgot_password.php`);
-    }
-
     /**
      * Function to open in app browser to change password or complete user profile.
      *
@@ -815,6 +787,8 @@ export class CoreLoginHelperProvider {
 
     /**
      * Show a modal warning that the credentials introduced were not correct.
+     *
+     * @param error Error object.
      */
     protected showInvalidLoginModal(error: CoreError): void {
         const errorDetails = error instanceof CoreSiteError ? error.debug?.details : null;
@@ -995,17 +969,17 @@ export class CoreLoginHelperProvider {
 
         // Validate the signature.
         // We need to check both http and https.
-        let signature = Md5.hashAsciiStr(launchSiteURL + passport);
-        if (signature != params[0]) {
-            if (launchSiteURL.indexOf('https://') != -1) {
+        let signature: string = Md5.hashAsciiStr(launchSiteURL + passport);
+        if (signature !== params[0]) {
+            if (launchSiteURL.includes('https://')) {
                 launchSiteURL = launchSiteURL.replace('https://', 'http://');
             } else {
                 launchSiteURL = launchSiteURL.replace('http://', 'https://');
             }
             signature = Md5.hashAsciiStr(launchSiteURL + passport);
         }
 
-        if (signature == params[0]) {
+        if (signature === params[0]) {
             this.logger.debug('Signature validated');
 
             return {
@@ -1131,7 +1105,7 @@ export class CoreLoginHelperProvider {
         // Not a custom URL scheme, check if it's a URL scheme to another app.
         const scheme = CoreUrl.getUrlProtocol(text);
 
-        if (scheme && scheme != 'http' && scheme != 'https') {
+        if (scheme && scheme !== 'http' && scheme !== 'https') {
             CoreAlerts.showError(Translate.instant('core.errorurlschemeinvalidscheme', { $a: text }));
         } else {
             CoreAlerts.showError(Translate.instant('core.login.errorqrnoscheme'));
@@ -1155,7 +1129,7 @@ export class CoreLoginHelperProvider {
         let siteUrl = '';
 
         if (currentSiteId) {
-            siteUrl = sites.find((site) => site.id == currentSiteId)?.siteUrlWithoutProtocol ?? '';
+            siteUrl = sites.find((site) => site.id === currentSiteId)?.siteUrlWithoutProtocol ?? '';
         }
 
         const otherSites: Record<string, CoreSiteBasicInfo[]> = {};
@@ -1166,7 +1140,7 @@ export class CoreLoginHelperProvider {
 
             if (site.id === currentSiteId) {
                 accountsList.currentSite = site;
-            } else if (site.siteUrlWithoutProtocol == siteUrl) {
+            } else if (site.siteUrlWithoutProtocol === siteUrl) {
                 accountsList.sameSite.push(site);
             } else {
                 if (!otherSites[site.siteUrlWithoutProtocol]) {
@@ -1197,8 +1171,8 @@ export class CoreLoginHelperProvider {
         let index = 0;
 
         // Found on same site.
-        if (accountsList.sameSite.length > 0 && accountsList.sameSite[0].siteUrlWithoutProtocol == siteUrl) {
-            index = accountsList.sameSite.findIndex((listedSite) => listedSite.id == site.id);
+        if (accountsList.sameSite.length > 0 && accountsList.sameSite[0].siteUrlWithoutProtocol === siteUrl) {
+            index = accountsList.sameSite.findIndex((listedSite) => listedSite.id === site.id);
             if (index >= 0) {
                 accountsList.sameSite.splice(index, 1);
                 accountsList.count--;
@@ -1208,19 +1182,19 @@ export class CoreLoginHelperProvider {
         }
 
         const otherSiteIndex = accountsList.otherSites.findIndex((sites) =>
-            sites.length > 0 && sites[0].siteUrlWithoutProtocol == siteUrl);
+            sites.length > 0 && sites[0].siteUrlWithoutProtocol === siteUrl);
         if (otherSiteIndex < 0) {
             // Site Url not found.
             return;
         }
 
-        index = accountsList.otherSites[otherSiteIndex].findIndex((listedSite) => listedSite.id == site.id);
+        index = accountsList.otherSites[otherSiteIndex].findIndex((listedSite) => listedSite.id === site.id);
         if (index >= 0) {
             accountsList.otherSites[otherSiteIndex].splice(index, 1);
             accountsList.count--;
         }
 
-        if (accountsList.otherSites[otherSiteIndex].length == 0) {
+        if (!accountsList.otherSites[otherSiteIndex].length) {
             accountsList.otherSites.splice(otherSiteIndex, 1);
         }
     }
@@ -1400,11 +1374,12 @@ type StoredLoginLaunchData = CoreRedirectPayload & {
     ssoUrlParams: CoreUrlParams;
 };
 
-export type CoreLoginSiteSelectorListMethod =
-    'url'|
-    'sitefinder'|
-    'list'|
-    '';
+export const enum CoreLoginSiteSelectorListMethod {
+    URL = 'url',
+    SITE_FINDER = 'sitefinder',
+    LIST = 'list',
+    NONE = '',
+}
 
 export type CoreLoginMethod = {
     name: string; // Name of the login method.

src/core/services/ws.ts

@@ -189,7 +189,7 @@ export class CoreWSProvider {
                     }
                     value = stripped;
                 }
-            } else if (typeof value == 'boolean') {
+            } else if (typeof value === 'boolean') {
                 /* Moodle does not allow "true" or "false" in WS parameters, only in POST parameters.
                    We've been using "true" and "false" for WS settings "filter" and "fileurl",
                    we keep it this way to avoid changing cache keys. */
@@ -198,7 +198,7 @@ export class CoreWSProvider {
                 } else {
                     value = value ? '1' : '0';
                 }
-            } else if (typeof value == 'number') {
+            } else if (typeof value === 'number') {
                 value = String(value);
             } else {
                 // Unknown type.
@@ -621,7 +621,7 @@ export class CoreWSProvider {
                 }
             }
 
-            throw new CoreAjaxError(options, 1, data.status);
+            throw new CoreAjaxError(options, data.status);
         }).catch(error => {
             const type = `CoreAjaxError - ${error.errorcode}`;
             CoreErrorLogs.addErrorLog({ method, type, message: error, time: new Date().getTime(), data });
@@ -766,7 +766,7 @@ export class CoreWSProvider {
                 });
             } else if (typeof data !== typeExpected) {
                 // If responseType is text an string will be returned, parse before returning.
-                if (typeof data == 'string') {
+                if (typeof data === 'string') {
                     if (typeExpected === 'number') {
                         data = Number(data);
                         if (isNaN(data)) {
@@ -998,7 +998,7 @@ export class CoreWSProvider {
                 throw new CoreError(Translate.instant('core.serverconnection', {
                     details: Translate.instant('core.errorinvalidresponse', { method }),
                 }));
-            } else if (typeof data != preSets.typeExpected) {
+            } else if (typeof data !== preSets.typeExpected) {
                 this.logger.warn(`Response of type "${typeof data}" received, expecting "${preSets.typeExpected}"`);
                 throw new CoreError(Translate.instant('core.errorinvalidresponse', { method }));
             }

src/core/static/url.ts

@@ -815,7 +815,7 @@ export class CoreUrl {
      * @param url URL to treat.
      * @returns Protocol, undefined if no protocol found.
      */
-    static getUrlProtocol(url: string): string | void {
+    static getUrlProtocol(url: string): string | undefined {
         return CoreUrl.parse(url)?.protocol;
     }