Merge pull request #4518 from alfonso-salces/MOBILE-4816

MOBILE-4816 forgotten-password: Beautify invalidparameter error

Author: crazyserver

scripts/langindex.json

@@ -2093,6 +2093,7 @@
   "core.imageviewer": "local_moodlemobileapp",
   "core.info": "moodle",
   "core.invalidformdata": "error",
+  "core.invalidusername": "error",
   "core.ioscookieshelp": "local_moodlemobileapp",
   "core.labelsep": "langconfig",
   "core.lastaccess": "moodle",

src/core/features/login/pages/forgotten-password/forgotten-password.ts

@@ -27,6 +27,7 @@ import { CoreLoadings } from '@services/overlays/loadings';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { CoreSharedModule } from '@/core/shared.module';
 import { CoreLoginExceededAttemptsComponent } from '../../components/exceeded-attempts/exceeded-attempts';
+import { CoreError } from '@classes/errors/error';
 
 /**
  * Page to recover a forgotten password.
@@ -125,7 +126,13 @@ export default class CoreLoginForgottenPasswordPage implements OnInit {
                 await CoreLoginHelper.passwordResetRequested(this.site.getURL());
             }
         } catch (error) {
-            CoreAlerts.showError(error);
+            if (error.errorcode === 'invalidparameter') {
+                CoreAlerts.showError(new CoreError(
+                    Translate.instant(isMail ? 'core.login.invalidemail' : 'core.invalidusername'),
+                ));
+            } else {
+                CoreAlerts.showError(error);
+            }
         } finally {
             modal.dismiss();
         }

src/core/features/login/tests/behat/basic_usage.feature

@@ -216,3 +216,13 @@ Feature: Test basic usage of login in app
     When I go back in the app
     And I press "Contact support" in the app
     Then the app should have opened a browser tab with url ".*\/user\/contactsitesupport\.php"
+
+  Scenario: Reset password invalid parameters
+    When I launch the app
+    And I set the field "Your site" to "$WWWROOT" in the app
+    And I press "Connect to your site" in the app
+    And I press "Lost password?" in the app
+    Then I set the following fields to these values in the app:
+      | Enter either username or email address | test#test |
+    And I press "Search" in the app
+    And I should find "The given username contains invalid characters" in the app

src/core/lang.json

@@ -165,6 +165,7 @@
     "imageviewer": "Image viewer",
     "info": "Information",
     "invalidformdata": "Incorrect form data",
+    "invalidusername": "The given username contains invalid characters",
     "ioscookieshelp": "Embedded content might require cookies to work. Please go to the app's iOS settings, enable 'Allow Cross-Website Tracking' and try again.",
     "labelsep": ":",
     "lastaccess": "Last access",