From 35163f473c36c208b56a427121c03f88122a5316 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 17 Dec 2018 13:31:18 +0100 Subject: [PATCH] MOBILE-2791 login: Fix get site policy when recently added --- src/core/login/providers/helper.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts index 838d217b7..8590c8d04 100644 --- a/src/core/login/providers/helper.ts +++ b/src/core/login/providers/helper.ts @@ -335,15 +335,15 @@ export class CoreLoginHelperProvider { */ getSitePolicy(siteId?: string): Promise { return this.sitesProvider.getSite(siteId).then((site) => { - // Check if it's stored in the site config. - const sitePolicy = site.getStoredConfig('sitepolicy'); - if (typeof sitePolicy != 'undefined') { + // Try to get the latest config, maybe the site policy was just added or has changed. + return site.getConfig('sitepolicy', true).then((sitePolicy) => { return sitePolicy ? sitePolicy : Promise.reject(null); - } - - // Not in the config, try to get it using auth_email_get_signup_settings. - return this.wsProvider.callAjax('auth_email_get_signup_settings', {}, { siteUrl: site.getURL() }).then((settings) => { - return settings.sitepolicy ? settings.sitepolicy : Promise.reject(null); + }, () => { + // Cannot get config, try to get the site policy using auth_email_get_signup_settings. + return this.wsProvider.callAjax('auth_email_get_signup_settings', {}, { siteUrl: site.getURL() }) + .then((settings) => { + return settings.sitepolicy ? settings.sitepolicy : Promise.reject(null); + }); }); }); }