From c289df1c47f65ecdab38c9013897f5ecfea3eee1 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 20 Dec 2019 11:07:41 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=95=EC=A0=9C=EB=A1=9C=EA=B7=B8=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=ED=9B=84=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9E=AC=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/store/account/authentication/effects.ts           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 79a0978a..5cd359f6 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
@@ -157,6 +157,7 @@ export class Effects {
         tap(authed => {
           // this.ngZone.run(() => {
           // location.href = this.router.parseUrl('/account/login').toString();
+          this.protocolService.disconnect();
           this.router.navigate(['/account/login']);
           this.appAuthenticationService.logout();
           this.store.dispatch(logoutInitialize());
@@ -173,7 +174,6 @@ export class Effects {
         switchMap(action => {
           return this.authenticationProtocolService.logout({}).pipe(
             map(res => {
-              this.protocolService.disconnect();
               this.store.dispatch(loginRedirect());
             }),
             catchError(error => of(error))
@@ -266,7 +266,7 @@ export class Effects {
             }
           }
 
-          if (loginInfo.initPw) {
+          if (!!loginInfo.initPw) {
             this.store.dispatch(logout());
 
             const passwordInitStep1Url = this.piService.passwordInitStep1Url({