From 94a0baa45e0e20abf34ab41971db93f6e353176b Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Tue, 25 Feb 2020 08:40:25 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=94=EC=83=81=ED=9A=8C=EC=9D=98=20?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EA=B6=8C=ED=95=9C=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/messenger/components/messages.component.html | 1 +
 .../layouts/messenger/components/messages.component.ts   | 9 +++++++--
 .../src/lib/components/message-box.component.html        | 1 +
 .../src/lib/components/message-box.component.ts          | 4 ++++
 .../message-box/video-conference.component.html          | 2 +-
 .../components/message-box/video-conference.component.ts | 3 +++
 .../src/lib/components/messages.component.html           | 1 +
 .../src/lib/components/messages.component.ts             | 3 +++
 8 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
index f976f00c..39c1615b 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
@@ -200,6 +200,7 @@
       [eventRemained$]="eventRemainedSubject.asObservable()"
       [userInfos$]="userInfoListSubject.asObservable()"
       [loginRes$]="loginResSubject.asObservable()"
+      [authInfo]="authInfo"
       [lock$]="lockSubject.asObservable()"
       [sessionVerInfo]="sessionVerInfo"
       [isShowUnreadCount]="getShowUnreadCount()"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
index e040acc7..076fc93e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
@@ -64,7 +64,8 @@ import {
   KEY_ENVIRONMENTS_INFO,
   UserSelectDialogType,
   RightDrawer,
-  KEY_STICKER_HISTORY
+  KEY_STICKER_HISTORY,
+  KEY_AUTH_INFO
 } from '@app/types';
 import {
   RoomInfo,
@@ -135,6 +136,7 @@ import {
   ConferenceDetailDialogData
 } from '../dialogs/conference/conference-detail.dialog.component';
 import { ConferenceService } from '@ucap-webmessenger/api-prompt';
+import { AuthResponse } from '@ucap-webmessenger/protocol-query';
 
 @Component({
   selector: 'app-layout-messenger-messages',
@@ -168,6 +170,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
   chatMessages: UCapUiChatMessagesComponent;
 
   environmentsInfo: EnvironmentsInfo;
+  authInfo: AuthResponse;
 
   loginResSubscription: Subscription;
   loginResSubject = new BehaviorSubject<LoginResponse>(undefined);
@@ -262,6 +265,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     this.environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>(
       KEY_ENVIRONMENTS_INFO
     );
+
+    this.authInfo = this.sessionStorageService.get<AuthResponse>(KEY_AUTH_INFO);
   }
 
   ngOnInit() {
@@ -1213,7 +1218,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
       ConferenceDetailDialogResult
     >(ConferenceDetailDialogComponent, {
       width: '600px',
-      hasBackdrop: false,
+      restoreFocus: false,
       data: {
         detail: param
       }
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
index 415f628a..c25bea9a 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.html
@@ -166,6 +166,7 @@
               <ucap-chat-message-box-video-conference
                 *ngSwitchCase="EventType.VideoConference"
                 [message]="message"
+                [authInfo]="authInfo"
                 (conferenceDetail)="onClickConferenceDetail($event)"
                 (conferenceJoin)="onClickConferenceJoin($event)"
               >
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
index ce779012..77354c98 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.ts
@@ -24,6 +24,7 @@ import { NGXLogger } from 'ngx-logger';
 import moment from 'moment';
 import { FileDownloadItem } from '@ucap-webmessenger/api';
 import { RoomInfo } from '@ucap-webmessenger/protocol-room';
+import { AuthResponse } from '@ucap-webmessenger/protocol-query';
 
 @Component({
   selector: 'ucap-chat-message-box',
@@ -65,6 +66,9 @@ export class MessageBoxComponent implements OnInit, AfterViewInit {
   @Input()
   unreadCount: number;
 
+  @Input()
+  authInfo: AuthResponse;
+
   @Output()
   openProfile = new EventEmitter<number>();
 
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.html
index ec975af6..576f3f45 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.html
@@ -45,7 +45,7 @@
     </li>
   </ul>
 
-  <div class="btn-box">
+  <div class="btn-box" *ngIf="!!authInfo && authInfo.canVideoConference">
     <ul>
       <li>
         <button mat-button (click)="onClickDetailView()">
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.ts
index b940fd4d..11f4ac6e 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.ts
@@ -4,6 +4,7 @@ import {
   VideoConferenceEventJson,
   Info
 } from '@ucap-webmessenger/protocol-event';
+import { AuthResponse } from '@ucap-webmessenger/protocol-query';
 
 @Component({
   selector: 'ucap-chat-message-box-video-conference',
@@ -13,6 +14,8 @@ import {
 export class VideoConferenceComponent implements OnInit {
   @Input()
   message: Info<VideoConferenceEventJson>;
+  @Input()
+  authInfo: AuthResponse;
 
   @Output()
   conferenceDetail = new EventEmitter<VideoConferenceEventJson>();
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
index f9ac8ef3..9dd1e58d 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
@@ -56,6 +56,7 @@
       <ucap-chat-message-box
         #chatMessageBox
         *ngFor="let message of scroll.viewPortItems; trackBy: trackByEvent"
+        [authInfo]="authInfo"
         [id]="message.seq"
         [message]="message"
         [mine]="message.senderSeq === loginRes?.userSeq"
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
index 7dd1837c..cc2d9391 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
@@ -34,6 +34,7 @@ import { VirtualScrollerComponent, IPageInfo } from 'ngx-virtual-scroller';
 import { MessageBoxComponent } from './message-box.component';
 import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
 import { debounce } from 'rxjs/operators';
+import { AuthResponse } from '@ucap-webmessenger/protocol-query';
 
 @Component({
   selector: 'ucap-chat-messages',
@@ -60,6 +61,8 @@ export class MessagesComponent implements OnInit, OnDestroy {
   sessionVerInfo: VersionInfo2Response;
   @Input()
   userInfos$: Observable<UserInfo[]>;
+  @Input()
+  authInfo: AuthResponse;
 
   @Input()
   lock$: Observable<boolean>;