inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

use original error message for CORS/offline state in login (#1790)

Browse Source 
* use original error message for CORS/offline state in login

* fix tests
This commit is contained in:
Denys Vuika 2017-03-30 19:26:28 +01:00 committed by Eugenio Romano
parent 2651ec46d6
commit 5a692f28f5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
View File

@ -294,7 +294,7 @@ describe('AlfrescoLogin', () => {
expect(component.error).toBe(true); expect(component.error).toBe(true);
expect(component.success).toBe(false); expect(component.success).toBe(false);
expect(element.querySelector('#login-error')).toBeDefined(); 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', () => { it('should return CSRF error when server CSRF error occurs', () => {

5
ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
View File

@ -179,9 +179,8 @@ export class AlfrescoLoginComponent implements OnInit {
* Check and display the right error message in the UI * Check and display the right error message in the UI
*/ */
private displayErrorMessage(err: any): void { private displayErrorMessage(err: any): void {
if (err.error && err.error.crossDomain && err.error.message.indexOf('the network is offline, Origin is not allowed by' + if (err.error && err.error.crossDomain && err.error.message.indexOf('Access-Control-Allow-Origin') !== -1) {
' Access-Control-Allow-Origin') !== -1) { this.errorMsg = err.error.message;
this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-CORS';
return; return;
} }