From fd5b4b12f327591b87662a1a6122bc34362be5c8 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Mon, 25 Nov 2019 10:47:44 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83,=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B2=84=ED=8A=BC=EC=97=90=20=EB=8C=80?=
 =?UTF-8?q?=ED=95=9C=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EC=B2=B4=ED=81=AC.?=
 =?UTF-8?q?=201.=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=EC=8B=9C=20?=
 =?UTF-8?q?=EB=B3=B4=EC=97=AC=EC=A7=80=EC=A7=80=20=EC=95=8A=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.=202.=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=EA=B0=80=20=EC=95=84=EB=8B=90=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=EC=97=90=20skip=20=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.=203.=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83?=
 =?UTF-8?q?=EC=8B=9C=20confirm=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ucap-webmessenger-electron/src/index.ts   |  1 +
 .../native/components/top-bar.component.html  |  2 +-
 .../native/components/top-bar.component.ts    | 21 +++++++++--
 .../app/services/authentication.service.ts    |  4 ++
 .../src/app/services/native.service.ts        |  2 +-
 .../store/account/authentication/effects.ts   | 37 ++++++++++++-------
 .../app/store/messenger/settings/effects.ts   | 36 +++++++++++-------
 7 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts
index 6ce956ca..b5c5bf95 100644
--- a/electron-projects/ucap-webmessenger-electron/src/index.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/index.ts
@@ -166,6 +166,7 @@ function createTray() {
       // accelerator: 'Q',
       // selector: 'terminate:',
       click: () => {
+        appWindow.show();
         appWindow.browserWindow.webContents.send(MessengerChannel.Logout);
       }
     },
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
index bf54cbdb..2c5edb47 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -4,7 +4,7 @@
   </div>
   <div class="app-layout-native-title-bar-title">UCAP M Messenger</div>
   <div class="app-layout-native-title-bar-spacer"></div>
-  <div class="app-layout-native-title-bar-link">
+  <div *ngIf="!!loginRes" class="app-layout-native-title-bar-link">
     <button
       mat-icon-button
       class="button app-layout-native-title-bar-setting"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
index e50fcd86..aa01fd70 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -4,12 +4,16 @@ import {
   NativeService,
   WindowState
 } from '@ucap-webmessenger/native';
-import { Observable } from 'rxjs';
-import { Store } from '@ngrx/store';
+import { Observable, Subscription } from 'rxjs';
+import { Store, select } from '@ngrx/store';
 
+import * as AppStore from '@app/store';
 import * as AuthenticationStore from '@app/store/account/authentication';
 import * as SettingsStore from '@app/store/messenger/settings';
 
