From 101294349e9d62fbeddd29e4d93eb27dbeac97f9 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Wed, 22 Feb 2023 12:50:06 +0100
Subject: [PATCH 1/6] MOBILE-4245 config: Add sites config list

---
 moodle.config.json                            |  3 +-
 src/core/classes/site.ts                      | 15 ++++---
 .../login/pages/credentials/credentials.ts    |  6 +--
 .../login/pages/email-signup/email-signup.ts  |  3 +-
 .../login/pages/reconnect/reconnect.html      |  6 +--
 .../login/pages/reconnect/reconnect.ts        |  7 ++--
 src/core/features/login/pages/site/site.ts    |  4 +-
 .../features/login/services/login-helper.ts   | 39 +++++++++----------
 .../settings/pages/deviceinfo/deviceinfo.ts   |  7 ++--
 src/core/services/sites.ts                    |  2 +-
 src/core/services/update-manager.ts           |  2 +-
 src/types/config.d.ts                         |  3 +-
 12 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index 061b6a3ed..b61f913ea 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -85,8 +85,7 @@
         "high": 120
     },
     "customurlscheme": "moodlemobile",
-    "siteurl": "",
-    "sitename": "",
+    "sites": [],
     "multisitesdisplay": "",
     "sitefindersettings": {},
     "onlyallowlistedsites": false,
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 6fffa7b91..88a110585 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -61,6 +61,7 @@ import { finalize, map, mergeMap } from 'rxjs/operators';
 import { firstValueFrom } from '../utils/rxjs';
 import { CoreSiteError } from '@classes/errors/siteerror';
 import { CoreUserAuthenticatedSupportConfig } from '@features/user/classes/support/authenticated-support-config';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 
 /**
  * QR Code type enumeration.
@@ -290,12 +291,16 @@ export class CoreSite {
      * @returns Site name.
      */
     getSiteName(): string {
-        if (CoreConstants.CONFIG.sitename) {
-            // Overridden by config.
-            return CoreConstants.CONFIG.sitename;
-        } else {
-            return this.infos?.sitename || '';
+        if (this.infos?.sitename) {
+            return this.infos?.sitename;
         }
+
+        // Fallback.
+        if (CoreLoginHelper.isUniqueFixedSite()) {
+            return CoreConstants.CONFIG.sites[0].name ;
+        }
+
+        return '';
     }
 
     /**
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index 5841c1e7e..95a6ca7af 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -56,7 +56,6 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
     identityProviders?: CoreSiteIdentityProvider[];
     pageLoaded = false;
     isBrowserSSO = false;
-    isFixedUrlSet = false;
     showForgottenPassword = true;
     showScanQR = false;
     loginAttempts = 0;
@@ -99,9 +98,8 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
         if (this.siteConfig) {
             this.treatSiteConfig();
         }
-        this.isFixedUrlSet = CoreLoginHelper.isFixedUrlSet();
 
-        if (this.isFixedUrlSet || !this.siteConfig) {
+        if (CoreLoginHelper.isUniqueFixedSite() || !this.siteConfig) {
             // Fixed URL or not siteConfig retrieved from params, we need to check if it uses browser SSO login.
             this.checkSite(this.siteUrl, true);
         } else {
@@ -200,7 +198,7 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
      */
     protected treatSiteConfig(): void {
         if (this.siteConfig) {
-            this.siteName = CoreConstants.CONFIG.sitename ? CoreConstants.CONFIG.sitename : this.siteConfig.sitename;
+            this.siteName = this.siteConfig.sitename;
             this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
             this.authInstructions = this.siteConfig.authinstructions || Translate.instant('core.login.loginsteps');
             this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts
index ca3879c07..253d20fdc 100644
--- a/src/core/features/login/pages/email-signup/email-signup.ts
+++ b/src/core/features/login/pages/email-signup/email-signup.ts
@@ -20,7 +20,6 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreCountry, CoreUtils } from '@services/utils/utils';
 import { CoreWS, CoreWSExternalWarning } from '@services/ws';
-import { CoreConstants } from '@/core/constants';
 import { Translate } from '@singletons';
 import { CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate';
@@ -235,7 +234,7 @@ export class CoreLoginEmailSignupPage implements OnInit {
      */
     protected treatSiteConfig(): boolean {
         if (this.siteConfig?.registerauth == 'email' && !CoreLoginHelper.isEmailSignupDisabled(this.siteConfig)) {
-            this.siteName = CoreConstants.CONFIG.sitename ? CoreConstants.CONFIG.sitename : this.siteConfig.sitename;
+            this.siteName = this.siteConfig.sitename;
             this.authInstructions = this.siteConfig.authinstructions;
             this.ageDigitalConsentVerification = this.siteConfig.agedigitalconsentverification;
             this.supportName = this.siteConfig.supportname;
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 453423f4a..588e1e18e 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -18,12 +18,12 @@
 <ion-content class="ion-padding" (keydown)="keyDown($event)" (keyup)="keyUp($event)">
     <core-loading [hideUntil]="!showLoading">
         <div class="list-item-limited-width">
-            <div class="ion-text-wrap ion-text-center ion-margin-bottom" [ngClass]="{'item-avatar-center': showSiteAvatar}">
+            <div class="ion-text-wrap ion-text-center ion-margin-bottom" [ngClass]="{'item-avatar-center': showUserAvatar}">
                 <!-- Show user avatar. -->
-                <img *ngIf="showSiteAvatar" [src]="userAvatar" class="large-avatar" core-external-content [siteId]="siteId"
+                <img *ngIf="showUserAvatar" [src]="userAvatar" class="large-avatar" core-external-content [siteId]="siteId"
                     alt="{{ 'core.pictureof' | translate:{$a: userFullName} }}" onError="this.src='assets/img/user-avatar.png'">
 
-                <div class="core-login-site-logo" *ngIf="!showSiteAvatar">
+                <div class="core-login-site-logo" *ngIf="!showUserAvatar">
                     <!-- Show site logo or a default image. -->
                     <img *ngIf="logoUrl" [src]="logoUrl" role="presentation" onError="this.src='assets/img/login_logo.png'" alt="">
                     <img *ngIf="!logoUrl" src="assets/img/login_logo.png" role="presentation" alt="">
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index 70fd73df1..e37ba5702 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -31,6 +31,7 @@ import { CoreUserSupportConfig } from '@features/user/classes/support/support-co
 import { CoreUserAuthenticatedSupportConfig } from '@features/user/classes/support/authenticated-support-config';
 import { Translate } from '@singletons';
 import { SafeHtml } from '@angular/platform-browser';
+import { CoreConstants } from '@/core/constants';
 
 /**
  * Page to enter the user password to reconnect to a site.
@@ -53,7 +54,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
     logoUrl?: string;
     identityProviders?: CoreSiteIdentityProvider[];
     showForgottenPassword = true;
-    showSiteAvatar = false;
+    showUserAvatar = false;
     isBrowserSSO = false;
     isOAuth = false;
     isLoggedOut: boolean;
@@ -115,7 +116,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             this.isOAuth = site.isOAuth();
 
             // Show logo instead of avatar if it's a fixed site.
-            this.showSiteAvatar = !!this.userAvatar && !CoreLoginHelper.getFixedSites();
+            this.showUserAvatar = !!this.userAvatar && !CoreConstants.CONFIG.sites.length;
 
             this.checkSiteConfig(site);
 
@@ -187,7 +188,7 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
 
         // Check logoURL if user avatar is not set.
         if (this.userAvatar?.startsWith(this.siteUrl + '/theme/image.php')) {
-            this.showSiteAvatar = false;
+            this.showUserAvatar = false;
         }
         this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
     }
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index 4fb73cadf..b7044eae9 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -92,7 +92,7 @@ export class CoreLoginSitePage implements OnInit {
         };
 
         // Load fixed sites if they're set.
-        if (CoreLoginHelper.hasSeveralFixedSites()) {
+        if (CoreConstants.CONFIG.sites.length) {
             url = this.initSiteSelector();
         } else if (CoreConstants.CONFIG.enableonboarding && !CorePlatform.isIOS()) {
             this.initOnboarding();
@@ -137,7 +137,7 @@ export class CoreLoginSitePage implements OnInit {
      * @returns URL of the first site.
      */
     protected initSiteSelector(): string {
-        this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreLoginHelper.getFixedSites());
+        this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreConstants.CONFIG.sites);
         this.siteSelector = 'list'; // In case it's not defined
 
         // Do not show images if none are set.
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 1dd19f48b..7fc945b2f 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -379,9 +379,10 @@ export class CoreLoginHelperProvider {
      * Get fixed site or sites.
      *
      * @returns Fixed site or list of fixed sites.
+     * @deprecated 4.2.0 use CoreConstants.CONFIG.sites instead.
      */
     getFixedSites(): string | CoreLoginSiteInfo[] {
-        return CoreConstants.CONFIG.siteurl;
+        return CoreLoginHelper.isUniqueFixedSite() ? CoreConstants.CONFIG.sites[0].url : CoreConstants.CONFIG.sites;
     }
 
     /**
@@ -453,12 +454,9 @@ export class CoreLoginHelperProvider {
      * @returns Path and params.
      */
     getAddSiteRouteInfo(showKeyboard?: boolean): [string, Params] {
-        if (this.isFixedUrlSet()) {
+        if (CoreLoginHelper.isUniqueFixedSite()) {
             // Fixed URL is set, go to credentials page.
-            const fixedSites = this.getFixedSites();
-            const url = typeof fixedSites == 'string' ? fixedSites : fixedSites[0].url;
-
-            return ['/login/credentials', { siteUrl: url }];
+            return ['/login/credentials', { siteUrl: CoreConstants.CONFIG.sites[0].url }];
         }
 
         return ['/login/site', { showKeyboard }];
@@ -518,10 +516,10 @@ export class CoreLoginHelperProvider {
      * Check if the app is configured to use several fixed URLs.
      *
      * @returns Whether there are several fixed URLs.
+     * @deprecated 4.2.0 Use CoreConstants.CONFIG.sites.length > 1 instead.
      */
     hasSeveralFixedSites(): boolean {
-        return !!(CoreConstants.CONFIG.siteurl && Array.isArray(CoreConstants.CONFIG.siteurl) &&
-            CoreConstants.CONFIG.siteurl.length > 1);
+        return CoreConstants.CONFIG.sites.length > 1;
     }
 
     /**
@@ -557,13 +555,19 @@ export class CoreLoginHelperProvider {
      * Check if the app is configured to use a fixed URL (only 1).
      *
      * @returns Whether there is 1 fixed URL.
+     * @deprecated 4.2.0 Use isUniqueFixedSite instead.
      */
     isFixedUrlSet(): boolean {
-        if (Array.isArray(CoreConstants.CONFIG.siteurl)) {
-            return CoreConstants.CONFIG.siteurl.length == 1;
-        }
+        return this.isUniqueFixedSite();
+    }
 
-        return !!CoreConstants.CONFIG.siteurl;
+    /**
+     * Check if the app is configured to use a fixed URL (only 1).
+     *
+     * @returns Whether there is 1 fixed URL.
+     */
+    isUniqueFixedSite(): boolean {
+        return CoreConstants.CONFIG.sites.length === 1;
     }
 
     /**
@@ -606,13 +610,8 @@ export class CoreLoginHelperProvider {
      * @returns Promise resolved with boolean: whether is one of the fixed sites.
      */
     async isSiteUrlAllowed(siteUrl: string, checkSiteFinder = true): Promise<boolean> {
-        if (this.isFixedUrlSet()) {
-            // Only 1 site allowed.
-            return CoreUrl.sameDomainAndPath(siteUrl, <string> this.getFixedSites());
-        } else if (this.hasSeveralFixedSites()) {
-            const sites = <CoreLoginSiteInfo[]> this.getFixedSites();
-
-            return sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url));
+        if (CoreConstants.CONFIG.sites.length) {
+            return CoreConstants.CONFIG.sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url));
         } else if (CoreConstants.CONFIG.multisitesdisplay == 'sitefinder' && CoreConstants.CONFIG.onlyallowlistedsites &&
                 checkSiteFinder) {
             // Call the sites finder to validate the site.
@@ -1308,7 +1307,7 @@ export class CoreLoginHelperProvider {
             return false;
         }
 
-        if ((CoreConstants.CONFIG.displayqroncredentialscreen === undefined && this.isFixedUrlSet()) ||
+        if ((CoreConstants.CONFIG.displayqroncredentialscreen === undefined && CoreLoginHelper.isUniqueFixedSite()) ||
             (CoreConstants.CONFIG.displayqroncredentialscreen !== undefined &&
                 !!CoreConstants.CONFIG.displayqroncredentialscreen)) {
 
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
index 81d20558c..b407ba2e2 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
@@ -27,6 +27,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreNavigator } from '@services/navigator';
 import { CorePlatform } from '@services/platform';
 import { CoreNetwork } from '@services/network';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 
 /**
  * Device Info to be shown and copied to clipboard.
@@ -167,10 +168,10 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
         }
 
         const currentSite = sitesProvider.getCurrentSite();
+        const firstUrl = CoreLoginHelper.isUniqueFixedSite() && CoreConstants.CONFIG.sites[0].url;
 
-        this.deviceInfo.siteUrl = (currentSite?.getURL()) ||
-            (typeof CoreConstants.CONFIG.siteurl == 'string' && CoreConstants.CONFIG.siteurl) || undefined;
-        this.deviceInfo.isPrefixedUrl = !!CoreConstants.CONFIG.siteurl;
+        this.deviceInfo.siteUrl = currentSite?.getURL() || firstUrl || undefined;
+        this.deviceInfo.isPrefixedUrl = !!CoreConstants.CONFIG.sites.length;
         this.deviceInfo.siteId = currentSite?.getId();
         this.deviceInfo.siteVersion = currentSite?.getInfo()?.release;
 
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index 5a4b7bb3e..a8aaf216a 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -1261,7 +1261,7 @@ export class CoreSitesProvider {
                     siteUrl: site.siteUrl,
                     siteUrlWithoutProtocol: site.siteUrl.replace(/^https?:\/\//, '').toLowerCase(),
                     fullName: siteInfo?.fullname,
-                    siteName: CoreConstants.CONFIG.sitename == '' ? siteInfo?.sitename: CoreConstants.CONFIG.sitename,
+                    siteName: siteInfo?.sitename,
                     avatar: siteInfo?.userpictureurl,
                     siteHomeId: siteInfo?.siteid || 1,
                     loggedOut: !!site.loggedOut,
diff --git a/src/core/services/update-manager.ts b/src/core/services/update-manager.ts
index dc8cdbbff..ce2c8fb20 100644
--- a/src/core/services/update-manager.ts
+++ b/src/core/services/update-manager.ts
@@ -109,7 +109,7 @@ export class CoreUpdateManagerProvider {
      * @returns Promise resolved when done.
      */
     protected async checkCurrentSiteAllowed(): Promise<void> {
-        if (!CoreLoginHelper.getFixedSites()) {
+        if (!CoreConstants.CONFIG.sites.length) {
             return;
         }
 
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 4a32cb29a..331ab4712 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -42,8 +42,7 @@ export interface EnvironmentConfig {
     zoomlevels: Record<CoreZoomLevel, number>;
     defaultZoomLevel?: CoreZoomLevel; // Set the default zoom level of the app.
     customurlscheme: string;
-    siteurl: string | CoreLoginSiteInfo[];
-    sitename: string;
+    sites: CoreLoginSiteInfo[];
     multisitesdisplay: CoreLoginSiteSelectorListMethod;
     sitefindersettings: Partial<CoreLoginSiteFinderSettings>;
     onlyallowlistedsites: boolean;

From 3e0e29ba2e7f538b3df04e09f5c812031ef69461 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Fri, 3 Feb 2023 09:45:50 +0100
Subject: [PATCH 2/6] MOBILE-4245 Dev: Create new setting to control staging
 sites

---
 moodle.config.json                            |  1 +
 src/core/features/login/pages/site/site.ts    | 79 ++++++++++++++++---
 .../features/login/services/login-helper.ts   | 16 ++++
 src/core/features/settings/pages/dev/dev.html |  6 ++
 src/core/features/settings/pages/dev/dev.ts   | 16 +++-
 .../settings/services/settings-helper.ts      | 11 +++
 src/types/config.d.ts                         |  1 +
 7 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index b61f913ea..e4cddbd91 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -86,6 +86,7 @@
     },
     "customurlscheme": "moodlemobile",
     "sites": [],
+    "stagingsites": [],
     "multisitesdisplay": "",
     "sitefindersettings": {},
     "onlyallowlistedsites": false,
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index b7044eae9..aed2c04ca 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
 import { FormBuilder, FormGroup, ValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms';
 
 import { CoreApp } from '@services/app';
@@ -46,6 +46,7 @@ import { CoreUserSupportConfig } from '@features/user/classes/support/support-co
 import { CoreUserGuestSupportConfig } from '@features/user/classes/support/guest-support-config';
 import { CoreLoginError } from '@classes/errors/loginerror';
 import { CorePlatform } from '@services/platform';
+import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Site (url) chooser when adding a new site.
@@ -55,11 +56,11 @@ import { CorePlatform } from '@services/platform';
     templateUrl: 'site.html',
     styleUrls: ['site.scss', '../../login.scss'],
 })
-export class CoreLoginSitePage implements OnInit {
+export class CoreLoginSitePage implements OnInit, OnDestroy {
 
     @ViewChild('siteFormEl') formElement?: ElementRef;
 
-    siteForm: FormGroup;
+    siteForm!: FormGroup;
     fixedSites?: CoreLoginSiteInfoExtended[];
     filteredSites?: CoreLoginSiteInfoExtended[];
     siteSelector: CoreLoginSiteSelectorListMethod = 'sitefinder';
@@ -68,14 +69,13 @@ export class CoreLoginSitePage implements OnInit {
     sites: CoreLoginSiteInfoExtended[] = [];
     hasSites = false;
     loadingSites = false;
-    searchFunction: (search: string) => void;
-    showScanQR: boolean;
+    searchFunction!: (search: string) => void;
+    showScanQR!: boolean;
     enteredSiteUrl?: CoreLoginSiteInfoExtended;
-    siteFinderSettings: CoreLoginSiteFinderSettings;
+    siteFinderSettings!: CoreLoginSiteFinderSettings;
+    stagingSitesChangeListener: CoreEventObserver;
 
-    constructor(
-        protected formBuilder: FormBuilder,
-    ) {
+    constructor(protected formBuilder: FormBuilder) {
 
         let url = '';
         this.siteSelector = CoreConstants.CONFIG.multisitesdisplay;
@@ -122,13 +122,36 @@ export class CoreLoginSitePage implements OnInit {
 
             this.loadingSites = false;
         }, 1000);
+
+        this.stagingSitesChangeListener = CoreEvents.on(
+            CoreEvents.STAGING_SITES_CHANGE,
+            async ({ enabled }: { enabled: boolean }) => {
+                if (enabled) {
+                    await this.loadStagingSites();
+
+                    return;
+                }
+
+                if (CoreLoginHelper.hasSeveralFixedSites()) {
+                    this.siteForm = this.formBuilder.group({
+                        siteUrl: [this.initSiteSelector(), this.moodleUrlValidator()],
+                    });
+
+                    return;
+                }
+
+                this.filteredSites = undefined;
+                this.fixedSites = undefined;
+            },
+        );
     }
 
     /**
      * Initialize the component.
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.showKeyboard = !!CoreNavigator.getRouteBooleanParam('showKeyboard');
+        await this.loadStagingSites();
     }
 
     /**
@@ -150,6 +173,35 @@ export class CoreLoginSitePage implements OnInit {
         return this.fixedSites[0].url;
     }
 
+    /**
+     * Load staging sites list if they are enabled.
+     */
+    protected async loadStagingSites(): Promise<void> {
+        const stagingSites = await CoreLoginHelper.getStagingSites();
+
+        if (!stagingSites.length) {
+            return;
+        }
+
+        const sites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> stagingSites);
+        this.siteSelector = 'list';
+
+        if (!this.fixedSites) {
+            this.fixedSites = [];
+        }
+
+        for (const site of sites) {
+            if (this.fixedSites.some(item => item.url === site.url)) {
+                continue;
+            }
+
+            this.fixedSites.push(site);
+        }
+
+        this.siteFinderSettings.displayimage = false;
+        this.filteredSites = this.fixedSites;
+    }
+
     /**
      * Initialize and show onboarding if needed.
      *
@@ -612,6 +664,13 @@ export class CoreLoginSitePage implements OnInit {
         CoreNavigator.navigate('/settings');
     }
 
+    /**
+     * @inheritdoc
+     */
+    ngOnDestroy(): void {
+        this.stagingSitesChangeListener.off();
+    }
+
 }
 
 /**
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 7fc945b2f..75755be12 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -40,6 +40,7 @@ import { CorePath } from '@singletons/path';
 import { CorePromisedValue } from '@classes/promised-value';
 import { SafeHtml } from '@angular/platform-browser';
 import { CoreLoginError } from '@classes/errors/loginerror';
+import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 
 const PASSWORD_RESETS_CONFIG_KEY = 'password-resets';
 
@@ -385,6 +386,21 @@ export class CoreLoginHelperProvider {
         return CoreLoginHelper.isUniqueFixedSite() ? CoreConstants.CONFIG.sites[0].url : CoreConstants.CONFIG.sites;
     }
 
+    /**
+     * Get staging sites.
+     *
+     * @returns Staging sites.
+     */
+    async getStagingSites(): Promise<CoreLoginSiteInfo[]> {
+        const hasEnabledStagingSites = await CoreSettingsHelper.hasEnabledStagingSites();
+
+        if (!hasEnabledStagingSites) {
+            return [];
+        }
+
+        return CoreConstants.CONFIG.stagingsites;
+    }
+
     /**
      * Get the valid identity providers from a site config.
      *
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index d1a0deffd..a2459840a 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -30,6 +30,12 @@
             </ion-label>
             <ion-toggle [(ngModel)]="forceSafeAreaMargins" (ionChange)="safeAreaChanged()"></ion-toggle>
         </ion-item>
+        <ion-item class="ion-text-wrap" *ngIf="stagingSites.length">
+            <ion-label>
+                <h2>Enable staging sites</h2>
+            </ion-label>
+            <ion-toggle [(ngModel)]="enableStagingSites" (ionChange)="setEnabledStagingSites()"></ion-toggle>
+        </ion-item>
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
                 <ion-label>
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
index c7de23c24..74912c54f 100644
--- a/src/core/features/settings/pages/dev/dev.ts
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -12,13 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { CoreConstants } from '@/core/constants';
 import { Component, OnInit } from '@angular/core';
 import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
+import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreUserTours } from '@features/usertours/services/user-tours';
 import { CoreConfig } from '@services/config';
 import { CorePlatform } from '@services/platform';
-import { CoreSites } from '@services/sites';
+import { CoreLoginSiteInfo, CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 
@@ -41,6 +43,8 @@ export class CoreSettingsDevPage implements OnInit {
     pluginStylesCount = 0;
     sitePlugins: CoreSitePluginsBasicInfo[] = [];
     userToursEnabled = true;
+    stagingSites: CoreLoginSiteInfo[] = [];
+    enableStagingSites = false;
 
     disabledFeatures: string[] = [];
 
@@ -55,6 +59,12 @@ export class CoreSettingsDevPage implements OnInit {
 
         this.siteId = CoreSites.getCurrentSite()?.getId();
 
+        this.stagingSites = CoreConstants.CONFIG.stagingsites;
+
+        if (this.stagingSites.length) {
+            this.enableStagingSites = await CoreSettingsHelper.hasEnabledStagingSites();
+        }
+
         if (!this.siteId) {
             return;
         }
@@ -157,6 +167,10 @@ export class CoreSettingsDevPage implements OnInit {
         CoreDomUtils.showToast('User tours have been reseted');
     }
 
+    async setEnabledStagingSites(): Promise<void> {
+        await CoreSettingsHelper.setEnabledStagingSites(this.enableStagingSites);
+    }
+
 }
 
 // Basic site plugin info.
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 3fea5fd3a..bd88b449b 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -477,6 +477,17 @@ export class CoreSettingsHelperProvider {
         return this.darkModeObservable;
     }
 
+    async hasEnabledStagingSites(): Promise<boolean> {
+        const staging = await CoreConfig.get<string>('staging_sites', 'false');
+
+        return CoreUtils.isTrueOrOne(staging);
+    }
+
+    async setEnabledStagingSites(enabled: boolean): Promise<void> {
+        await CoreConfig.set('staging_sites', `${enabled}`);
+        CoreEvents.trigger(CoreEvents.STAGING_SITES_CHANGE, { enabled });
+    }
+
 }
 
 export const CoreSettingsHelper = makeSingleton(CoreSettingsHelperProvider);
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 331ab4712..a54c42d47 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -43,6 +43,7 @@ export interface EnvironmentConfig {
     defaultZoomLevel?: CoreZoomLevel; // Set the default zoom level of the app.
     customurlscheme: string;
     sites: CoreLoginSiteInfo[];
+    stagingsites: CoreLoginSiteInfo[];
     multisitesdisplay: CoreLoginSiteSelectorListMethod;
     sitefindersettings: Partial<CoreLoginSiteFinderSettings>;
     onlyallowlistedsites: boolean;

From fe97d32342321b703b661a4a27901a488ade4edd Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Thu, 23 Feb 2023 11:45:23 +0100
Subject: [PATCH 3/6] MOBILE-4245 Config: update sites type

---
 moodle.config.json         |  1 -
 src/core/services/sites.ts | 10 ++++++++++
 src/types/config.d.ts      |  1 -
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/moodle.config.json b/moodle.config.json
index e4cddbd91..b61f913ea 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -86,7 +86,6 @@
     },
     "customurlscheme": "moodlemobile",
     "sites": [],
-    "stagingsites": [],
     "multisitesdisplay": "",
     "sitefindersettings": {},
     "onlyallowlistedsites": false,
diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts
index a8aaf216a..816c2eb81 100644
--- a/src/core/services/sites.ts
+++ b/src/core/services/sites.ts
@@ -2105,6 +2105,16 @@ export type CoreLoginSiteInfo = {
      * Countrycode of the site.
      */
     countrycode?: string;
+
+    /**
+     * Is staging site.
+     */
+    staging?: boolean;
+
+    /**
+     * Class to apply to site item.
+     */
+    className?: string;
 };
 
 /**
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index a54c42d47..331ab4712 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -43,7 +43,6 @@ export interface EnvironmentConfig {
     defaultZoomLevel?: CoreZoomLevel; // Set the default zoom level of the app.
     customurlscheme: string;
     sites: CoreLoginSiteInfo[];
-    stagingsites: CoreLoginSiteInfo[];
     multisitesdisplay: CoreLoginSiteSelectorListMethod;
     sitefindersettings: Partial<CoreLoginSiteFinderSettings>;
     onlyallowlistedsites: boolean;

From 856a8a495716367d81920b2417a93771c3fbf4c3 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Thu, 23 Feb 2023 11:46:39 +0100
Subject: [PATCH 4/6] MOBILE-4245 Dev: Add confirmation modal before reload app

---
 src/core/features/settings/pages/dev/dev.html |  6 ++---
 src/core/features/settings/pages/dev/dev.ts   | 16 ++++++------
 .../settings/services/settings-helper.ts      | 26 ++++++++++++++++---
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index a2459840a..30100b8f6 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -30,11 +30,11 @@
             </ion-label>
             <ion-toggle [(ngModel)]="forceSafeAreaMargins" (ionChange)="safeAreaChanged()"></ion-toggle>
         </ion-item>
-        <ion-item class="ion-text-wrap" *ngIf="stagingSites.length">
+        <ion-item class="ion-text-wrap" *ngIf="stagingSitesCount && enableStagingSites !== undefined">
             <ion-label>
-                <h2>Enable staging sites</h2>
+                <h2>Enable staging sites ({{stagingSitesCount}})</h2>
             </ion-label>
-            <ion-toggle [(ngModel)]="enableStagingSites" (ionChange)="setEnabledStagingSites()"></ion-toggle>
+            <ion-toggle [checked]="enableStagingSites" (ionChange)="setEnabledStagingSites($event.detail.checked)"></ion-toggle>
         </ion-item>
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
index 74912c54f..4f920990f 100644
--- a/src/core/features/settings/pages/dev/dev.ts
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -14,13 +14,13 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Component, OnInit } from '@angular/core';
-import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreUserTours } from '@features/usertours/services/user-tours';
 import { CoreConfig } from '@services/config';
 import { CorePlatform } from '@services/platform';
-import { CoreLoginSiteInfo, CoreSites } from '@services/sites';
+import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 
@@ -43,8 +43,8 @@ export class CoreSettingsDevPage implements OnInit {
     pluginStylesCount = 0;
     sitePlugins: CoreSitePluginsBasicInfo[] = [];
     userToursEnabled = true;
-    stagingSites: CoreLoginSiteInfo[] = [];
-    enableStagingSites = false;
+    stagingSitesCount = 0;
+    enableStagingSites?: boolean;
 
     disabledFeatures: string[] = [];
 
@@ -59,9 +59,9 @@ export class CoreSettingsDevPage implements OnInit {
 
         this.siteId = CoreSites.getCurrentSite()?.getId();
 
-        this.stagingSites = CoreConstants.CONFIG.stagingsites;
+        this.stagingSitesCount = CoreConstants.CONFIG.sites.filter((site) => site.staging).length;
 
-        if (this.stagingSites.length) {
+        if (this.stagingSitesCount) {
             this.enableStagingSites = await CoreSettingsHelper.hasEnabledStagingSites();
         }
 
@@ -167,8 +167,8 @@ export class CoreSettingsDevPage implements OnInit {
         CoreDomUtils.showToast('User tours have been reseted');
     }
 
-    async setEnabledStagingSites(): Promise<void> {
-        await CoreSettingsHelper.setEnabledStagingSites(this.enableStagingSites);
+    async setEnabledStagingSites(enabled: boolean): Promise<void> {
+        await CoreSettingsHelper.setEnabledStagingSites(enabled);
     }
 
 }
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index bd88b449b..216460276 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -30,6 +30,7 @@ import { makeSingleton, Translate } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { Observable, Subject } from 'rxjs';
 import { CoreTextUtils } from '@services/utils/text';
+import { CoreNavigator } from '@services/navigator';
 
 /**
  * Object with space usage and cache entries that can be erased.
@@ -477,15 +478,32 @@ export class CoreSettingsHelperProvider {
         return this.darkModeObservable;
     }
 
+    /**
+     * Get if user enabled staging sites or not.
+     *
+     * @returns Staging sites.
+     */
     async hasEnabledStagingSites(): Promise<boolean> {
-        const staging = await CoreConfig.get<string>('staging_sites', 'false');
+        const staging = await CoreConfig.get<number>('stagingSites', 0);
 
-        return CoreUtils.isTrueOrOne(staging);
+        return !!staging;
     }
 
+    /**
+     * Persist staging sites enabled status and refresh app to apply changes.
+     *
+     * @param enabled Enabled or disabled staging sites.
+     */
     async setEnabledStagingSites(enabled: boolean): Promise<void> {
-        await CoreConfig.set('staging_sites', `${enabled}`);
-        CoreEvents.trigger(CoreEvents.STAGING_SITES_CHANGE, { enabled });
+        try {
+            await CoreConfig.set('stagingSites', enabled ? 1 : 0);
+            await CoreDomUtils.showConfirm('Are you sure that you want to enable/disable staging sites?');
+        } catch {
+            return;
+        }
+
+        await CoreNavigator.navigate('/');
+        window.location.reload();
     }
 
 }

From 7a78bb9375055ef99d3009756f1d06bfddb4f625 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Thu, 23 Feb 2023 11:50:05 +0100
Subject: [PATCH 5/6] MOBILE-4245 Site: Remove load staging sites from site
 page

---
 .../pages/courses-storage/courses-storage.ts  |  3 +-
 src/core/classes/site.ts                      | 10 ++-
 src/core/features/courses/pages/my/my.ts      | 13 +--
 src/core/features/login/guards/has-sites.ts   |  2 +-
 .../login/pages/credentials/credentials.ts    |  8 +-
 .../login/pages/reconnect/reconnect.ts        | 15 ++--
 src/core/features/login/pages/site/site.html  |  7 +-
 src/core/features/login/pages/site/site.ts    | 87 +++----------------
 .../features/login/services/login-helper.ts   | 56 +++++++-----
 .../components/user-menu/user-menu.ts         |  2 +-
 src/core/features/mainmenu/pages/home/home.ts | 13 +--
 src/core/features/settings/pages/dev/dev.html |  2 +-
 src/core/features/settings/pages/dev/dev.ts   | 18 +++-
 .../settings/pages/deviceinfo/deviceinfo.ts   | 13 ++-
 .../settings/pages/space-usage/space-usage.ts |  2 +-
 .../pages/synchronization/synchronization.ts  |  2 +-
 .../settings/services/settings-helper.ts      | 11 ++-
 src/core/services/update-manager.ts           |  4 +-
 18 files changed, 129 insertions(+), 139 deletions(-)

diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
index 1266f98bf..9e9eb145e 100644
--- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
+++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts
@@ -261,7 +261,8 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
         event.stopPropagation();
 
         try {
-            const siteName = CoreSites.getRequiredCurrentSite().getSiteName();
+            const site = CoreSites.getRequiredCurrentSite();
+            const siteName = await site.getSiteName();
 
             this.spaceUsage = await CoreSettingsHelper.deleteSiteStorage(siteName, this.siteId);
         } catch {
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index 88a110585..ac7b946e1 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -290,14 +290,18 @@ export class CoreSite {
      *
      * @returns Site name.
      */
-    getSiteName(): string {
+    async getSiteName(): Promise<string> {
         if (this.infos?.sitename) {
             return this.infos?.sitename;
         }
 
         // Fallback.
-        if (CoreLoginHelper.isUniqueFixedSite()) {
-            return CoreConstants.CONFIG.sites[0].name ;
+        const isSigleFixedSite = await CoreLoginHelper.isSingleFixedSite();
+
+        if (isSigleFixedSite) {
+            const sites = await CoreLoginHelper.getAvailableSites();
+
+            return sites[0].name;
         }
 
         return '';
diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts
index 99c212873..c9d956500 100644
--- a/src/core/features/courses/pages/my/my.ts
+++ b/src/core/features/courses/pages/my/my.ts
@@ -61,9 +61,9 @@ export class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective {
 
     constructor(protected loadsManager: PageLoadsManager) {
         // Refresh the enabled flags if site is updated.
-        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
+        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, async () => {
             this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
-            this.loadSiteName();
+            await this.loadSiteName();
 
         }, CoreSites.getCurrentSiteId());
 
@@ -78,13 +78,13 @@ export class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.downloadCoursesEnabled = !CoreCourses.isDownloadCoursesDisabledInSite();
 
         const deepLinkManager = new CoreMainMenuDeepLinkManager();
         deepLinkManager.treatLink();
 
-        this.loadSiteName();
+        await this.loadSiteName();
 
         this.loadContent(true);
     }
@@ -143,8 +143,9 @@ export class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective {
     /**
      * Load the site name.
      */
-    protected loadSiteName(): void {
-        this.siteName = CoreSites.getRequiredCurrentSite().getSiteName() || '';
+    protected async loadSiteName(): Promise<void> {
+        const site = CoreSites.getRequiredCurrentSite();
+        this.siteName = await site.getSiteName() || '';
     }
 
     /**
diff --git a/src/core/features/login/guards/has-sites.ts b/src/core/features/login/guards/has-sites.ts
index 8a8a6ef20..a96745941 100644
--- a/src/core/features/login/guards/has-sites.ts
+++ b/src/core/features/login/guards/has-sites.ts
@@ -50,7 +50,7 @@ export class CoreLoginHasSitesGuard implements CanActivate, CanLoad {
             return true;
         }
 
-        const [path, params] = CoreLoginHelper.getAddSiteRouteInfo();
+        const [path, params] = await CoreLoginHelper.getAddSiteRouteInfo();
         const route = Router.parseUrl(path);
 
         route.queryParams = params;
diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts
index 95a6ca7af..f5a0517c4 100644
--- a/src/core/features/login/pages/credentials/credentials.ts
+++ b/src/core/features/login/pages/credentials/credentials.ts
@@ -99,7 +99,9 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
             this.treatSiteConfig();
         }
 
-        if (CoreLoginHelper.isUniqueFixedSite() || !this.siteConfig) {
+        const isSingleFixedSite = await CoreLoginHelper.isSingleFixedSite();
+
+        if (isSingleFixedSite || !this.siteConfig) {
             // Fixed URL or not siteConfig retrieved from params, we need to check if it uses browser SSO login.
             this.checkSite(this.siteUrl, true);
         } else {
@@ -196,12 +198,12 @@ export class CoreLoginCredentialsPage implements OnInit, OnDestroy {
     /**
      * Treat the site configuration (if it exists).
      */
-    protected treatSiteConfig(): void {
+    protected async treatSiteConfig(): Promise<void> {
         if (this.siteConfig) {
             this.siteName = this.siteConfig.sitename;
             this.logoUrl = CoreLoginHelper.getLogoUrl(this.siteConfig);
             this.authInstructions = this.siteConfig.authinstructions || Translate.instant('core.login.loginsteps');
-            this.showScanQR = CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
+            this.showScanQR = await CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
 
             const disabledFeatures = CoreLoginHelper.getDisabledFeatures(this.siteConfig);
             this.identityProviders = CoreLoginHelper.getValidIdentityProviders(this.siteConfig, disabledFeatures);
diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts
index e37ba5702..65d696c93 100644
--- a/src/core/features/login/pages/reconnect/reconnect.ts
+++ b/src/core/features/login/pages/reconnect/reconnect.ts
@@ -31,7 +31,6 @@ import { CoreUserSupportConfig } from '@features/user/classes/support/support-co
 import { CoreUserAuthenticatedSupportConfig } from '@features/user/classes/support/authenticated-support-config';
 import { Translate } from '@singletons';
 import { SafeHtml } from '@angular/platform-browser';
-import { CoreConstants } from '@/core/constants';
 
 /**
  * Page to enter the user password to reconnect to a site.
@@ -109,14 +108,16 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
             this.userFullName = site.infos.fullname;
             this.userAvatar = site.infos.userpictureurl;
             this.siteUrl = site.infos.siteurl;
-            this.siteName = site.getSiteName();
+            this.siteName = await site.getSiteName();
             this.supportConfig = new CoreUserAuthenticatedSupportConfig(site);
 
             // If login was OAuth we should only reach this page if the OAuth method ID has changed.
             this.isOAuth = site.isOAuth();
 
+            const sites = await CoreLoginHelper.getAvailableSites();
+
             // Show logo instead of avatar if it's a fixed site.
-            this.showUserAvatar = !!this.userAvatar && !CoreConstants.CONFIG.sites.length;
+            this.showUserAvatar = !!this.userAvatar && !sites.length;
 
             this.checkSiteConfig(site);
 
@@ -181,8 +182,12 @@ export class CoreLoginReconnectPage implements OnInit, OnDestroy {
         }
 
         this.isBrowserSSO = !this.isOAuth && CoreLoginHelper.isSSOLoginNeeded(this.siteConfig.typeoflogin);
-        this.showScanQR = CoreLoginHelper.displayQRInSiteScreen() ||
-            CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
+
+        this.showScanQR = CoreLoginHelper.displayQRInSiteScreen();
+
+        if (!this.showScanQR) {
+            this.showScanQR = await CoreLoginHelper.displayQRInCredentialsScreen(this.siteConfig.tool_mobile_qrcodetype);
+        }
 
         await CoreSites.checkApplication(this.siteConfig);
 
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index 510e317c5..e2d50ea3d 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -20,7 +20,7 @@
         <div class="ion-text-center ion-padding ion-margin-bottom core-login-site-logo" [class.hidden]="hasSites || enteredSiteUrl">
             <img src="assets/img/login_logo.png" class="avatar-full login-logo" role="presentation" alt="">
         </div>
-        <form [formGroup]="siteForm" (ngSubmit)="connect($event, siteForm.value.siteUrl)" *ngIf="!fixedSites" #siteFormEl>
+        <form [formGroup]="siteForm" (ngSubmit)="connect($event, siteForm.value.siteUrl)" *ngIf="!fixedSites && siteForm" #siteFormEl>
             <!-- Form to input the site URL if there are no fixed sites. -->
             <ng-container *ngIf=" siteSelector=='url'">
                 <ion-item>
@@ -101,7 +101,8 @@
         </ng-container>
 
         <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
-            <div class="ion-text-center ion-padding ion-margin-top core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
+            <div class="ion-text-center ion-padding ion-margin-top core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}
+            </div>
             <ion-button expand="block" fill="outline" class="ion-margin core-login-site-qrcode" (click)="showInstructionsAndScanQR()"
                 aria-haspopup="dialog">
                 <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
@@ -119,7 +120,7 @@
 
 <!-- Template site selector. -->
 <ng-template #sitelisting let-site="site">
-    <ion-item button (click)="connect($event, site.url, site)" [attr.aria-label]="site.name" detail="true">
+    <ion-item button (click)="connect($event, site.url, site)" [ngClass]="site.className" [attr.aria-label]="site.name" detail="true">
         <ion-thumbnail *ngIf="siteFinderSettings.displayimage" slot="start">
             <img [src]="site.imageurl" *ngIf="site.imageurl" onError="this.src='assets/icon/icon.png'" alt="" role="presentation">
             <img src="assets/icon/icon.png" *ngIf="!site.imageurl" class="core-login-default-icon" alt="" role="presentation">
diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts
index aed2c04ca..2edce7904 100644
--- a/src/core/features/login/pages/site/site.ts
+++ b/src/core/features/login/pages/site/site.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
 import { FormBuilder, FormGroup, ValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms';
 
 import { CoreApp } from '@services/app';
@@ -46,7 +46,6 @@ import { CoreUserSupportConfig } from '@features/user/classes/support/support-co
 import { CoreUserGuestSupportConfig } from '@features/user/classes/support/guest-support-config';
 import { CoreLoginError } from '@classes/errors/loginerror';
 import { CorePlatform } from '@services/platform';
-import { CoreEventObserver, CoreEvents } from '@singletons/events';
 
 /**
  * Site (url) chooser when adding a new site.
@@ -56,7 +55,7 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
     templateUrl: 'site.html',
     styleUrls: ['site.scss', '../../login.scss'],
 })
-export class CoreLoginSitePage implements OnInit, OnDestroy {
+export class CoreLoginSitePage implements OnInit {
 
     @ViewChild('siteFormEl') formElement?: ElementRef;
 
@@ -73,10 +72,13 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
     showScanQR!: boolean;
     enteredSiteUrl?: CoreLoginSiteInfoExtended;
     siteFinderSettings!: CoreLoginSiteFinderSettings;
-    stagingSitesChangeListener: CoreEventObserver;
 
-    constructor(protected formBuilder: FormBuilder) {
+    constructor(protected formBuilder: FormBuilder) {}
 
+    /**
+     * Initialize the component.
+     */
+    async ngOnInit(): Promise<void> {
         let url = '';
         this.siteSelector = CoreConstants.CONFIG.multisitesdisplay;
 
@@ -92,8 +94,10 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
         };
 
         // Load fixed sites if they're set.
-        if (CoreConstants.CONFIG.sites.length) {
-            url = this.initSiteSelector();
+        const sites = await CoreLoginHelper.getAvailableSites();
+
+        if (sites.length) {
+            url = await this.initSiteSelector();
         } else if (CoreConstants.CONFIG.enableonboarding && !CorePlatform.isIOS()) {
             this.initOnboarding();
         }
@@ -123,35 +127,7 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
             this.loadingSites = false;
         }, 1000);
 
-        this.stagingSitesChangeListener = CoreEvents.on(
-            CoreEvents.STAGING_SITES_CHANGE,
-            async ({ enabled }: { enabled: boolean }) => {
-                if (enabled) {
-                    await this.loadStagingSites();
-
-                    return;
-                }
-
-                if (CoreLoginHelper.hasSeveralFixedSites()) {
-                    this.siteForm = this.formBuilder.group({
-                        siteUrl: [this.initSiteSelector(), this.moodleUrlValidator()],
-                    });
-
-                    return;
-                }
-
-                this.filteredSites = undefined;
-                this.fixedSites = undefined;
-            },
-        );
-    }
-
-    /**
-     * Initialize the component.
-     */
-    async ngOnInit(): Promise<void> {
         this.showKeyboard = !!CoreNavigator.getRouteBooleanParam('showKeyboard');
-        await this.loadStagingSites();
     }
 
     /**
@@ -159,8 +135,9 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
      *
      * @returns URL of the first site.
      */
-    protected initSiteSelector(): string {
-        this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreConstants.CONFIG.sites);
+    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
 
         // Do not show images if none are set.
@@ -173,35 +150,6 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
         return this.fixedSites[0].url;
     }
 
-    /**
-     * Load staging sites list if they are enabled.
-     */
-    protected async loadStagingSites(): Promise<void> {
-        const stagingSites = await CoreLoginHelper.getStagingSites();
-
-        if (!stagingSites.length) {
-            return;
-        }
-
-        const sites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> stagingSites);
-        this.siteSelector = 'list';
-
-        if (!this.fixedSites) {
-            this.fixedSites = [];
-        }
-
-        for (const site of sites) {
-            if (this.fixedSites.some(item => item.url === site.url)) {
-                continue;
-            }
-
-            this.fixedSites.push(site);
-        }
-
-        this.siteFinderSettings.displayimage = false;
-        this.filteredSites = this.fixedSites;
-    }
-
     /**
      * Initialize and show onboarding if needed.
      *
@@ -664,13 +612,6 @@ export class CoreLoginSitePage implements OnInit, OnDestroy {
         CoreNavigator.navigate('/settings');
     }
 
-    /**
-     * @inheritdoc
-     */
-    ngOnDestroy(): void {
-        this.stagingSitesChangeListener.off();
-    }
-
 }
 
 /**
diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts
index 75755be12..8d85e476a 100644
--- a/src/core/features/login/services/login-helper.ts
+++ b/src/core/features/login/services/login-helper.ts
@@ -380,25 +380,23 @@ export class CoreLoginHelperProvider {
      * Get fixed site or sites.
      *
      * @returns Fixed site or list of fixed sites.
-     * @deprecated 4.2.0 use CoreConstants.CONFIG.sites instead.
+     * @deprecated since 4.2.0. Use CoreConstants.CONFIG.sites or getAvailableSites() instead.
      */
     getFixedSites(): string | CoreLoginSiteInfo[] {
-        return CoreLoginHelper.isUniqueFixedSite() ? CoreConstants.CONFIG.sites[0].url : CoreConstants.CONFIG.sites;
+        const notStagingSites = CoreConstants.CONFIG.sites.filter(site => !site.staging);
+
+        return notStagingSites.length === 1 ? notStagingSites[0].url : notStagingSites;
     }
 
     /**
-     * Get staging sites.
+     * Get Available sites (includes staging sites if are enabled).
      *
-     * @returns Staging sites.
+     * @returns Available sites.
      */
-    async getStagingSites(): Promise<CoreLoginSiteInfo[]> {
+    async getAvailableSites(): Promise<CoreLoginSiteInfo[]> {
         const hasEnabledStagingSites = await CoreSettingsHelper.hasEnabledStagingSites();
 
-        if (!hasEnabledStagingSites) {
-            return [];
-        }
-
-        return CoreConstants.CONFIG.stagingsites;
+        return hasEnabledStagingSites ? CoreConstants.CONFIG.sites : CoreConstants.CONFIG.sites.filter(site => !site.staging);
     }
 
     /**
@@ -457,7 +455,7 @@ export class CoreLoginHelperProvider {
                 return;
             }
         } else {
-            [path, params] = this.getAddSiteRouteInfo(showKeyboard);
+            [path, params] = await this.getAddSiteRouteInfo(showKeyboard);
         }
 
         await CoreNavigator.navigate(path, { params, reset: setRoot });
@@ -469,10 +467,12 @@ export class CoreLoginHelperProvider {
      * @param showKeyboard Whether to show keyboard in the new page. Only if no fixed URL set.
      * @returns Path and params.
      */
-    getAddSiteRouteInfo(showKeyboard?: boolean): [string, Params] {
-        if (CoreLoginHelper.isUniqueFixedSite()) {
+    async getAddSiteRouteInfo(showKeyboard?: boolean): Promise<[string, Params]> {
+        const sites = await this.getAvailableSites();
+
+        if (sites.length === 1) {
             // Fixed URL is set, go to credentials page.
-            return ['/login/credentials', { siteUrl: CoreConstants.CONFIG.sites[0].url }];
+            return ['/login/credentials', { siteUrl: sites[0].url }];
         }
 
         return ['/login/site', { showKeyboard }];
@@ -534,8 +534,10 @@ export class CoreLoginHelperProvider {
      * @returns Whether there are several fixed URLs.
      * @deprecated 4.2.0 Use CoreConstants.CONFIG.sites.length > 1 instead.
      */
-    hasSeveralFixedSites(): boolean {
-        return CoreConstants.CONFIG.sites.length > 1;
+    async hasSeveralFixedSites(): Promise<boolean> {
+        const sites = await this.getAvailableSites();
+
+        return sites.length > 1;
     }
 
     /**
@@ -571,10 +573,10 @@ export class CoreLoginHelperProvider {
      * Check if the app is configured to use a fixed URL (only 1).
      *
      * @returns Whether there is 1 fixed URL.
-     * @deprecated 4.2.0 Use isUniqueFixedSite instead.
+     * @deprecated 4.2.0 Use isSingleFixedSite instead.
      */
     isFixedUrlSet(): boolean {
-        return this.isUniqueFixedSite();
+        return CoreConstants.CONFIG.sites.filter(site => !site.staging).length === 1;
     }
 
     /**
@@ -582,8 +584,10 @@ export class CoreLoginHelperProvider {
      *
      * @returns Whether there is 1 fixed URL.
      */
-    isUniqueFixedSite(): boolean {
-        return CoreConstants.CONFIG.sites.length === 1;
+    async isSingleFixedSite(): Promise<boolean> {
+        const sites = await this.getAvailableSites();
+
+        return sites.length === 1;
     }
 
     /**
@@ -626,8 +630,10 @@ export class CoreLoginHelperProvider {
      * @returns Promise resolved with boolean: whether is one of the fixed sites.
      */
     async isSiteUrlAllowed(siteUrl: string, checkSiteFinder = true): Promise<boolean> {
-        if (CoreConstants.CONFIG.sites.length) {
-            return CoreConstants.CONFIG.sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url));
+        const sites = await this.getAvailableSites();
+
+        if (sites.length) {
+            return sites.some((site) => CoreUrl.sameDomainAndPath(siteUrl, site.url));
         } else if (CoreConstants.CONFIG.multisitesdisplay == 'sitefinder' && CoreConstants.CONFIG.onlyallowlistedsites &&
                 checkSiteFinder) {
             // Call the sites finder to validate the site.
@@ -1318,12 +1324,14 @@ export class CoreLoginHelperProvider {
      * @param qrCodeType QR Code type from public config, assuming enabled if undefined.
      * @returns Whether the QR reader should be displayed in credentials screen.
      */
-    displayQRInCredentialsScreen(qrCodeType = CoreSiteQRCodeType.QR_CODE_LOGIN): boolean {
+    async displayQRInCredentialsScreen(qrCodeType = CoreSiteQRCodeType.QR_CODE_LOGIN): Promise<boolean> {
         if (!CoreUtils.canScanQR()) {
             return false;
         }
 
-        if ((CoreConstants.CONFIG.displayqroncredentialscreen === undefined && CoreLoginHelper.isUniqueFixedSite()) ||
+        const isSingleFixedSite = await this.isSingleFixedSite();
+
+        if ((CoreConstants.CONFIG.displayqroncredentialscreen === undefined && isSingleFixedSite) ||
             (CoreConstants.CONFIG.displayqroncredentialscreen !== undefined &&
                 !!CoreConstants.CONFIG.displayqroncredentialscreen)) {
 
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
index b85a2866f..c3a14004d 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.ts
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -65,7 +65,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
         const currentSite = CoreSites.getRequiredCurrentSite();
         this.siteId = currentSite.getId();
         this.siteInfo = currentSite.getInfo();
-        this.siteName = currentSite.getSiteName();
+        this.siteName = await currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
         this.displaySwitchAccount = !currentSite.isFeatureDisabled('NoDelegate_SwitchAccount');
         this.displayContactSupport = new CoreUserAuthenticatedSupportConfig(currentSite).canContactSupport();
diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts
index 9187887b0..ac827d54f 100644
--- a/src/core/features/mainmenu/pages/home/home.ts
+++ b/src/core/features/mainmenu/pages/home/home.ts
@@ -45,18 +45,18 @@ export class CoreMainMenuHomePage implements OnInit {
     /**
      * @inheritdoc
      */
-    ngOnInit(): void {
+    async ngOnInit(): Promise<void> {
         this.deepLinkManager = new CoreMainMenuDeepLinkManager();
 
-        this.loadSiteName();
+        await this.loadSiteName();
 
         this.subscription = CoreMainMenuHomeDelegate.getHandlersObservable().subscribe((handlers) => {
             handlers && this.initHandlers(handlers);
         });
 
         // Refresh the enabled flags if site is updated.
-        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
-            this.loadSiteName();
+        this.updateSiteObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, async () => {
+            await this.loadSiteName();
         }, CoreSites.getCurrentSiteId());
     }
 
@@ -99,8 +99,9 @@ export class CoreMainMenuHomePage implements OnInit {
     /**
      * Load the site name.
      */
-    protected loadSiteName(): void {
-        this.siteName = CoreSites.getRequiredCurrentSite().getSiteName() || '';
+    protected async loadSiteName(): Promise<void> {
+        const site = CoreSites.getRequiredCurrentSite();
+        this.siteName = await site.getSiteName() || '';
     }
 
     /**
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
index 30100b8f6..d72cbcba4 100644
--- a/src/core/features/settings/pages/dev/dev.html
+++ b/src/core/features/settings/pages/dev/dev.html
@@ -34,7 +34,7 @@
             <ion-label>
                 <h2>Enable staging sites ({{stagingSitesCount}})</h2>
             </ion-label>
-            <ion-toggle [checked]="enableStagingSites" (ionChange)="setEnabledStagingSites($event.detail.checked)"></ion-toggle>
+            <ion-toggle [(ngModel)]="enableStagingSites" (ionChange)="setEnabledStagingSites($event.detail.checked)"></ion-toggle>
         </ion-item>
         <ng-container *ngIf="siteId">
             <ion-item class="ion-text-wrap">
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
index 4f920990f..ee30001a5 100644
--- a/src/core/features/settings/pages/dev/dev.ts
+++ b/src/core/features/settings/pages/dev/dev.ts
@@ -14,7 +14,7 @@
 
 import { CoreConstants } from '@/core/constants';
 import { Component, OnInit } from '@angular/core';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper';
+import { CoreLoginHelperProvider } from '@features/login/services/login-helper';
 import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
 import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 import { CoreUserTours } from '@features/usertours/services/user-tours';
@@ -45,6 +45,7 @@ export class CoreSettingsDevPage implements OnInit {
     userToursEnabled = true;
     stagingSitesCount = 0;
     enableStagingSites?: boolean;
+    listenStagingSitesChanges = false;
 
     disabledFeatures: string[] = [];
 
@@ -63,6 +64,7 @@ export class CoreSettingsDevPage implements OnInit {
 
         if (this.stagingSitesCount) {
             this.enableStagingSites = await CoreSettingsHelper.hasEnabledStagingSites();
+            this.listenStagingSitesChanges = true;
         }
 
         if (!this.siteId) {
@@ -168,7 +170,19 @@ export class CoreSettingsDevPage implements OnInit {
     }
 
     async setEnabledStagingSites(enabled: boolean): Promise<void> {
-        await CoreSettingsHelper.setEnabledStagingSites(enabled);
+        if (!this.listenStagingSitesChanges) {
+            this.listenStagingSitesChanges = true;
+
+            return;
+        }
+
+        try {
+            await CoreSettingsHelper.setEnabledStagingSites(enabled);
+        } catch (error) {
+            this.enableStagingSites = !enabled;
+            this.listenStagingSitesChanges = false;
+            CoreDomUtils.showErrorModal(error);
+        }
     }
 
 }
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
index b407ba2e2..7db0a83fc 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts
@@ -168,10 +168,6 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
         }
 
         const currentSite = sitesProvider.getCurrentSite();
-        const firstUrl = CoreLoginHelper.isUniqueFixedSite() && CoreConstants.CONFIG.sites[0].url;
-
-        this.deviceInfo.siteUrl = currentSite?.getURL() || firstUrl || undefined;
-        this.deviceInfo.isPrefixedUrl = !!CoreConstants.CONFIG.sites.length;
         this.deviceInfo.siteId = currentSite?.getId();
         this.deviceInfo.siteVersion = currentSite?.getInfo()?.release;
 
@@ -190,12 +186,21 @@ export class CoreSettingsDeviceInfoPage implements OnDestroy {
      * Async part of the constructor.
      */
     protected async asyncInit(): Promise<void> {
+        const sitesProvider = CoreSites.instance;
         const fileProvider = CoreFile.instance;
 
         const lang = await CoreLang.getCurrentLanguage();
         this.deviceInfo.currentLanguage = lang;
         this.currentLangName = CoreConstants.CONFIG.languages[lang];
 
+        const currentSite = sitesProvider.getCurrentSite();
+        const isSingleFixedSite = await CoreLoginHelper.isSingleFixedSite();
+        const sites = await CoreLoginHelper.getAvailableSites();
+        const firstUrl = isSingleFixedSite && sites[0].url;
+
+        this.deviceInfo.siteUrl = currentSite?.getURL() || firstUrl || undefined;
+        this.deviceInfo.isPrefixedUrl = !!sites.length;
+
         if (fileProvider.isAvailable()) {
             const basepath = await fileProvider.getBasePath();
             this.deviceInfo.fileSystemRoot = basepath;
diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts
index d243af347..a5da5c48a 100644
--- a/src/core/features/settings/pages/space-usage/space-usage.ts
+++ b/src/core/features/settings/pages/space-usage/space-usage.ts
@@ -66,7 +66,7 @@ export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy {
 
             const site = await CoreSites.getSite(siteId);
             const siteInfo = site.getInfo();
-            siteEntry.siteName = site.getSiteName();
+            siteEntry.siteName = await site.getSiteName();
 
             if (siteInfo) {
                 siteEntry.siteUrl = siteInfo.siteurl;
diff --git a/src/core/features/settings/pages/synchronization/synchronization.ts b/src/core/features/settings/pages/synchronization/synchronization.ts
index 4886300e2..a5c25a507 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.ts
+++ b/src/core/features/settings/pages/synchronization/synchronization.ts
@@ -80,7 +80,7 @@ export class CoreSettingsSynchronizationPage implements OnInit, OnDestroy {
 
             const siteInfo = site.getInfo();
 
-            siteEntry.siteName = site.getSiteName();
+            siteEntry.siteName = await site.getSiteName();
 
             if (siteInfo) {
                 siteEntry.siteUrl = siteInfo.siteurl;
diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts
index 216460276..428bce442 100644
--- a/src/core/features/settings/services/settings-helper.ts
+++ b/src/core/features/settings/services/settings-helper.ts
@@ -495,10 +495,15 @@ export class CoreSettingsHelperProvider {
      * @param enabled Enabled or disabled staging sites.
      */
     async setEnabledStagingSites(enabled: boolean): Promise<void> {
-        try {
-            await CoreConfig.set('stagingSites', enabled ? 1 : 0);
+        const reloadApp = !CoreSites.isLoggedIn();
+
+        if (reloadApp) {
             await CoreDomUtils.showConfirm('Are you sure that you want to enable/disable staging sites?');
-        } catch {
+        }
+
+        await CoreConfig.set('stagingSites', enabled ? 1 : 0);
+
+        if (!reloadApp) {
             return;
         }
 
diff --git a/src/core/services/update-manager.ts b/src/core/services/update-manager.ts
index ce2c8fb20..3093e938b 100644
--- a/src/core/services/update-manager.ts
+++ b/src/core/services/update-manager.ts
@@ -109,7 +109,9 @@ export class CoreUpdateManagerProvider {
      * @returns Promise resolved when done.
      */
     protected async checkCurrentSiteAllowed(): Promise<void> {
-        if (!CoreConstants.CONFIG.sites.length) {
+        const sites = await CoreLoginHelper.getAvailableSites();
+
+        if (!sites.length) {
             return;
         }
 

From 1506228c74ea301c172a40019ccbdc8ebfd7e2ea Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 13 Mar 2023 10:19:59 +0100
Subject: [PATCH 6/6] MOBILE-4245 Credentials: Fix NullInjectorError when
 provide HttpClient

---
 .../components/show-password/show-password.ts | 11 +++++--
 .../features/login/tests/credentials.test.ts  | 33 ++++++++++++-------
 .../features/sitehome/tests/links.test.ts     |  3 ++
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/core/components/show-password/show-password.ts b/src/core/components/show-password/show-password.ts
index 3b61044bf..735a4c4c5 100644
--- a/src/core/components/show-password/show-password.ts
+++ b/src/core/components/show-password/show-password.ts
@@ -65,9 +65,14 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
      */
     async ngAfterViewInit(): Promise<void> {
         if (this.ionInput) {
-            // It's an ion-input, use it to get the native element.
-            this.input = await this.ionInput.getInputElement();
-            this.setData(this.input);
+            try {
+                // It's an ion-input, use it to get the native element.
+                this.input = await this.ionInput.getInputElement();
+                this.setData(this.input);
+            } catch (error) {
+                // This should never fail, but it does in some testing environment because Ionic elements are not
+                // rendered properly. So in case this fails, we'll just ignore the error.
+            }
 
             return;
         }
diff --git a/src/core/features/login/tests/credentials.test.ts b/src/core/features/login/tests/credentials.test.ts
index 2d0b98341..5a80112af 100644
--- a/src/core/features/login/tests/credentials.test.ts
+++ b/src/core/features/login/tests/credentials.test.ts
@@ -18,17 +18,26 @@ import { CoreLoginError } from '@classes/errors/loginerror';
 import { CoreLoginComponentsModule } from '@features/login/components/components.module';
 import { CoreLoginCredentialsPage } from '@features/login/pages/credentials/credentials';
 import { CoreSites } from '@services/sites';
+import { Http } from '@singletons';
+import { of } from 'rxjs';
+import { CoreLoginHelper } from '../services/login-helper';
 
 describe('Credentials page', () => {
 
+    const siteUrl = 'https://campus.example.edu';
+
+    beforeEach(() => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        mockSingleton(Http, { get: () => of(null as any) });
+    });
+
     it('renders', async () => {
         // Arrange.
-        const siteUrl = 'https://campus.example.edu';
 
         mockSingleton(CoreSites, {
             getPublicSiteConfigByUrl: async () => ({
-                wwwroot: 'https://campus.example.edu',
-                httpswwwroot: 'https://campus.example.edu',
+                wwwroot: siteUrl,
+                httpswwwroot: siteUrl,
                 sitename: 'Example Campus',
                 guestlogin: 0,
                 rememberusername: 0,
@@ -45,6 +54,8 @@ describe('Credentials page', () => {
             }),
         });
 
+        mockSingleton(CoreLoginHelper, { getAvailableSites: async () => [{ url: siteUrl, name: 'Example Campus' }] });
+
         // Act.
         const fixture = await renderPageComponent(CoreLoginCredentialsPage, {
             routeParams: { siteUrl },
@@ -58,7 +69,7 @@ describe('Credentials page', () => {
         expect(findElement(fixture, '.core-siteurl', siteUrl)).not.toBeNull();
     });
 
-    it('suggests contacting support after multiple failed attempts', async () => {
+    it('suggests contacting support after multiple failed attempts', async (done) => {
         // Arrange.
         mockSingleton(CoreSites, {
             getUserToken: () => {
@@ -69,17 +80,15 @@ describe('Credentials page', () => {
             },
         });
 
+        mockSingleton(CoreLoginHelper, { getAvailableSites: async () => [] });
+
         const fixture = await renderPageComponent(CoreLoginCredentialsPage, {
-            routeParams: {
-                siteUrl: 'https://campus.example.edu',
-                siteConfig: { supportpage: '' },
-            },
-            imports: [
-                CoreSharedModule,
-                CoreLoginComponentsModule,
-            ],
+            routeParams: { siteUrl, siteConfig: { supportpage: '' } },
+            imports: [CoreSharedModule, CoreLoginComponentsModule],
         });
 
+        done();
+
         // Act.
         const form = requireElement<HTMLFormElement>(fixture, 'form');
         const formControls = fixture.componentInstance.credForm.controls;
diff --git a/src/core/features/sitehome/tests/links.test.ts b/src/core/features/sitehome/tests/links.test.ts
index 5c515fb65..528e11b6e 100644
--- a/src/core/features/sitehome/tests/links.test.ts
+++ b/src/core/features/sitehome/tests/links.test.ts
@@ -15,6 +15,7 @@
 import { mock, mockSingleton } from '@/testing/utils';
 import { CoreSite } from '@classes/site';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
+import { CoreLoginHelper } from '@features/login/services/login-helper';
 import { CoreSiteHomeIndexLinkHandlerService } from '@features/sitehome/services/handlers/index-link';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -33,6 +34,8 @@ describe('Site Home link handlers', () => {
             getSiteIdsFromUrl: () => Promise.resolve([siteId]),
         }));
 
+        mockSingleton(CoreLoginHelper, { getAvailableSites: async () => [{ url: siteUrl, name: 'Example Campus' }] });
+
         CoreContentLinksDelegate.registerHandler(new CoreSiteHomeIndexLinkHandlerService());
 
         // Act.