From e23dd06dd6bf424fd1e32a325abbdee2409488f5 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 25 Feb 2020 16:05:27 +0100 Subject: [PATCH] MOBILE-3269 login: Use function to get logo URL --- src/core/login/pages/credentials/credentials.ts | 2 +- src/core/login/pages/reconnect/reconnect.ts | 2 +- src/core/login/providers/helper.ts | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts index 0aaccaa12..0f1734f9e 100644 --- a/src/core/login/pages/credentials/credentials.ts +++ b/src/core/login/pages/credentials/credentials.ts @@ -156,7 +156,7 @@ export class CoreLoginCredentialsPage { protected treatSiteConfig(): void { if (this.siteConfig) { this.siteName = CoreConfigConstants.sitename ? CoreConfigConstants.sitename : this.siteConfig.sitename; - this.logoUrl = this.siteConfig.logourl || this.siteConfig.compactlogourl; + this.logoUrl = this.loginHelper.getLogoUrl(this.siteConfig); this.authInstructions = this.siteConfig.authinstructions || this.translate.instant('core.login.loginsteps'); const disabledFeatures = this.loginHelper.getDisabledFeatures(this.siteConfig); diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts index 59918eab7..d8dea0a67 100644 --- a/src/core/login/pages/reconnect/reconnect.ts +++ b/src/core/login/pages/reconnect/reconnect.ts @@ -105,7 +105,7 @@ export class CoreLoginReconnectPage { // Check logoURL if user avatar is not set. if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) { this.showSiteAvatar = false; - this.logoUrl = config.logourl || config.compactlogourl; + this.logoUrl = this.loginHelper.getLogoUrl(config); } this.getDataFromConfig(this.siteConfig); diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts index 7cd8a740c..a1d31aa0e 100644 --- a/src/core/login/providers/helper.ts +++ b/src/core/login/providers/helper.ts @@ -389,6 +389,16 @@ export class CoreLoginHelperProvider { return errors; } + /** + * Get logo URL from a site public config. + * + * @param config Site public config. + * @return Logo URL. + */ + getLogoUrl(config: any): string { + return config ? (config.logourl || config.compactlogourl) : null; + } + /** * Returns the logout label of a site. *