diff --git a/ng2-components/ng2-alfresco-login/demo/app/app.component.d.ts b/ng2-components/ng2-alfresco-login/demo/app/app.component.d.ts index 04675f9e53..8ad6471df1 100644 --- a/ng2-components/ng2-alfresco-login/demo/app/app.component.d.ts +++ b/ng2-components/ng2-alfresco-login/demo/app/app.component.d.ts @@ -5,4 +5,6 @@ export declare class AppComponent { auth: AlfrescoAuthenticationService; router: Router; constructor(auth: AlfrescoAuthenticationService, router: Router, alfrescoSettingsService: AlfrescoSettingsService); + mySuccessMethod($event: any): void; + myErrorMethod($event: any): void; } diff --git a/ng2-components/ng2-alfresco-login/demo/app/app.component.js b/ng2-components/ng2-alfresco-login/demo/app/app.component.js index ad30baaade..ba1cb148bc 100644 --- a/ng2-components/ng2-alfresco-login/demo/app/app.component.js +++ b/ng2-components/ng2-alfresco-login/demo/app/app.component.js @@ -34,10 +34,16 @@ System.register(['angular2/core', 'ng2-alfresco-login/ng2-alfresco-login', 'angu this.router = router; alfrescoSettingsService.host = 'http://192.168.99.100:8080'; } + AppComponent.prototype.mySuccessMethod = function ($event) { + console.log('Success Login EventEmitt called with: ' + $event.value); + }; + AppComponent.prototype.myErrorMethod = function ($event) { + console.log('Error Login EventEmitt called with: ' + $event.value); + }; AppComponent = __decorate([ core_1.Component({ selector: 'my-app', - template: '', + template: '', directives: [router_1.ROUTER_DIRECTIVES, ng2_alfresco_login_1.AlfrescoLoginComponent] }), router_1.RouteConfig([ diff --git a/ng2-components/ng2-alfresco-login/demo/app/app.component.js.map b/ng2-components/ng2-alfresco-login/demo/app/app.component.js.map index d856733035..1307468214 100644 --- a/ng2-components/ng2-alfresco-login/demo/app/app.component.js.map +++ b/ng2-components/ng2-alfresco-login/demo/app/app.component.js.map @@ -1 +1 @@ -{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAgBA;gBAEI,sBAAmB,IAAkC,EAClC,MAAa,EACpB,uBAA+C;oBAFxC,SAAI,GAAJ,IAAI,CAA8B;oBAClC,WAAM,GAAN,MAAM,CAAO;oBAE5B,uBAAuB,CAAC,IAAI,GAAG,4BAA4B,CAAC;gBAEhE,CAAC;gBAhBL;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,QAAQ;wBAClB,QAAQ,EAAE,mCAAmC;wBAC7C,UAAU,EAAE,CAAC,0BAAiB,EAAE,2CAAsB,CAAC;qBAC1D,CAAC;oBAED,oBAAW,CAAC;wBACT,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,2CAAsB,EAAE,YAAY,EAAE,IAAI,EAAC;qBACpF,CAAC;;gCAAA;gBAUF,mBAAC;YAAD,CAAC,AATD,IASC;YATD,uCASC,CAAA"} \ No newline at end of file +{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAgBA;gBAEI,sBAAmB,IAAkC,EAClC,MAAa,EACpB,uBAA+C;oBAFxC,SAAI,GAAJ,IAAI,CAA8B;oBAClC,WAAM,GAAN,MAAM,CAAO;oBAE5B,uBAAuB,CAAC,IAAI,GAAG,4BAA4B,CAAC;gBAEhE,CAAC;gBAED,sCAAe,GAAf,UAAgB,MAAM;oBAClB,OAAO,CAAC,GAAG,CAAC,wCAAwC,GAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvE,CAAC;gBAED,oCAAa,GAAb,UAAc,MAAM;oBAChB,OAAO,CAAC,GAAG,CAAC,sCAAsC,GAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACrE,CAAC;gBAxBL;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,QAAQ;wBAClB,QAAQ,EAAE,yHAAyH;wBACnI,UAAU,EAAE,CAAC,0BAAiB,EAAE,2CAAsB,CAAC;qBAC1D,CAAC;oBAED,oBAAW,CAAC;wBACT,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,2CAAsB,EAAE,YAAY,EAAE,IAAI,EAAC;qBACpF,CAAC;;gCAAA;gBAkBF,mBAAC;YAAD,CAAC,AAjBD,IAiBC;YAjBD,uCAiBC,CAAA"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-login/demo/app/app.component.ts b/ng2-components/ng2-alfresco-login/demo/app/app.component.ts index 5ddaadb6b8..ea60d724f7 100644 --- a/ng2-components/ng2-alfresco-login/demo/app/app.component.ts +++ b/ng2-components/ng2-alfresco-login/demo/app/app.component.ts @@ -7,7 +7,7 @@ import {AlfrescoAuthenticationService} from 'ng2-alfresco-login/ng2-alfresco-log @Component({ selector: 'my-app', - template: '', + template: '', directives: [ROUTER_DIRECTIVES, AlfrescoLoginComponent] }) @@ -23,4 +23,12 @@ export class AppComponent { } + mySuccessMethod($event) { + console.log('Success Login EventEmitt called with: '+$event.value); + } + + myErrorMethod($event) { + console.log('Error Login EventEmitt called with: '+$event.value); + } + } \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts index cf769dd96f..c585f2cb73 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.d.ts @@ -1,3 +1,20 @@ +/** + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { EventEmitter } from 'angular2/core'; import { Router } from 'angular2/router'; import { ControlGroup, FormBuilder } from 'angular2/common'; import { AlfrescoAuthenticationService } from '../services/alfresco-authentication'; @@ -6,6 +23,8 @@ export declare class AlfrescoLoginComponent { auth: AlfrescoAuthenticationService; router: Router; method: string; + onSuccess: EventEmitter<{}>; + onError: EventEmitter<{}>; translate: TranslateService; form: ControlGroup; error: boolean; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js index 51be066486..16202a09e0 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js @@ -41,6 +41,8 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', '../serv this.auth = auth; this.router = router; this.method = 'POST'; + this.onSuccess = new core_1.EventEmitter(); + this.onError = new core_1.EventEmitter(); this.error = false; this.success = false; this.form = fb.group({ @@ -64,6 +66,9 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', '../serv .subscribe(function (token) { try { _this.success = true; + _this.onSuccess.emit({ + value: 'Login OK' + }); _this.router.navigate(['Home']); } catch (error) { @@ -71,6 +76,9 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', '../serv } }, function (err) { _this.error = true; + _this.onError.emit({ + value: 'Login KO' + }); console.log(err); _this.success = false; }, function () { return console.log('Login done'); }); @@ -106,6 +114,14 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', '../serv core_1.Input(), __metadata('design:type', String) ], AlfrescoLoginComponent.prototype, "method", void 0); + __decorate([ + core_1.Output(), + __metadata('design:type', Object) + ], AlfrescoLoginComponent.prototype, "onSuccess", void 0); + __decorate([ + core_1.Output(), + __metadata('design:type', Object) + ], AlfrescoLoginComponent.prototype, "onError", void 0); AlfrescoLoginComponent = __decorate([ core_1.Component({ selector: 'alfresco-login', diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map index fb49b0468f..9099a1cd6d 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.js.map @@ -1 +1 @@ -{"version":3,"file":"alfresco-login.js","sourceRoot":"","sources":["alfresco-login.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"alfresco-login.js","sourceRoot":"","sources":["alfresco-login.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts index 6d1deced4d..341f7c4fe6 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {Component, Input} from 'angular2/core'; +import {Component, Input, Output, EventEmitter} from 'angular2/core'; import {Router, ROUTER_DIRECTIVES} from 'angular2/router'; import {FORM_DIRECTIVES, ControlGroup, FormBuilder, Validators} from 'angular2/common'; import {AlfrescoAuthenticationService} from '../services/alfresco-authentication'; @@ -33,6 +33,8 @@ declare let __moduleName:string; }) export class AlfrescoLoginComponent { @Input() method:string = 'POST'; + @Output() onSuccess = new EventEmitter(); + @Output() onError = new EventEmitter(); translate: TranslateService; form:ControlGroup; @@ -73,6 +75,9 @@ export class AlfrescoLoginComponent { (token:any) => { try { this.success = true; + this.onSuccess.emit({ + value: 'Login OK' + }); this.router.navigate(['Home']); } catch (error) { console.error(error.message); @@ -81,6 +86,9 @@ export class AlfrescoLoginComponent { }, (err:any) => { this.error = true; + this.onError.emit({ + value: 'Login KO' + }); console.log(err); this.success = false; },