+import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
+import { tap } from 'rxjs/operators';
+
 @Component({
   selector: 'app-layout-native-top-bar',
   templateUrl: './top-bar.component.html',
@@ -19,6 +23,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
   windowStateChanged$: Observable<WindowState>;
 
   WindowState = WindowState;
+  loginRes: LoginResponse;
+  loginResSubscription: Subscription;
 
   constructor(
     private store: Store<any>,
@@ -27,6 +33,15 @@ export class TopBarComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.windowStateChanged$ = this.nativeService.windowStateChanged();
+
+    this.loginResSubscription = this.store
+      .pipe(
+        select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
+        tap(loginRes => {
+          this.loginRes = loginRes;
+        })
+      )
+      .subscribe();
   }
 
   ngOnDestroy(): void {}
@@ -48,6 +63,6 @@ export class TopBarComponent implements OnInit, OnDestroy {
   }
 
   onClickLogout(): void {
-    this.store.dispatch(AuthenticationStore.logout());
+    this.store.dispatch(AuthenticationStore.logoutConfirmation());
   }
 }
diff --git a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
index 454431f6..53304f6e 100644
--- a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
@@ -8,6 +8,8 @@ import {
 } from '@ucap-webmessenger/web-storage';
 import { LocaleCode } from '@ucap-webmessenger/core';
 import { LoginInfo, KEY_LOGIN_INFO } from '../types';
+import { KEY_VER_INFO } from '@app/types/ver-info.type';
+import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
 
 @Injectable({
   providedIn: 'root'
@@ -44,6 +46,8 @@ export class AppAuthenticationService {
   }
 
   logout() {
+    this.sessionStorageService.remove(KEY_LOGIN_RES_INFO);
+    this.sessionStorageService.remove(KEY_VER_INFO);
     this.sessionStorageService.remove(KEY_LOGIN_INFO);
   }
 }
diff --git a/projects/ucap-webmessenger-app/src/app/services/native.service.ts b/projects/ucap-webmessenger-app/src/app/services/native.service.ts
index a30088b1..1eb7f86a 100644
--- a/projects/ucap-webmessenger-app/src/app/services/native.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/native.service.ts
@@ -18,7 +18,7 @@ export class AppNativeService {
 
   subscribe(): void {
     this.nativeService.logout().subscribe(() => {
-      this.store.dispatch(AuthenticationStore.logout());
+      this.store.dispatch(AuthenticationStore.logoutConfirmation());
     });
     this.nativeService.changeStatus().subscribe(statusCode => {});
     this.nativeService.showSetting().subscribe(() => {
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 b3da389c..c1b40ef0 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
@@ -53,7 +53,11 @@ import {
   ServiceProtocolService,
   UserPasswordSetResponse
 } from '@ucap-webmessenger/protocol-service';
-import { AuthenticationProtocolService } from '@ucap-webmessenger/protocol-authentication';
+import {
+  AuthenticationProtocolService,
+  LoginResponse
+} from '@ucap-webmessenger/protocol-authentication';
+import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
 
 @Injectable()
 export class Effects {
@@ -157,19 +161,26 @@ export class Effects {
     this.actions$.pipe(
       ofType(logoutConfirmation),
       exhaustMap(async () => {
-        const result = await this.dialogService.open<
-          ConfirmDialogComponent,
-          ConfirmDialogData,
-          ConfirmDialogResult
-        >(ConfirmDialogComponent, {
-          width: '220px',
-          data: {
-            title: 'Logout',
-            message: 'Logout ?'
-          }
-        });
+        const loginRes = this.sessionStorageService.get<LoginResponse>(
+          KEY_LOGIN_RES_INFO
+        );
 
-        return result.choice;
+        if (!!loginRes && loginRes.userSeq) {
+          const result = await this.dialogService.open<
+            ConfirmDialogComponent,
+            ConfirmDialogData,
+            ConfirmDialogResult
+          >(ConfirmDialogComponent, {
+            data: {
+              title: 'Logout',
+              message: '로그아웃 하시겠습니까?'
+            }
+          });
+
+          return result.choice;
+        } else {
+          return false;
+        }
       }),
       map(result => (result ? logout() : logoutConfirmationDismiss()))
     )
diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/settings/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/settings/effects.ts
index 32442fd3..4087323e 100644
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/settings/effects.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/settings/effects.ts
@@ -15,6 +15,9 @@ import {
   MessengerSettingsDialogData,
   MessengerSettingsDialogResult
 } from '@app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component';
+import { SessionStorageService } from '@ucap-webmessenger/web-storage';
+import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
+import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type';
 
 @Injectable()
 export class Effects {
@@ -23,18 +26,24 @@ export class Effects {
       this.actions$.pipe(
         ofType(showDialog),
         tap(async () => {
-          const result = await this.dialogService.open<
-            MessengerSettingsDialogComponent,
-            MessengerSettingsDialogData,
-            MessengerSettingsDialogResult
-          >(MessengerSettingsDialogComponent, {
-            width: '800px',
-            maxWidth: '800px',
-            height: '800px',
-            minHeight: '800px',
-            disableClose: false,
-            data: {}
-          });
+          const loginRes = this.sessionStorageService.get<LoginResponse>(
+            KEY_LOGIN_RES_INFO
+          );
+
+          if (!!loginRes && loginRes.userSeq) {
+            const result = await this.dialogService.open<
+              MessengerSettingsDialogComponent,
+              MessengerSettingsDialogData,
+              MessengerSettingsDialogResult
+            >(MessengerSettingsDialogComponent, {
+              width: '800px',
+              maxWidth: '800px',
+              height: '800px',
+              minHeight: '800px',
+              disableClose: false,
+              data: {}
+            });
+          }
         })
       ),
     { dispatch: false }
@@ -44,6 +53,7 @@ export class Effects {
     private actions$: Actions,
     private store: Store<any>,
     private dialogService: DialogService,
-    private logger: NGXLogger
+    private logger: NGXLogger,
+    private sessionStorageService: SessionStorageService
   ) {}
 }