From 04cbdb6d71a9c025415f8131d7c5407951af4d07 Mon Sep 17 00:00:00 2001 From: khk Date: Fri, 3 Jan 2020 17:31:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=84=A4=EC=A0=95=20-=20?= =?UTF-8?q?=ED=8F=B0=ED=8A=B8=EC=84=A4=EC=A0=95=20=EC=B6=95=EC=86=8C?= =?UTF-8?q?=ED=99=95=EB=8C=80,=20=ED=94=84=EB=A1=9C=ED=95=84=20=ED=9C=B4?= =?UTF-8?q?=EA=B0=80=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native/components/top-bar.component.html | 50 +++++++++++++------ .../native/components/top-bar.component.scss | 25 ++++++++++ .../src/lib/components/profile.component.html | 3 +- .../src/lib/components/profile.component.scss | 20 +++++++- 4 files changed, 81 insertions(+), 17 deletions(-) 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 64c53e4c..4c95f5d2 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 @@ -322,22 +322,44 @@ -
+
+ +
-
100%
-
+
+ 100% +
+
+ +
-
+
+ +
-
-
-
-
-
- \ No newline at end of file +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index b7ad41a2..c5dc8598 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -218,6 +218,31 @@ display: flex; flex-flow: row; align-items: center; + height: 48px; + .zoom { + height: 16px; + background-repeat: no-repeat; + &.plus-square { + margin-left: 10px; + padding-left: 26px; + background-position: left 50%; + line-height: normal; + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='1' stroke-linecap='round' stroke-linejoin='round' %3E%3Crect x='3' y='3' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='12' y1='8' x2='12' y2='16'%3E%3C/line%3E%3Cline x1='8' y1='12' x2='16' y2='12'%3E%3C/line%3E%3C/svg%3E"); + } + &.minus-square { + margin-right: 10px; + padding-right: 26px; + background-position: right 50%; + line-height: normal; + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='1' stroke-linecap='round' stroke-linejoin='round' %3E%3Crect x='3' y='3' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='8' y1='12' x2='16' y2='12'%3E%3C/line%3E%3C/svg%3E"); + } + &:hover { + background-repeat: no-repeat; + } + } + .set-size { + margin: 0 10px; + } } } } diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index 9a8ace9a..0c4842c6 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -25,9 +25,10 @@ + {{ getWorkstatus(userInfo) }} diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss index dcc086d4..9d27947e 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss @@ -61,12 +61,28 @@ .work-status { display: inline-flex; height: 24px; - background-color: #ffffff; + border: 1px solid #ffffff; padding: 4px 14px; border-radius: 100px; font-size: 13px; justify-content: center; align-items: center; + color: #ffffff; + &.morning-off { + background-color: #11845d; + } + &.afternoon-off { + background-color: #875acb; + } + &.day-off { + background-color: #2b98eb; + } + &.long-time { + background-color: #c72f20; + } + &.leave-of-absence { + background-color: #e7853e; + } } } @@ -218,7 +234,7 @@ display: flex; width: 40px; height: 40px; - line-height: 40px; + //line-height: 40px; .mat-button-wrapper { padding: 0; fill: #ffffff; From 69bb77e92c552379c888385b6cfe9c3a7fd46ae4 Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 3 Jan 2020 17:35:34 +0900 Subject: [PATCH 2/4] =?UTF-8?q?devicetype=20=EC=A0=80=EC=9E=A5=EB=90=9C=20?= =?UTF-8?q?=EA=B0=92=EC=9D=84=20=EC=93=B0=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 --- .../components/right-drawer/album-box.component.ts | 2 +- .../components/right-drawer/file-box.component.ts | 12 ++++++++++-- .../message/message-detail.dialog.component.ts | 10 +++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts index 577b996d..51cce482 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts @@ -211,7 +211,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy { this.commonApiService .fileTalkDownload({ userSeq: this.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.environmentsInfo.deviceType, token: this.loginRes.tokenString, attachmentsSeq: fileInfo.info.seq, fileDownloadItem: fileInfo.fileDownloadItem diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts index 8210cb7f..38ded6e3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts @@ -33,7 +33,11 @@ import { CreateChatDialogResult, CreateChatDialogData } from '../../dialogs/chat/create-chat.dialog.component'; -import { UserSelectDialogType } from '@app/types'; +import { + UserSelectDialogType, + EnvironmentsInfo, + KEY_ENVIRONMENTS_INFO +} from '@app/types'; import { RoomInfo } from '@ucap-webmessenger/protocol-room'; export interface FileInfoTotal { @@ -60,6 +64,7 @@ export class FileBoxComponent implements OnInit, OnDestroy { selectedFileList: FileInfoTotal[] = []; loginRes: LoginResponse; + environmentsInfo: EnvironmentsInfo; currentTabIndex = 0; @@ -78,6 +83,9 @@ export class FileBoxComponent implements OnInit, OnDestroy { this.loginRes = this.sessionStorageService.get( KEY_LOGIN_RES_INFO ); + this.environmentsInfo = this.sessionStorageService.get( + KEY_ENVIRONMENTS_INFO + ); } ngOnInit() { @@ -247,7 +255,7 @@ export class FileBoxComponent implements OnInit, OnDestroy { this.commonApiService .fileTalkDownload({ userSeq: this.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.environmentsInfo.deviceType, token: this.loginRes.tokenString, attachmentsSeq: fileInfo.info.seq, fileDownloadItem: fileInfo.fileDownloadItem diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts index 5dc46635..c5639525 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts @@ -161,7 +161,7 @@ export class MessageDetailDialogComponent implements OnInit { this.messageApiService .retrieveResourceFile({ userSeq: this.data.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.data.environmentsInfo.deviceType, tokenKey: this.data.loginRes.tokenString, type: this.messageInfo.type, msgId: this.messageInfo.msgId, @@ -187,7 +187,7 @@ export class MessageDetailDialogComponent implements OnInit { this.messageApiService .retrieveResourceFile({ userSeq: this.data.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.data.environmentsInfo.deviceType, tokenKey: this.data.loginRes.tokenString, type: this.messageInfo.type, msgId: this.messageInfo.msgId, @@ -215,7 +215,7 @@ export class MessageDetailDialogComponent implements OnInit { // this.messageApiService // .retrieveResourceFile({ // userSeq: this.data.loginRes.userSeq, - // deviceType: DeviceType.PC, + // deviceType: this.data.environmentsInfo.deviceType, // tokenKey: this.data.loginRes.tokenString, // type: this.messageInfo.type, // msgId: this.messageInfo.msgId, @@ -310,7 +310,7 @@ export class MessageDetailDialogComponent implements OnInit { this.messageApiService .retrieveResourceFile({ userSeq: this.data.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.data.environmentsInfo.deviceType, tokenKey: this.data.loginRes.tokenString, type: this.messageInfo.type, msgId: this.messageInfo.msgId, @@ -541,7 +541,7 @@ export class MessageDetailDialogComponent implements OnInit { this.messageApiService .cancelMessage({ userSeq: this.data.loginRes.userSeq, - deviceType: DeviceType.PC, + deviceType: this.data.environmentsInfo.deviceType, tokenKey: this.data.loginRes.tokenString, type: this.messageInfo.type, msgId: this.messageInfo.msgId, From f7b797192d766a49467473384838ffe5c31ac70c Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 3 Jan 2020 17:39:44 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=8B=A4=EB=A5=B8=EB=94=94=EB=B0=94?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=ED=96=88=EC=9D=84=EB=95=8C=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ucap-webmessenger-electron/src/index.ts | 2 - .../src/app/guards/auto-login.guard.ts | 7 ++-- .../components/messages.component.ts | 1 - .../profile/profile.dialog.component.ts | 2 - .../components/login.page.component.ts | 38 +++++++++++++++++-- .../components/main.page.component.ts | 2 +- .../app/services/authentication.service.ts | 8 ++-- .../src/app/services/notification.service.ts | 19 ++++++++-- .../store/account/authentication/effects.ts | 8 +++- .../src/app/types/index.ts | 1 + .../src/app/types/logout-info.type.ts | 8 ++++ .../lib/services/browser-native.service.ts | 2 +- .../src/lib/protocols/logout.ts | 21 +++++++++- .../authentication-protocol.service.ts | 7 +++- .../file-viewer/sound-viewer.component.ts | 1 - .../file-viewer/video-viewer.component.ts | 1 - .../virtual-scroll-tree-flat.data-source.ts | 1 - 17 files changed, 101 insertions(+), 28 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/app/types/logout-info.type.ts diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index 6765a305..01183491 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -445,8 +445,6 @@ ipcMain.on( const downloadPath = args[0] as string; if (!!downloadPath && downloadPath.length > 0) { - console.log('in electron', downloadPath); - appStorage.downloadPath = downloadPath; log.info('downloadPath is changed to ', appStorage.downloadPath); diff --git a/projects/ucap-webmessenger-app/src/app/guards/auto-login.guard.ts b/projects/ucap-webmessenger-app/src/app/guards/auto-login.guard.ts index bd099cd9..bc462712 100644 --- a/projects/ucap-webmessenger-app/src/app/guards/auto-login.guard.ts +++ b/projects/ucap-webmessenger-app/src/app/guards/auto-login.guard.ts @@ -16,6 +16,7 @@ import { import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; import { environment } from '../../environments/environment'; import * as AuthenticationStore from '@app/store/account/authentication'; +import { KEY_LOGOUT_INFO, LogoutInfo } from '@app/types'; @Injectable({ providedIn: 'root' @@ -42,14 +43,14 @@ export class AppAutoLoginGuard implements CanActivate { environment.customConfig.appKey ); - const personLogout: boolean = this.sessionStorageService.get( - 'PERSON_LOGOUT' + const personLogout: LogoutInfo = this.sessionStorageService.get( + KEY_LOGOUT_INFO ); if ( !!appUserInfo && appUserInfo.settings.general.autoLogin && - !personLogout + !personLogout.personLogout ) { this.store.dispatch( AuthenticationStore.webLogin({ 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 5ffa719e..2a704c77 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 @@ -857,7 +857,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.nativeService .selectSaveFilePath(value.fileInfo.fileName) .then(result => { - console.log(result); if (!!result && result.length > 0) { this.saveFile(value, result); } else { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts index 6a05e426..a3d4740b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts @@ -104,8 +104,6 @@ export class ProfileDialogComponent implements OnInit, OnDestroy { this.editableProfileImage = environment.productConfig.CommonSetting.editableProfileImage; - - console.log(data.openProfileOptions); } ngOnInit() { diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts index cf60a6fa..681f25b0 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts +++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts @@ -3,6 +3,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { Store, select } from '@ngrx/store'; import { Company } from '@ucap-webmessenger/api-external'; +import { ServerErrorCode } from '@ucap-webmessenger/protocol'; import * as AppStore from '@app/store'; import * as AuthenticationStore from '@app/store/account/authentication'; @@ -24,8 +25,12 @@ import { } from '@app/layouts/messenger/dialogs/account/notice.dialog.component'; import { environment } from '../../../../environments/environment'; -import { LocalStorageService } from '@ucap-webmessenger/web-storage'; +import { + LocalStorageService, + SessionStorageService +} from '@ucap-webmessenger/web-storage'; import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; +import { LogoutInfo, KEY_LOGOUT_INFO } from '@app/types'; @Component({ selector: 'app-page-account-login', @@ -79,7 +84,8 @@ export class LoginPageComponent implements OnInit, OnDestroy { private store: Store, private router: Router, private dialogService: DialogService, - private localStorageService: LocalStorageService + private localStorageService: LocalStorageService, + private sessionStorageService: SessionStorageService ) { this.useRememberMe = environment.productConfig.authentication.rememberMe.use; @@ -163,7 +169,33 @@ export class LoginPageComponent implements OnInit, OnDestroy { this.customInitilize(); } - customInitilize() { + async customInitilize() { + const personLogout: LogoutInfo = this.sessionStorageService.get( + KEY_LOGOUT_INFO + ); + + if ( + !!personLogout && + !!personLogout.reasonCode && + personLogout.reasonCode === ServerErrorCode.ERRCD_DUPLICATE + ) { + const result = await this.dialogService.open< + AlertDialogComponent, + AlertDialogData, + AlertDialogResult + >(AlertDialogComponent, { + width: '360px', + data: { + title: '', + html: `다른 디바이스에서 로그인하였습니다.
* Ip : ${personLogout.ip}
* Mac : ${personLogout.mac}` + } + }); + + this.sessionStorageService.set(KEY_LOGOUT_INFO, { + personLogout: true + } as LogoutInfo); + } + // Daesang.. this.fixedCompany = environment.companyConfig.fixedCompanyCode; this.fixedNotiBtnText = '이용 주의사항'; diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts index 59fe0492..5f4f9d1b 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts @@ -307,7 +307,7 @@ export class MainPageComponent implements OnInit, OnDestroy { .pipe( take(1), map(res => { - console.log(res); + this.logger.debug(res); }), catchError(error => of(this.logger.debug(error))) ) 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 c3a93584..ebd1d012 100644 --- a/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/authentication.service.ts @@ -10,7 +10,9 @@ import { KEY_LOGIN_INFO, KEY_LOGIN_RES_INFO, KEY_VER_INFO, - KEY_URL_INFO + KEY_URL_INFO, + KEY_LOGOUT_INFO, + LogoutInfo } from '../types'; import { PasswordUtil } from '@ucap-webmessenger/pi'; @@ -96,7 +98,7 @@ export class AppAuthenticationService { environment.customConfig.appKey ); - this.sessionStorageService.remove('PERSON_LOGOUT'); + this.sessionStorageService.remove(KEY_LOGOUT_INFO); } logout() { @@ -104,7 +106,5 @@ export class AppAuthenticationService { this.sessionStorageService.remove(KEY_VER_INFO); this.sessionStorageService.remove(KEY_LOGIN_INFO); this.sessionStorageService.remove(KEY_URL_INFO); - - this.sessionStorageService.set('PERSON_LOGOUT', true); } } diff --git a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts index 6bfc401e..4d0a4963 100644 --- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts @@ -10,7 +10,8 @@ import { SSVC_TYPE_LOGOUT_REMOTE_NOTI, AuthenticationProtocolService, LogoutResponse, - LogoutRemoteNotification + LogoutRemoteNotification, + LogoutNotification } from '@ucap-webmessenger/protocol-authentication'; import { NGXLogger } from 'ngx-logger'; @@ -97,13 +98,17 @@ import { SSVC_TYPE_UMG_NOTI, UmgNotiNotification } from '@ucap-webmessenger/protocol-umg'; -import { LocalStorageService } from '@ucap-webmessenger/web-storage'; +import { + LocalStorageService, + SessionStorageService +} from '@ucap-webmessenger/web-storage'; import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; import { environment } from '../../environments/environment'; import { NotificationMethod } from '@ucap-webmessenger/core'; import { Dictionary } from '@ngrx/entity'; import { MessageType } from '@ucap-webmessenger/api-message'; +import { LogoutInfo, KEY_LOGOUT_INFO } from '@app/types'; @Injectable() export class AppNotificationService { @@ -117,6 +122,7 @@ export class AppNotificationService { private statusProtocolService: StatusProtocolService, private umgProtocolService: UmgProtocolService, private localStorageService: LocalStorageService, + private sessionStorageService: SessionStorageService, @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService, private store: Store, private logger: NGXLogger @@ -129,11 +135,18 @@ export class AppNotificationService { switch (notiOrRes.SSVC_TYPE) { case SSVC_TYPE_LOGOUT_RES: { - const res = notiOrRes as LogoutResponse; + const res = notiOrRes as LogoutNotification; this.logger.debug( 'Notification::authenticationProtocolService::LogoutResponse', res ); + + this.sessionStorageService.set(KEY_LOGOUT_INFO, { + personLogout: true, + reasonCode: res.reasonCode, + ip: res.ip, + mac: res.mac + } as LogoutInfo); } break; case SSVC_TYPE_LOGOUT_REMOTE_NOTI: 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 18bf25cf..6f4e3641 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 @@ -48,7 +48,9 @@ import { KEY_LOGIN_INFO, EnvironmentsInfo, KEY_ENVIRONMENTS_INFO, - KEY_URL_INFO + KEY_URL_INFO, + LogoutInfo, + KEY_LOGOUT_INFO } from '@app/types'; import { AppAuthenticationService } from '@app/services/authentication.service'; import { NGXLogger } from 'ngx-logger'; @@ -174,6 +176,10 @@ export class Effects { switchMap(action => { return this.authenticationProtocolService.logout({}).pipe( map(res => { + this.sessionStorageService.set(KEY_LOGOUT_INFO, { + personLogout: true + } as LogoutInfo); + this.store.dispatch(loginRedirect()); }), catchError(error => of(error)) diff --git a/projects/ucap-webmessenger-app/src/app/types/index.ts b/projects/ucap-webmessenger-app/src/app/types/index.ts index 4d21b5e1..44ba29af 100644 --- a/projects/ucap-webmessenger-app/src/app/types/index.ts +++ b/projects/ucap-webmessenger-app/src/app/types/index.ts @@ -1,5 +1,6 @@ export * from './environment.type'; export * from './login-info.type'; +export * from './logout-info.type'; export * from './userselect.dialog.type'; export * from './right-drawer.type'; export * from './sticker-info.type'; diff --git a/projects/ucap-webmessenger-app/src/app/types/logout-info.type.ts b/projects/ucap-webmessenger-app/src/app/types/logout-info.type.ts new file mode 100644 index 00000000..b07b1575 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/types/logout-info.type.ts @@ -0,0 +1,8 @@ +export const KEY_LOGOUT_INFO = 'ucap::LOGOUT_INFO'; + +export interface LogoutInfo { + personLogout: boolean; + reasonCode?: number; + ip?: string; + mac?: string; +} diff --git a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts index 1f4abbae..18235515 100644 --- a/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts +++ b/projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts @@ -74,7 +74,7 @@ export class BrowserNativeService extends NativeService { getNetworkInfo(): Promise { return new Promise((resolve, reject) => { - resolve(null); + resolve([{ ip: 'Browser', mac: 'browser' }]); }); } diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts index d18d2ab8..87de30c6 100644 --- a/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts +++ b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts @@ -5,7 +5,8 @@ import { ProtocolDecoder, ProtocolMessage, PacketBody, - decodeProtocolMessage + decodeProtocolMessage, + ProtocolNotification } from '@ucap-webmessenger/protocol'; // tslint:disable-next-line: no-empty-interface @@ -15,6 +16,12 @@ export interface LogoutResponse extends ProtocolResponse { reasonCode?: number; } +export interface LogoutNotification extends ProtocolNotification { + reasonCode?: number; + ip?: string; + mac?: string; +} + export const encodeLogout: ProtocolEncoder = ( req: LogoutRequest ) => { @@ -27,6 +34,16 @@ export const decodeLogout: ProtocolDecoder = ( message: ProtocolMessage ) => { return decodeProtocolMessage(message, { - reasonCode: message.bodyList[0] + reasonCode: Number(message.bodyList[0]) } as LogoutResponse); }; + +export const decodeLogoutNotification: ProtocolDecoder = ( + message: ProtocolMessage +) => { + return decodeProtocolMessage(message, { + reasonCode: Number(message.bodyList[0]), + ip: !!message.bodyList[1] ? message.bodyList[1] : '', + mac: !!message.bodyList[2] ? message.bodyList[2] : '' + } as LogoutNotification); +}; diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts index 8ec7a9c8..368d5034 100644 --- a/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts @@ -23,7 +23,8 @@ import { LogoutRequest, LogoutResponse, encodeLogout, - decodeLogout + decodeLogout, + decodeLogoutNotification } from '../protocols/logout'; import { encodeLogoutRemote, @@ -56,7 +57,9 @@ export class AuthenticationProtocolService { switch (message.subServiceType) { case SSVC_TYPE_LOGOUT_RES: { - this.logoutNotificationSubject.next(decodeLogout(message)); + this.logoutNotificationSubject.next( + decodeLogoutNotification(message) + ); } break; case SSVC_TYPE_LOGOUT_REMOTE_NOTI: diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/sound-viewer.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/sound-viewer.component.ts index e4a053c3..b870c7dc 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/sound-viewer.component.ts +++ b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/sound-viewer.component.ts @@ -61,7 +61,6 @@ export class SoundViewerComponent implements OnInit { } onChangeTimeSlider(e: MatSliderChange): void { - console.log('onChangeTimeSlider', e.value); this.audioPlayer.nativeElement.currentTime = e.value; } diff --git a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.ts index f0ab6894..de03c16e 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.ts +++ b/projects/ucap-webmessenger-ui/src/lib/components/file-viewer/video-viewer.component.ts @@ -61,7 +61,6 @@ export class VideoViewerComponent implements OnInit { } onChangeTimeSlider(e: MatSliderChange): void { - console.log('onChangeTimeSlider', e.value); this.audioPlayer.nativeElement.currentTime = e.value; } diff --git a/projects/ucap-webmessenger-ui/src/lib/data-source/virtual-scroll-tree-flat.data-source.ts b/projects/ucap-webmessenger-ui/src/lib/data-source/virtual-scroll-tree-flat.data-source.ts index 1987f671..d3a40ac0 100644 --- a/projects/ucap-webmessenger-ui/src/lib/data-source/virtual-scroll-tree-flat.data-source.ts +++ b/projects/ucap-webmessenger-ui/src/lib/data-source/virtual-scroll-tree-flat.data-source.ts @@ -115,7 +115,6 @@ export class VirtualScrollTreeFlatDataSource extends DataSource { } disconnect() { - console.log('VirtualScrollTreeFlatDataSource disconnect'); if (!!this.connectSubject) { this.connectSubject.next(); this.connectSubject.unsubscribe(); From b01849e1bf16c3058bd37b865c5bb677bc42c18b Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 3 Jan 2020 17:51:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=ED=9C=B4?= =?UTF-8?q?=EA=B0=80=EC=A0=95=EB=B3=B4=20=EC=83=89=EC=83=81=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/profile.component.html | 4 +-- .../src/lib/components/profile.component.ts | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index 0c4842c6..8aa57a0a 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -25,10 +25,10 @@ - {{ getWorkstatus(userInfo) }} diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts index 0c63fdd5..5364b38e 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts @@ -159,6 +159,31 @@ export class ProfileComponent implements OnInit { return workstatus; } + getWorkstatusStyle(userInfo: UserInfoSS): string { + // morning-off: 오전 afternoon-off: 오후 day-off: 휴가 long-time: 장기 leave-of-absence: 휴직 + let style = ''; + if (!!userInfo && !!userInfo.workstatus) { + switch (userInfo.workstatus) { + case WorkStatusType.VacationAM: + style = 'morning-off'; + break; + case WorkStatusType.VacationPM: + style = 'afternoon-off'; + break; + case WorkStatusType.VacationAll: + style = 'day-off'; + break; + case WorkStatusType.LeaveOfAbsence: + style = 'leave-of-absence'; + break; + case WorkStatusType.LongtermRefresh: + style = 'long-time'; + break; + } + } + + return style; + } getDisabledBtn(type: string): boolean { if (!this.myMadn || this.myMadn.trim().length === 0) {