inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

demo shell host setting component login redirect after setting

Browse Source
This commit is contained in:
Eugenio Romano
2018-06-17 23:10:55 +01:00
parent 4d4a8d2864
commit fa6a6725cf
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/core/services/authentication.service.ts
View File

@@ -22,11 +22,11 @@ import { AlfrescoApiService } from './alfresco-api.service';
import { CookieService } from './cookie.service';
import { LogService } from './log.service';
import { StorageService } from './storage.service';
import { RedirectionModel } from '../models/redirection.model';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import { RedirectionModel } from '../models/redirection.model';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30 ;
@@ -116,9 +116,10 @@ export class AuthenticationService {
* @returns Response event called when logout is complete
*/
logout() {
this.removeTicket();
return Observable.fromPromise(this.callApiLogout())
.do(response => {
this.removeTicket();
this.onLogout.next(response);
return response;
})

8
lib/core/settings/host-settings.component.ts
View File

@@ -19,6 +19,7 @@ import { Component, EventEmitter, Output, ViewEncapsulation, OnInit, Input } fro
import { Validators, FormGroup, FormBuilder, AbstractControl, FormControl } from '@angular/forms';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { StorageService } from '../services/storage.service';
import { AuthenticationService } from '../services/authentication.service';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { OauthConfigModel } from '../models/oauth-config.model';
@@ -66,6 +67,7 @@ export class HostSettingsComponent implements OnInit {
constructor(private formBuilder: FormBuilder,
private storageService: StorageService,
private authenticationService: AuthenticationService,
private alfrescoApiService: AlfrescoApiService,
private appConfig: AppConfigService) {
}
@@ -176,7 +178,11 @@ export class HostSettingsComponent implements OnInit {
this.storageService.setItem(AppConfigValues.AUTHTYPE, values.authType);
this.alfrescoApiService.reset();
this.success.emit(true);
this.authenticationService.logout().subscribe(() => {
this.success.emit(true);
}, () => {
this.success.emit(true);
});
}
private saveOAuthValues(values: any) {