From d25d070229abcd2fa6f9db09887703d2eeee66cf Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 30 Mar 2017 19:26:28 +0100 Subject: [PATCH] use original error message for CORS/offline state in login (#1790) * use original error message for CORS/offline state in login * fix tests --- .../src/components/alfresco-login.component.spec.ts | 2 +- .../src/components/alfresco-login.component.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index c259e4eeb7..df15d21e9c 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -294,7 +294,7 @@ describe('AlfrescoLogin', () => { expect(component.error).toBe(true); expect(component.success).toBe(false); expect(element.querySelector('#login-error')).toBeDefined(); - expect(element.querySelector('#login-error').innerText).toEqual('LOGIN.MESSAGES.LOGIN-ERROR-CORS'); + expect(element.querySelector('#login-error').innerText).toEqual('ERROR: the network is offline, Origin is not allowed by Access-Control-Allow-Origin'); }); it('should return CSRF error when server CSRF error occurs', () => { diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index d034bf7b33..4fedc3018d 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -179,9 +179,8 @@ export class AlfrescoLoginComponent implements OnInit { * Check and display the right error message in the UI */ private displayErrorMessage(err: any): void { - if (err.error && err.error.crossDomain && err.error.message.indexOf('the network is offline, Origin is not allowed by' + - ' Access-Control-Allow-Origin') !== -1) { - this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CORS'; + if (err.error && err.error.crossDomain && err.error.message.indexOf('Access-Control-Allow-Origin') !== -1) { + this.errorMsg = err.error.message; return; }