GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #1577 from dpalou/MOBILE-2699

Browse Source 
MOBILE-2699 login: Fix detailed error messages with http
This commit is contained in:
Juan Leyva 2018-10-23 16:54:21 +02:00 committed by GitHub
commit 47d57a343d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/providers/sites.ts
View File

@ -260,6 +260,10 @@ export class CoreSitesProvider {
protocol = protocol == 'https://' ? 'http://' : 'https://'; protocol = protocol == 'https://' ? 'http://' : 'https://';
return this.checkSiteWithProtocol(siteUrl, protocol).catch((secondError) => { return this.checkSiteWithProtocol(siteUrl, protocol).catch((secondError) => {
if (secondError.critical) {
return Promise.reject(secondError.error);
}
// Site doesn't exist. Return the error message. // Site doesn't exist. Return the error message.
return Promise.reject(this.textUtils.getErrorMessageFromError(error) || return Promise.reject(this.textUtils.getErrorMessageFromError(error) ||
this.textUtils.getErrorMessageFromError(secondError) || this.textUtils.getErrorMessageFromError(secondError) ||