bug of logout is fixed
This commit is contained in:
parent
5e7efb0a1e
commit
643fe7a7c1
|
@ -144,8 +144,6 @@ export class AppMessengerResolver implements Resolve<void> {
|
|||
companyGroupCode: 'LG'
|
||||
})
|
||||
);
|
||||
|
||||
// this.store.dispatch(AuthenticationStore.postLogin({ loginRes }));
|
||||
}),
|
||||
withLatestFrom(
|
||||
this.store.pipe(
|
||||
|
@ -189,6 +187,7 @@ export class AppMessengerResolver implements Resolve<void> {
|
|||
loginRes
|
||||
})
|
||||
);
|
||||
this.store.dispatch(AuthenticationStore.postLogin({ loginRes }));
|
||||
resolve();
|
||||
},
|
||||
err => {
|
||||
|
|
|
@ -58,6 +58,7 @@ import {
|
|||
LoginResponse
|
||||
} from '@ucap-webmessenger/protocol-authentication';
|
||||
import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
|
||||
import { ProtocolService } from '@ucap-webmessenger/protocol';
|
||||
|
||||
@Injectable()
|
||||
export class Effects {
|
||||
|
@ -128,13 +129,13 @@ export class Effects {
|
|||
this.actions$.pipe(
|
||||
ofType(loginRedirect),
|
||||
tap(authed => {
|
||||
this.ngZone.run(() => {
|
||||
// this.ngZone.run(() => {
|
||||
// location.href = this.router.parseUrl('/account/login').toString();
|
||||
this.router.navigate(['/account/login']).then(() => {
|
||||
this.appAuthenticationService.logout();
|
||||
this.store.dispatch(logoutInitialize());
|
||||
});
|
||||
});
|
||||
|
||||
this.router.navigate(['/account/login']);
|
||||
// });
|
||||
})
|
||||
),
|
||||
{ dispatch: false }
|
||||
|
@ -147,6 +148,7 @@ export class Effects {
|
|||
switchMap(action => {
|
||||
return this.authenticationProtocolService.logout({}).pipe(
|
||||
map(res => {
|
||||
this.protocolService.disconnect();
|
||||
this.store.dispatch(loginRedirect());
|
||||
}),
|
||||
catchError(error => of(error))
|
||||
|
@ -218,8 +220,8 @@ export class Effects {
|
|||
height: '500px',
|
||||
disableClose: true,
|
||||
data: {
|
||||
title: '개인정보 동의'
|
||||
// html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
|
||||
title: '개인정보 동의',
|
||||
html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -319,6 +321,7 @@ export class Effects {
|
|||
private sessionStorageService: SessionStorageService,
|
||||
private piService: PiService,
|
||||
private appAuthenticationService: AppAuthenticationService,
|
||||
private protocolService: ProtocolService,
|
||||
private authenticationProtocolService: AuthenticationProtocolService,
|
||||
private serviceProtocolService: ServiceProtocolService,
|
||||
private dialogService: DialogService,
|
||||
|
|
|
@ -155,7 +155,7 @@ export class Effects {
|
|||
tap(() => {
|
||||
groupList = [];
|
||||
}),
|
||||
switchMap(req => {
|
||||
exhaustMap(req => {
|
||||
return this.syncProtocolService.group2(req).pipe(
|
||||
map(res => {
|
||||
switch (res.SSVC_TYPE) {
|
||||
|
@ -167,7 +167,7 @@ export class Effects {
|
|||
case SSVC_TYPE_SYNC_GROUP_RES2:
|
||||
this.store.dispatch(
|
||||
group2Success({
|
||||
groupList,
|
||||
groupList: [...groupList],
|
||||
syncDate: (res as GroupResponse).syncDate
|
||||
})
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue
Block a user