From 5e7efb0a1ed7f6ce40da94b0b62e7639538081f9 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Thu, 28 Nov 2019 10:48:00 +0900 Subject: [PATCH 1/5] exclude is modified --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b898e299..318cb703 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,7 @@ "files.trimTrailingWhitespace": true, "files.trimFinalNewlines": true, "files.watcherExclude": { - "**/dist/electron/win-unpacked/**": true + "**/dist": true }, "go.testFlags": ["-v"], "go.testTimeout": "100s", From 643fe7a7c1615ba57579ed4752219bdc2b080c88 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Thu, 28 Nov 2019 13:19:19 +0900 Subject: [PATCH 2/5] bug of logout is fixed --- .../src/app/resolvers/messenger.resolver.ts | 3 +-- .../store/account/authentication/effects.ts | 21 +++++++++++-------- .../src/app/store/messenger/sync/effects.ts | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts index 2eee9a12..20066cce 100644 --- a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts +++ b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts @@ -144,8 +144,6 @@ export class AppMessengerResolver implements Resolve { companyGroupCode: 'LG' }) ); - - // this.store.dispatch(AuthenticationStore.postLogin({ loginRes })); }), withLatestFrom( this.store.pipe( @@ -189,6 +187,7 @@ export class AppMessengerResolver implements Resolve { loginRes }) ); + this.store.dispatch(AuthenticationStore.postLogin({ loginRes })); resolve(); }, err => { diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts index c1b40ef0..7eb28f8e 100644 --- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts @@ -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(() => { - // location.href = this.router.parseUrl('/account/login').toString(); - this.router.navigate(['/account/login']).then(() => { - this.appAuthenticationService.logout(); - this.store.dispatch(logoutInitialize()); - }); - }); + // this.ngZone.run(() => { + // location.href = this.router.parseUrl('/account/login').toString(); + 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: `