ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buddy & group list are implemented

Browse Source
This commit is contained in:
병준 박 2019-09-27 12:53:21 +09:00
parent 8d8b1e5c47
commit dff2e4e55f
25 changed files with 626 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
View File

@ -1,3 +1,4 @@
<ucap-group-expansion-panel
[groupList]="groupList$ | async"
[groupBuddyList]="groupBuddyList$ | async"
(selectBuddy)="onSelectBuddy($event)"
></ucap-group-expansion-panel>

61
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
View File

@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { Observable, combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
import { Store, select } from '@ngrx/store';
@ -8,6 +9,8 @@ import { ucapAnimations } from '@ucap-webmessenger/ui';
import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync';
import * as AppStore from '@app/store';
import * as ChatStore from '@app/store/messenger/chat';
import { NGXLogger } from 'ngx-logger';
@Component({
selector: 'app-layout-chat-left-sidenav-group',
@ -16,13 +19,59 @@ import * as AppStore from '@app/store';
animations: ucapAnimations
})
export class GroupComponent implements OnInit {
groupList$: Observable<GroupDetailData[]>;
groupBuddyList$: Observable<
{ group: GroupDetailData; buddyList: UserInfo[] }[]
>;
constructor(private store: Store<any>) {}
constructor(private store: Store<any>, private logger: NGXLogger) {}
ngOnInit() {
this.groupList$ = this.store.pipe(
select(AppStore.MessengerSelector.SyncSelector.groupList)
);
this.groupBuddyList$ = this.store
.pipe(
select(AppStore.MessengerSelector.SyncSelector.groupListAndBuddyList)
)
.pipe(
map(groupListAndBuddyList => {
const groupList = groupListAndBuddyList.groupList
.slice()
.sort((a, b) => {
// 기본그룹은 제일 하단
if (0 === a.seq) {
return 1;
} else if (0 === b.seq) {
return -1;
} else {
if (a.name > b.name) {
return 1;
}
if (b.name > a.name) {
return -1;
}
return 0;
}
});
const groupBuddyList: {
group: GroupDetailData;
buddyList: UserInfo[];
}[] = [];
for (const group of groupList) {
const buddyList = groupListAndBuddyList.buddyList.filter(buddy => {
return group.userSeqs.indexOf(buddy.seq) > -1;
});
groupBuddyList.push({
group,
buddyList
});
}
return groupBuddyList;
})
);
}
onSelectBuddy(buddy: UserInfo) {
this.store.dispatch(ChatStore.selectedRoom({ roomSeq: buddy.seq }));
}
}

1
projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
View File

@ -42,6 +42,7 @@ export class LoginPageComponent implements OnInit {
AuthenticationStore.webLogin({
loginInfo: {
companyCode: value.companyCode,
companyGroupType: 'C',
loginId: value.loginId,
loginPw: value.loginPw
},

4
projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
View File

@ -4,10 +4,10 @@
</div>
<div class="contents">
<app-layout-messenger-intro
*ngIf="!selectedChat"
*ngIf="!(this.selectedChat$ | async)"
></app-layout-messenger-intro>
<app-layout-messenger-messages
*ngIf="selectedChat"
*ngIf="!!(this.selectedChat$ | async)"
></app-layout-messenger-messages>
</div>
<div class="right-side">

17
projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts
View File

@ -1,5 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { AuthenticationProtocolService } from '@ucap-webmessenger/protocol-authentication';
import { Store, select } from '@ngrx/store';
import * as AppSotre from '@app/store';
import { Observable } from 'rxjs';
@Component({
selector: 'app-page-messenger-main',
@ -7,14 +11,13 @@ import { AuthenticationProtocolService } from '@ucap-webmessenger/protocol-authe
styleUrls: ['./main.page.component.scss']
})
export class MainPageComponent implements OnInit {
selectedChat: boolean;
selectedChat$: Observable<number | null>;
constructor(
private authenticationProtocolService: AuthenticationProtocolService
) {}
constructor(private store: Store<any>) {}
ngOnInit(): void {
// this.authenticationProtocolService.login({});
this.selectedChat = true;
this.selectedChat$ = this.store.pipe(
select(AppSotre.MessengerSelector.ChatSelector.selectedRoom)
);
}
}

123
projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts
View File

@ -15,7 +15,12 @@ import { PublicApiService } from '@ucap-webmessenger/api-public';
import * as AppStore from '../store';
import * as VersionInfoStore from '../store/setting/version-info';
import { LoginInfo, KEY_LOGIN_INFO } from '../types';
import {
LoginInfo,
KEY_LOGIN_INFO,
EnvironmentsInfo,
KEY_ENVIRONMENTS_INFO
} from '../types';
import { InnerProtocolService } from '@ucap-webmessenger/protocol-inner';
import {
AuthenticationProtocolService,
@ -41,64 +46,68 @@ export class AppMessengerResolver implements Resolve<void> {
state: RouterStateSnapshot
): void | Observable<void> | Promise<void> {
const loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
const environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>(
KEY_ENVIRONMENTS_INFO
);
return new Promise<void>((resolve, reject) => {
this.publicApiService
.versionInfo2({
deviceType: loginInfo.deviceType,
companyGroupType: 'C',
companyCode: loginInfo.companyCode,
loginId: loginInfo.loginId
})
.pipe(
take(1),
tap(versionInfo2Res => {
this.store.dispatch(VersionInfoStore.fetchSuccess(versionInfo2Res));
}),
mergeMap(versionInfo2Res =>
this.protocolService.connect(versionInfo2Res.serverIp)
),
mergeMap(() => this.innerProtocolService.conn({})),
mergeMap(connRres =>
this.authenticationProtocolService.login({
loginId: loginInfo.loginId,
loginPw: loginInfo.loginPw,
deviceType: loginInfo.deviceType,
deviceId: ' ',
token: '',
localeCode: loginInfo.localeCode,
pushId: ' ',
companyCode: loginInfo.companyCode,
passwordEncodingType: 1,
clientVersion: '',
reconnect: false,
ip: 'localhost',
hostName: '',
ssoMode: SSOMode.AUTH,
userSpecificInformation: 'PRO_000482',
productId: 'PRO_000482',
productName: 'EZMessenger'
})
),
map(loginRes => {
this.store.dispatch(
AuthenticationStore.loginSuccess({
loginInfo: loginRes
})
);
}),
catchError(err => {
return throwError(err);
})
)
.subscribe(
() => {
resolve();
},
err => {
reject();
}
);
resolve();
// this.publicApiService
// .versionInfo2({
// deviceType: environmentsInfo.deviceType,
// companyGroupType: loginInfo.companyGroupType,
// companyCode: loginInfo.companyCode,
// loginId: loginInfo.loginId
// })
// .pipe(
// take(1),
// tap(versionInfo2Res => {
// this.store.dispatch(VersionInfoStore.fetchSuccess(versionInfo2Res));
// }),
// mergeMap(versionInfo2Res =>
// this.protocolService.connect(versionInfo2Res.serverIp)
// ),
// mergeMap(() => this.innerProtocolService.conn({})),
// mergeMap(connRres =>
// this.authenticationProtocolService.login({
// loginId: loginInfo.loginId,
// loginPw: loginInfo.loginPw,
// deviceType: environmentsInfo.deviceType,
// deviceId: ' ',
// token: '',
// localeCode: loginInfo.localeCode,
// pushId: ' ',
// companyCode: loginInfo.companyCode,
// passwordEncodingType: 1,
// clientVersion: '',
// reconnect: false,
// ip: 'localhost',
// hostName: '',
// ssoMode: SSOMode.AUTH,
// userSpecificInformation: 'PRO_000482',
// productId: 'PRO_000482',
// productName: 'EZMessenger'
// })
// ),
// map(loginRes => {
// this.store.dispatch(
// AuthenticationStore.loginSuccess({
// loginInfo: loginRes
// })
// );
// }),
// catchError(err => {
// return throwError(err);
// })
// )
// .subscribe(
// () => {
// resolve();
// },
// err => {
// reject();
// }
// );
});
}
}

36
projects/ucap-webmessenger-app/src/app/services/app.service.ts
View File

@ -1,14 +1,44 @@
import { Injectable } from '@angular/core';
import { AppNotificationService } from './notification.service';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { EnviromentUtilService } from '@ucap-webmessenger/util';
import { DeviceType } from '@ucap-webmessenger/core';
import { EnvironmentsInfo, KEY_ENVIRONMENTS_INFO } from '@app/types';
@Injectable()
export class AppService {
constructor(private appNotificationService: AppNotificationService) {}
constructor(
private enviromentUtilService: EnviromentUtilService,
private sessionStorageService: SessionStorageService,
private appNotificationService: AppNotificationService
) {}
public postInit(): Promise<void> {
return new Promise<void>((resolve, reject) => {
this.appNotificationService.subscribe();
resolve();
try {
let deviceType: DeviceType;
if (this.enviromentUtilService.nodeWebkit()) {
deviceType = DeviceType.PC;
} else if (this.enviromentUtilService.android()) {
deviceType = DeviceType.Android;
} else if (this.enviromentUtilService.ios()) {
deviceType = DeviceType.iOS;
} else {
deviceType = DeviceType.Web;
}
this.sessionStorageService.set<EnvironmentsInfo>(
KEY_ENVIRONMENTS_INFO,
{
deviceType
}
);
this.appNotificationService.subscribe();
resolve();
} catch (error) {
reject();
}
});
}
}

21
projects/ucap-webmessenger-app/src/app/services/authentication.service.ts
View File

@ -6,8 +6,7 @@ import {
SessionStorageService,
LocalStorageService
} from '@ucap-webmessenger/web-storage';
import { EnviromentUtilService } from '@ucap-webmessenger/util';
import { DeviceType, LocaleCode } from '@ucap-webmessenger/core';
import { LocaleCode } from '@ucap-webmessenger/core';
import { LoginInfo, KEY_LOGIN_INFO } from '../types';
@Injectable({
@ -18,8 +17,7 @@ export class AppAuthenticationService {
constructor(
private sessionStorageService: SessionStorageService,
private localStorageService: LocalStorageService,
private enviromentUtilService: EnviromentUtilService
private localStorageService: LocalStorageService
) {}
authenticated(): boolean {
@ -28,24 +26,11 @@ export class AppAuthenticationService {
}
login(loginInfo: LoginInfo, rememberMe: boolean) {
let deviceType: DeviceType;
loginInfo = { ...loginInfo, localeCode: LocaleCode.Korean };
if (this.enviromentUtilService.nodeWebkit()) {
deviceType = DeviceType.PC;
} else if (this.enviromentUtilService.android()) {
deviceType = DeviceType.Android;
} else if (this.enviromentUtilService.ios()) {
deviceType = DeviceType.iOS;
} else {
deviceType = DeviceType.Web;
}
this.sessionStorageService.set<LoginInfo>(KEY_LOGIN_INFO, {
...loginInfo,
loginPw: CryptoJS.enc.Hex.stringify(CryptoJS.SHA256(loginInfo.loginPw)),
deviceType
loginPw: CryptoJS.enc.Hex.stringify(CryptoJS.SHA256(loginInfo.loginPw))
});
if (rememberMe) {

304
projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts
View File

@ -1,18 +1,22 @@
import { Injectable, Inject } from '@angular/core';
import { Router } from '@angular/router';
import { Actions, ofType, createEffect } from '@ngrx/effects';
import { of } from 'rxjs';
import { of, throwError, EMPTY as empty } from 'rxjs';
import {
catchError,
exhaustMap,
map,
tap,
take,
switchMap
switchMap,
mergeMap,
skip,
concatMap
} from 'rxjs/operators';
import { Store } from '@ngrx/store';
import { Actions, ofType, createEffect } from '@ngrx/effects';
import {
PiService,
Login2Response,
@ -37,38 +41,265 @@ import {
webLoginSuccess,
webLoginFailure
} from './actions';
import { LoginInfo } from '../../../types';
import {
LoginInfo,
EnvironmentsInfo,
KEY_ENVIRONMENTS_INFO
} from '../../../types';
import { AppAuthenticationService } from '../../../services/authentication.service';
import { NGXLogger } from 'ngx-logger';
import {
PublicApiService,
VersionInfo2Response
} from '@ucap-webmessenger/api-public';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import * as VersionInfoStore from '@app/store/setting/version-info';
import { ProtocolService } from '@ucap-webmessenger/protocol';
import { InnerProtocolService } from '@ucap-webmessenger/protocol-inner';
import {
AuthenticationProtocolService,
SSOMode,
LoginResponse
} from '@ucap-webmessenger/protocol-authentication';
import CryptoJS from 'crypto-js';
@Injectable()
export class Effects {
webLogin$ = createEffect(() =>
this.actions$.pipe(
ofType(webLogin),
map(action => action),
exhaustMap((params: { loginInfo: LoginInfo; rememberMe: boolean }) =>
this.piService
.login2({
loginId: params.loginInfo.loginId,
loginPw: params.loginInfo.loginPw,
companyCode: params.loginInfo.companyCode
})
.pipe(
map((res: Login2Response) => {
if ('success' !== res.status.toLowerCase()) {
return webLoginFailure({ error: 'Failed' });
} else {
return webLoginSuccess({
loginInfo: params.loginInfo,
rememberMe: params.rememberMe,
login2Response: res
});
}
}),
catchError(error => of(webLoginFailure({ error })))
)
)
)
// webLogin$ = createEffect(() =>
// this.actions$.pipe(
// ofType(webLogin),
// map(action => action),
// exhaustMap((params: { loginInfo: LoginInfo; rememberMe: boolean }) =>
// this.piService
// .login2({
// loginId: params.loginInfo.loginId,
// loginPw: params.loginInfo.loginPw,
// companyCode: params.loginInfo.companyCode
// })
// .pipe(
// map((res: Login2Response) => {
// if ('success' !== res.status.toLowerCase()) {
// return webLoginFailure({ error: 'Failed' });
// } else {
// return webLoginSuccess({
// loginInfo: params.loginInfo,
// rememberMe: params.rememberMe,
// login2Response: res
// });
// }
// }),
// catchError(error => of(webLoginFailure({ error })))
// )
// )
// )
// );
webLogin$ = createEffect(
() =>
this.actions$.pipe(
ofType(webLogin),
map(action => action),
switchMap(
(loginParams: { loginInfo: LoginInfo; rememberMe: boolean }) => {
const environmentsInfo = this.sessionStorageService.get<
EnvironmentsInfo
>(KEY_ENVIRONMENTS_INFO);
let login2Res: Login2Response;
let loginRes: LoginResponse;
let versionInfo2Res: VersionInfo2Response;
let encLoginPw: string;
return this.piService
.login2({
loginId: loginParams.loginInfo.loginId,
loginPw: loginParams.loginInfo.loginPw,
companyCode: loginParams.loginInfo.companyCode
})
.pipe(
concatMap(res => {
console.log('tap');
if ('success' !== res.status.toLowerCase()) {
return throwError('login2 failed');
}
login2Res = res;
return of(true);
}),
mergeMap(dd => {
console.log('checkForUpdates');
return this.nativeService.checkForUpdates();
}),
concatMap(update => {
if (update) {
return throwError('update process');
}
encLoginPw = CryptoJS.enc.Hex.stringify(
CryptoJS.SHA256(loginParams.loginInfo.loginPw)
);
return of(true);
}),
mergeMap(() =>
this.publicApiService.versionInfo2({
deviceType: environmentsInfo.deviceType,
companyGroupType: loginParams.loginInfo.companyGroupType,
companyCode: loginParams.loginInfo.companyCode,
loginId: loginParams.loginInfo.loginId
})
),
map(res => {
this.store.dispatch(VersionInfoStore.fetchSuccess(res));
versionInfo2Res = res;
return of(true);
}),
mergeMap(() =>
this.protocolService.connect(versionInfo2Res.serverIp)
),
mergeMap(() => this.innerProtocolService.conn({})),
mergeMap(() =>
this.authenticationProtocolService.login({
loginId: loginParams.loginInfo.loginId,
loginPw: encLoginPw,
deviceType: environmentsInfo.deviceType,
deviceId: ' ',
token: '',
localeCode: loginParams.loginInfo.localeCode,
pushId: ' ',
companyCode: loginParams.loginInfo.companyCode,
passwordEncodingType: 1,
clientVersion: '',
reconnect: false,
ip: 'localhost',
hostName: '',
ssoMode: SSOMode.AUTH,
userSpecificInformation: 'PRO_000482',
productId: 'PRO_000482',
productName: 'EZMessenger'
})
),
exhaustMap(async res => {
if (res.privateInformationAgree) {
return of(null);
}
loginRes = res;
const privacyTotalUrl = this.piService.privacyTotalUrl({
companyCode: res.companyCode,
userSeq: res.userSeq,
token: res.tokenString,
deviceType: environmentsInfo.deviceType,
localeCode: loginParams.loginInfo.localeCode,
textOnly: 'true'
});
const result = await this.dialogService.open<
ConfirmDialogComponent,
ConfirmDialogData,
ConfirmDialogResult
>(ConfirmDialogComponent, {
width: '100%',
height: '500px',
disableClose: true,
data: {
title: '개인정보 동의',
html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
}
});
if (!result.choice) {
console.log('privacy error');
throw new Error('privacy error');
}
return of(true);
}),
exhaustMap(proceed => {
if (null === proceed) {
return of(null);
}
return this.piService.userTermsAction({
userSeq: loginRes.userSeq,
token: loginRes.tokenString,
deviceType: environmentsInfo.deviceType
});
}),
exhaustMap(async () => {
this.logger.debug(
'loginRes.passwordExpired',
loginRes.passwordExpired
);
if (!loginRes.passwordExpired) {
return of(null);
}
const privacyTotalUrl = this.piService.privacyTotalUrl({
companyCode: loginRes.companyCode,
userSeq: loginRes.userSeq,
token: loginRes.tokenString,
deviceType: environmentsInfo.deviceType,
localeCode: loginParams.loginInfo.localeCode,
textOnly: 'true'
});
const result = await this.dialogService.open<
ConfirmDialogComponent,
ConfirmDialogData,
ConfirmDialogResult
>(ConfirmDialogComponent, {
width: '100%',
height: '500px',
disableClose: true,
data: {
title: '패스워드 변경',
html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
}
});
if (!result.choice) {
return throwError('privacy error');
}
return of(true);
}),
mergeMap(proceed => {
// 패스워드 변경
if (null === proceed) {
return of(null);
}
return this.piService.userTermsAction({
userSeq: loginRes.userSeq,
token: loginRes.tokenString,
deviceType: environmentsInfo.deviceType
});
}),
map(res => {
this.appAuthenticationService.login(
loginParams.loginInfo,
loginParams.rememberMe
);
this.store.dispatch(
loginSuccess({
loginInfo: loginRes
})
);
this.router.navigate(['/messenger']);
}),
catchError(error => {
return throwError(error);
})
);
}
),
catchError(error => {
this.store.dispatch(webLoginFailure({ error: error.message }));
return of(error);
})
),
{ dispatch: false }
);
webLoginSuccess$ = createEffect(
@ -140,9 +371,16 @@ export class Effects {
constructor(
private actions$: Actions,
private router: Router,
private store: Store<any>,
private piService: PiService,
private publicApiService: PublicApiService,
private protocolService: ProtocolService,
private innerProtocolService: InnerProtocolService,
private authenticationProtocolService: AuthenticationProtocolService,
private appAuthenticationService: AppAuthenticationService,
private dialogService: DialogService,
@Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService
@Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
private sessionStorageService: SessionStorageService,
private logger: NGXLogger
) {}
}

108
projects/ucap-webmessenger-app/src/app/store/account/privacy/effects.ts
View File

@ -28,62 +28,70 @@ import {
agreeFailure
} from './actions';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
import {
LoginInfo,
KEY_LOGIN_INFO,
EnvironmentsInfo,
KEY_ENVIRONMENTS_INFO
} from '@app/types';
import { initSettings } from '@app/store/setting/init';
@Injectable()
export class Effects {
agreeConfirmation$ = createEffect(() =>
this.actions$.pipe(
ofType(loginSuccess),
exhaustMap(async params => {
if (params.loginInfo.privateInformationAgree) {
return null;
}
const loginInfo = this.sessionStorageService.get<LoginInfo>(
KEY_LOGIN_INFO
);
// agreeConfirmation$ = createEffect(() =>
// this.actions$.pipe(
// ofType(loginSuccess),
// exhaustMap(async params => {
// if (params.loginInfo.privateInformationAgree) {
// return null;
// }
// const loginInfo = this.sessionStorageService.get<LoginInfo>(
// KEY_LOGIN_INFO
// );
// const environmentsInfo = this.sessionStorageService.get<
// EnvironmentsInfo
// >(KEY_ENVIRONMENTS_INFO);
const privacyTotalUrl = this.piService.privacyTotalUrl({
companyCode: params.loginInfo.companyCode,
userSeq: params.loginInfo.userSeq,
token: params.loginInfo.tokenString,
deviceType: loginInfo.deviceType,
localeCode: loginInfo.localeCode,
textOnly: 'true'
});
// const privacyTotalUrl = this.piService.privacyTotalUrl({
// companyCode: params.loginInfo.companyCode,
// userSeq: params.loginInfo.userSeq,
// token: params.loginInfo.tokenString,
// deviceType: environmentsInfo.deviceType,
// localeCode: loginInfo.localeCode,
// textOnly: 'true'
// });
const result = await this.dialogService.open<
ConfirmDialogComponent,
ConfirmDialogData,
ConfirmDialogResult
>(ConfirmDialogComponent, {
width: '100%',
height: '500px',
disableClose: true,
data: {
title: '개인정보 동의',
html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
}
});
// const result = await this.dialogService.open<
// ConfirmDialogComponent,
// ConfirmDialogData,
// ConfirmDialogResult
// >(ConfirmDialogComponent, {
// width: '100%',
// height: '500px',
// disableClose: true,
// data: {
// title: '개인정보 동의',
// html: `<iframe id="ifm_privacy" src="${privacyTotalUrl}" style="width: 100%;height: 300px;" />`
// }
// });
return {
loginInfo: params.loginInfo,
choice: result.choice
};
}),
map(params => {
if (!params) {
return agreeConfirmationNotNeeded();
}
// return {
// loginInfo: params.loginInfo,
// choice: result.choice
// };
// }),
// map(params => {
// if (!params) {
// return agreeConfirmationNotNeeded();
// }
return params.choice
? agreeConfirmationYes({ loginInfo: params.loginInfo })
: agreeConfirmationNo();
})
)
);
// return params.choice
// ? agreeConfirmationYes({ loginInfo: params.loginInfo })
// : agreeConfirmationNo();
// })
// )
// );
agreeConfirmationYes$ = createEffect(() =>
this.actions$.pipe(
@ -92,9 +100,13 @@ export class Effects {
const loginInfo = this.sessionStorageService.get<LoginInfo>(
KEY_LOGIN_INFO
);
const environmentsInfo = this.sessionStorageService.get<
EnvironmentsInfo
>(KEY_ENVIRONMENTS_INFO);
return {
loginInfo,
environmentsInfo,
loginResponse: action.loginInfo
};
}),
@ -103,7 +115,7 @@ export class Effects {
.userTermsAction({
userSeq: params.loginResponse.userSeq,
token: params.loginResponse.tokenString,
deviceType: params.loginInfo.deviceType
deviceType: params.environmentsInfo.deviceType
})
.pipe(
map((res: UserTermsActionResponse) => {

6
projects/ucap-webmessenger-app/src/app/store/messenger/chat/actions.ts Normal file
View File

@ -0,0 +1,6 @@
import { createAction, props } from '@ngrx/store';
export const selectedRoom = createAction(
'[Messenger::Chat] selectedRoom',
props<{ roomSeq: number }>()
);

16
projects/ucap-webmessenger-app/src/app/store/messenger/chat/effects.ts Normal file
View File

@ -0,0 +1,16 @@
import { Injectable } from '@angular/core';
import { Actions } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { NGXLogger } from 'ngx-logger';
@Injectable()
export class Effects {
constructor(
private actions$: Actions,
private store: Store<any>,
private logger: NGXLogger
) {}
}

4
projects/ucap-webmessenger-app/src/app/store/messenger/chat/index.ts Normal file
View File

@ -0,0 +1,4 @@
export * from './actions';
export * from './effects';
export * from './reducers';
export * from './state';

13
projects/ucap-webmessenger-app/src/app/store/messenger/chat/reducers.ts Normal file
View File

@ -0,0 +1,13 @@
import { createReducer, on } from '@ngrx/store';
import { initialState } from './state';
import { selectedRoom } from './actions';
export const reducer = createReducer(
initialState,
on(selectedRoom, (state, action) => {
return {
...state,
selectedRoom: action.roomSeq
};
})
);

18
projects/ucap-webmessenger-app/src/app/store/messenger/chat/state.ts Normal file
View File

@ -0,0 +1,18 @@
import { Selector, createSelector } from '@ngrx/store';
export interface State {
selectedRoom: number | null;
}
export const initialState: State = {
selectedRoom: null
};
export function selectors<S>(selector: Selector<any, State>) {
return {
selectedRoom: createSelector(
selector,
(state: State) => state.selectedRoom
)
};
}

11
projects/ucap-webmessenger-app/src/app/store/messenger/index.ts
View File

@ -1,22 +1,31 @@
import { Type } from '@angular/core';
import { Action, combineReducers, Selector, createSelector } from '@ngrx/store';
import * as ChatStore from './chat';
import * as SyncStore from './sync';
export interface State {
chat: ChatStore.State;
sync: SyncStore.State;
}
export const effects: Type<any>[] = [SyncStore.Effects];
export const effects: Type<any>[] = [ChatStore.Effects, SyncStore.Effects];
export function reducers(state: State | undefined, action: Action) {
return combineReducers({
chat: ChatStore.reducer,
sync: SyncStore.reducer
})(state, action);
}
export function selectors<S>(selector: Selector<any, State>) {
return {
ChatSelector: ChatStore.selectors(
createSelector(
selector,
(state: State) => state.chat
)
),
SyncSelector: SyncStore.selectors(
createSelector(
selector,

9
projects/ucap-webmessenger-app/src/app/store/messenger/sync/state.ts
View File

@ -33,6 +33,15 @@ export function selectors<S>(selector: Selector<any, State>) {
group2SyncDate: createSelector(
selector,
(state: State) => state.group2SyncDate
),
groupListAndBuddyList: createSelector(
selector,
(state: State) => {
return {
groupList: state.groupList,
buddyList: state.buddyInfoList
};
}
)
};
}

3
projects/ucap-webmessenger-app/src/app/store/setting/option/effects.ts
View File

@ -8,12 +8,13 @@ import { catchError, exhaustMap, map, tap } from 'rxjs/operators';
import { regViewSuccess, regViewFailure } from './actions';
import { initSettings } from '../init';
import { OptionProtocolService } from '@ucap-webmessenger/protocol-option';
import { loginSuccess } from '@app/store/account/authentication';
@Injectable()
export class Effects {
initSettings$ = createEffect(() =>
this.actions$.pipe(
ofType(initSettings),
ofType(loginSuccess),
exhaustMap(() =>
this.optionProtocolService.regView({}).pipe(
map(res => regViewSuccess({ res })),

16
projects/ucap-webmessenger-app/src/app/store/setting/query/effects.ts
View File

@ -13,19 +13,29 @@ import {
AuthRequest
} from '@ucap-webmessenger/protocol-query';
import { SessionStorageService } from '@ucap-webmessenger/web-storage';
import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
import {
LoginInfo,
KEY_LOGIN_INFO,
EnvironmentsInfo,
KEY_ENVIRONMENTS_INFO
} from '@app/types';
import { loginSuccess } from '@app/store/account/authentication';
@Injectable()
export class Effects {
initSettings$ = createEffect(() =>
this.actions$.pipe(
ofType(initSettings),
ofType(loginSuccess),
map(() => {
const loginInfo = this.sessionStorageService.get<LoginInfo>(
KEY_LOGIN_INFO
);
const environmentsInfo = this.sessionStorageService.get<
EnvironmentsInfo
>(KEY_ENVIRONMENTS_INFO);
return {
deviceType: loginInfo.deviceType
deviceType: environmentsInfo.deviceType
} as AuthRequest;
}),
exhaustMap(req =>

7
projects/ucap-webmessenger-app/src/app/types/environment.type.ts Normal file
View File

@ -0,0 +1,7 @@
import { DeviceType } from '@ucap-webmessenger/core';
export const KEY_ENVIRONMENTS_INFO = 'ucap::ENVIRONMENTS_INFO';
export interface EnvironmentsInfo {
deviceType?: DeviceType;
}

1
projects/ucap-webmessenger-app/src/app/types/index.ts
View File

@ -1 +1,2 @@
export * from './environment.type';
export * from './login-info.type';

4
projects/ucap-webmessenger-app/src/app/types/login-info.type.ts
View File

@ -1,4 +1,4 @@
import { DeviceType, LocaleCode } from '@ucap-webmessenger/core';
import { LocaleCode } from '@ucap-webmessenger/core';
export const KEY_LOGIN_INFO = 'ucap::LOGIN_INFO';
@ -6,7 +6,7 @@ export interface LoginInfo {
loginId?: string;
loginPw?: string;
companyCode?: string;
deviceType?: DeviceType;
companyGroupType?: string;
localeCode?: LocaleCode;
encData?: string;
}

5
projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy.ts
View File

@ -10,6 +10,7 @@ import {
ProtocolStream
} from '@ucap-webmessenger/protocol';
import { UserInfo } from '../types/userInfo';
import { EmployeeType } from '@ucap-webmessenger/protocol-room';
export interface BuddyInfo {
// 사용자SEQ
@ -82,7 +83,7 @@ export const decodeBuddyDetailData: ProtocolDecoder<BuddyDetailData> = (
const info = buddyinfo.split(BodyStringDivider);
let i = 0;
buddyInfos.push({
seq: info[i],
seq: Number(info[i]),
name: info[i++],
profileImageFile: info[i++],
grade: info[i++],
@ -109,7 +110,7 @@ export const decodeBuddyDetailData: ProtocolDecoder<BuddyDetailData> = (
deptNameCn: info[i++],
isPrivacyAgree: info[i++] === 'Y' ? true : false,
isValidLogin: info[i++] === 'Y' ? true : false,
employeeType: info[i++],
employeeType: info[i++] as EmployeeType,
nickName: info[i++]
});
});

11
projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
View File

@ -1,8 +1,15 @@
<mat-accordion>
<mat-expansion-panel *ngFor="let group of groupList">
<mat-expansion-panel *ngFor="let groupBuddy of groupBuddyList">
<mat-expansion-panel-header>
<mat-panel-title> {{ group.name }} </mat-panel-title>
<mat-panel-title> {{ groupBuddy.group.name }} </mat-panel-title>
<mat-panel-description> </mat-panel-description>
</mat-expansion-panel-header>
<div
*ngFor="let buddy of groupBuddy.buddyList"
(click)="onClickBuddy(buddy)"
>
{{ buddy.name }}
</div>
</mat-expansion-panel>
</mat-accordion>

13
projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, Input } from '@angular/core';
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { GroupDetailData } from '@ucap-webmessenger/protocol-sync';
import { GroupDetailData, UserInfo } from '@ucap-webmessenger/protocol-sync';
@Component({
selector: 'ucap-group-expansion-panel',
@ -9,9 +9,16 @@ import { GroupDetailData } from '@ucap-webmessenger/protocol-sync';
})
export class ExpansionPanelComponent implements OnInit {
@Input()
groupList: GroupDetailData[];
groupBuddyList: { group: GroupDetailData; buddyList: UserInfo[] }[];
@Output()
selectBuddy = new EventEmitter<UserInfo>();
constructor() {}
ngOnInit() {}
onClickBuddy(buddy: UserInfo) {
this.selectBuddy.emit(buddy);
}
}