agree of privacy is modified

projects/ucap-webmessenger-api/src/lib/utils/url.util.ts

@@ -0,0 +1,16 @@
+import { Parameter } from './parameter.util';
+import { HttpParams } from '@angular/common/http';
+
+export class UrlUtil {
+  public static format(href: string, param: Parameter): string {
+    const params = new HttpParams({ fromObject: param }).toString();
+
+    if (params.length === 0) {
+      return href;
+    } else {
+      const qIdx = href.indexOf('?');
+      const sep: string = qIdx === -1 ? '?' : qIdx < href.length - 1 ? '&' : '';
+      return href + sep + params;
+    }
+  }
+}

projects/ucap-webmessenger-api/src/public-api.ts

@@ -7,3 +7,4 @@ export * from './lib/models/api';
 export * from './lib/types/status-code.type';
 
 export * from './lib/utils/parameter.util';
+export * from './lib/utils/url.util';

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

@@ -68,7 +68,7 @@ export class AppMessengerResolver implements Resolve<void> {
                         deviceType: loginInfo.deviceType,
                         deviceId: ' ',
                         token: '',
-                        localeCode: LocaleCode.Korean,
+                        localeCode: loginInfo.localeCode,
                         pushId: ' ',
                         companyCode: loginInfo.companyCode,
                         passwordEncodingType: 1,

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

@@ -7,7 +7,7 @@ import {
   LocalStorageService
 } from '@ucap-webmessenger/web-storage';
 import { EnviromentUtilService } from '@ucap-webmessenger/util';
-import { DeviceType } from '@ucap-webmessenger/core';
+import { DeviceType, LocaleCode } from '@ucap-webmessenger/core';
 import { LoginInfo, KEY_LOGIN_INFO } from '../types';
 
 @Injectable({
@@ -30,6 +30,8 @@ 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()) {

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

@@ -48,7 +48,7 @@ export class Effects {
           })
           .pipe(
             map((res: Login2Response) => {
-              if (res.status === ResponseStatus.Fail) {
+              if ('success' !== res.status.toLowerCase()) {
                 return webLoginFailure({ error: 'Failed' });
               } else {
                 return webLoginSuccess({

projects/ucap-webmessenger-app/src/app/store/account/index.ts

@@ -2,16 +2,22 @@ import { Type } from '@angular/core';
 import { Action, combineReducers, Selector, createSelector } from '@ngrx/store';
 
 import * as AuthenticationStore from './authentication';
+import * as PrivacyStore from './privacy';
 
 export interface State {
   authentication: AuthenticationStore.State;
+  privacy: PrivacyStore.State;
 }
 
-export const effects: Type<any>[] = [AuthenticationStore.Effects];
+export const effects: Type<any>[] = [
+  AuthenticationStore.Effects,
+  PrivacyStore.Effects
+];
 
 export function reducers(state: State | undefined, action: Action) {
   return combineReducers({
-    authentication: AuthenticationStore.reducer
+    authentication: AuthenticationStore.reducer,
+    privacy: PrivacyStore.reducer
   })(state, action);
 }
 
@@ -22,6 +28,12 @@ export function selectors<S>(selector: Selector<any, State>) {
         selector,
         (state: State) => state.authentication
       )
+    ),
+    PrivacySelector: PrivacyStore.selectors(
+      createSelector(
+        selector,
+        (state: State) => state.privacy
+      )
     )
   };
 }

projects/ucap-webmessenger-app/src/app/store/account/privacy/actions.ts

@@ -0,0 +1,25 @@
+import { createAction, props } from '@ngrx/store';
+
+import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
+
+export const agreeConfirmationNotNeeded = createAction(
+  '[Account::Privacy] Agree Confirmation not needed'
+);
+
+export const agreeConfirmationYes = createAction(
+  '[Account::Privacy] Agree Confirmation Yes',
+  props<{
+    loginInfo: LoginResponse;
+  }>()
+);
+
+export const agreeConfirmationNo = createAction(
+  '[Account::Privacy] Agree Confirmation No'
+);
+
+export const agreeSuccess = createAction('[Account::Privacy] Agree Success');
+
+export const agreeFailure = createAction(
+  '[Account::Privacy] Agree Failure',
+  props<{ error: any }>()
+);

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

@@ -0,0 +1,145 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { Actions, ofType, createEffect } from '@ngrx/effects';
+
+import { of } from 'rxjs';
+import { catchError, exhaustMap, map } from 'rxjs/operators';
+
+import {
+  PiService,
+  UserTermsActionResponse,
+  ResponseStatus
+} from '@ucap-webmessenger/pi';
+import {
+  DialogService,
+  ConfirmDialogComponent,
+  ConfirmDialogData,
+  ConfirmDialogResult
+} from '@ucap-webmessenger/ui';
+
+import { AppAuthenticationService } from '@app/services/authentication.service';
+import { loginSuccess, logout } from '../authentication';
+import {
+  agreeConfirmationYes,
+  agreeConfirmationNo,
+  agreeConfirmationNotNeeded,
+  agreeSuccess,
+  agreeFailure
+} from './actions';
+import { SessionStorageService } from '@ucap-webmessenger/web-storage';
+import { LoginInfo, KEY_LOGIN_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
+        );
+
+        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 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 params.choice
+          ? agreeConfirmationYes({ loginInfo: params.loginInfo })
+          : agreeConfirmationNo();
+      })
+    )
+  );
+
+  agreeConfirmationYes$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(agreeConfirmationYes),
+      map(action => {
+        const loginInfo = this.sessionStorageService.get<LoginInfo>(
+          KEY_LOGIN_INFO
+        );
+
+        return {
+          loginInfo,
+          loginResponse: action.loginInfo
+        };
+      }),
+      exhaustMap(params =>
+        this.piService
+          .userTermsAction({
+            userSeq: params.loginResponse.userSeq,
+            token: params.loginResponse.tokenString,
+            deviceType: params.loginInfo.deviceType
+          })
+          .pipe(
+            map((res: UserTermsActionResponse) => {
+              if ('00' !== res.responseCode) {
+                return agreeFailure({ error: 'Failed' });
+              } else {
+                return agreeSuccess();
+              }
+            }),
+            catchError(error => of(agreeFailure({ error })))
+          )
+      )
+    )
+  );
+
+  agreeSuccess$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(agreeSuccess),
+      map(() => initSettings())
+    )
+  );
+
+  agreeFailure$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(agreeFailure),
+      map(action => action),
+      map(() => logout())
+    )
+  );
+
+  constructor(
+    private actions$: Actions,
+    private router: Router,
+    private piService: PiService,
+    private sessionStorageService: SessionStorageService,
+    private appAuthenticationService: AppAuthenticationService,
+    private dialogService: DialogService
+  ) {}
+}

projects/ucap-webmessenger-app/src/app/store/account/privacy/index.ts

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

projects/ucap-webmessenger-app/src/app/store/account/privacy/reducers.ts

@@ -0,0 +1,4 @@
+import { Action, combineReducers, createReducer, on } from '@ngrx/store';
+import { State, initialState } from './state';
+
+export const reducer = createReducer(initialState);

projects/ucap-webmessenger-app/src/app/store/account/privacy/state.ts

@@ -0,0 +1,11 @@
+import { Selector, createSelector } from '@ngrx/store';
+import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
+
+// tslint:disable-next-line: no-empty-interface
+export interface State {}
+
+export const initialState: State = {};
+
+export function selectors<S>(selector: Selector<any, State>) {
+  return {};
+}

projects/ucap-webmessenger-app/src/app/store/setting/index.ts

@@ -1,9 +1,11 @@
 import { Type } from '@angular/core';
 import { Action, combineReducers, Selector, createSelector } from '@ngrx/store';
 
+import * as InitStore from './init';
 import * as VersionInfoStore from './version-info';
 
 export interface State {
+  init: InitStore.State;
   versionInfo: VersionInfoStore.State;
 }
 
@@ -11,12 +13,19 @@ export const effects: Type<any>[] = [VersionInfoStore.Effects];
 
 export function reducers(state: State | undefined, action: Action) {
   return combineReducers({
+    init: InitStore.reducer,
     versionInfo: VersionInfoStore.reducer
   })(state, action);
 }
 
 export function selectors<S>(selector: Selector<any, State>) {
   return {
+    InitSelector: InitStore.selectors(
+      createSelector(
+        selector,
+        (state: State) => state.init
+      )
+    ),
     VersionInfoSelector: VersionInfoStore.selectors(
       createSelector(
         selector,

projects/ucap-webmessenger-app/src/app/store/setting/init/actions.ts

@@ -0,0 +1,3 @@
+import { createAction } from '@ngrx/store';
+
+export const initSettings = createAction('[Setting::Init] initSettings');

projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts

@@ -0,0 +1,6 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class Effects {
+  constructor() {}
+}

projects/ucap-webmessenger-app/src/app/store/setting/init/index.ts

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

projects/ucap-webmessenger-app/src/app/store/setting/init/reducers.ts

@@ -0,0 +1,4 @@
+import { createReducer, on } from '@ngrx/store';
+import { initialState } from './state';
+
+export const reducer = createReducer(initialState);

projects/ucap-webmessenger-app/src/app/store/setting/init/state.ts

@@ -0,0 +1,10 @@
+import { Selector, createSelector } from '@ngrx/store';
+
+// tslint:disable-next-line: no-empty-interface
+export interface State {}
+
+export const initialState: State = {};
+
+export function selectors<S>(selector: Selector<any, State>) {
+  return {};
+}

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

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

projects/ucap-webmessenger-app/src/environments/environment.type.ts

@@ -153,6 +153,12 @@ export class PiUrlConfig extends UrlConfig {
     });
   }
 
+  public get userTermsAction(): string {
+    return this.getUrl({
+      pathname: '/uCapPi/user/terms.action'
+    });
+  }
+
   public get passwordInitStep1(): string {
     return this.getUrl({
       pathname: '/uCapPi/password/initStep1'

projects/ucap-webmessenger-pi/src/lib/models/login2.ts

@@ -9,6 +9,7 @@ export interface Login2Request extends PIRequest {
 }
 
 export interface Login2Response extends PIResponse {
+  status: string;
   version: string;
   passwordHc: string;
   personalInfoAgreeYn: string;

projects/ucap-webmessenger-pi/src/lib/models/pi.ts

@@ -6,5 +6,4 @@ export interface PIRequest {
 
 export interface PIResponse {
   _Id?: string;
-  status?: ResponseStatus;
 }

projects/ucap-webmessenger-pi/src/lib/models/privacy-total.ts

@@ -0,0 +1,27 @@
+import { PIRequest } from './pi';
+import { DeviceType, LocaleCode } from '@ucap-webmessenger/core';
+import { APIEncoder, ParameterUtil } from '@ucap-webmessenger/api';
+
+export interface PrivacyTotalRequest extends PIRequest {
+  companyCode: string;
+  userSeq: number;
+  token: string;
+  deviceType: DeviceType;
+  localeCode: LocaleCode;
+  textOnly: string;
+}
+
+const privacyTotalEncodeMap = {
+  companyCode: 'companyCode',
+  userSeq: 'userSeq',
+  token: 'tokenKey',
+  deviceType: 'deviceType',
+  localeCode: 'locale',
+  textOnly: 'textOnly'
+};
+
+export const encodePrivacyTotal: APIEncoder<PrivacyTotalRequest> = (
+  req: PrivacyTotalRequest
+) => {
+  return ParameterUtil.encode(privacyTotalEncodeMap, req);
+};

projects/ucap-webmessenger-pi/src/lib/models/user-terms-action.ts

@@ -0,0 +1,37 @@
+import { ParameterUtil, APIEncoder, APIDecoder } from '@ucap-webmessenger/api';
+
+import { PIRequest, PIResponse } from './pi';
+import { DeviceType } from '@ucap-webmessenger/core';
+
+export interface UserTermsActionRequest extends PIRequest {
+  userSeq: number;
+  token: string;
+  deviceType: DeviceType;
+}
+
+// tslint:disable-next-line: no-empty-interface
+export interface UserTermsActionResponse extends PIResponse {
+  responseCode?: string;
+  responseMsg?: string;
+}
+
+const userTermsActionEncodeMap = {
+  userSeq: 'userSeq',
+  token: 'tokenKey',
+  deviceType: 'deviceType'
+};
+
+export const encodeUserTermsAction: APIEncoder<UserTermsActionRequest> = (
+  req: UserTermsActionRequest
+) => {
+  return ParameterUtil.encode(userTermsActionEncodeMap, req);
+};
+
+export const decodeUserTermsAction: APIDecoder<UserTermsActionResponse> = (
+  res: any
+) => {
+  return {
+    responseCode: res.responseCode,
+    responseMsg: res.responseMsg
+  } as UserTermsActionResponse;
+};

projects/ucap-webmessenger-pi/src/lib/services/pi.service.ts

@@ -5,13 +5,24 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { _MODULE_CONFIG } from '../types/token';
-import { ModuleConfig } from '../types/module-config';
+import { ModuleConfig, PiUrls } from '../types/module-config';
 import {
   Login2Request,
   Login2Response,
   encodeLogin2,
   decodeLogin2
 } from '../models/login2';
+import {
+  PrivacyTotalRequest,
+  encodePrivacyTotal
+} from '../models/privacy-total';
+import { UrlUtil, Parameter } from '@ucap-webmessenger/api';
+import {
+  UserTermsActionRequest,
+  UserTermsActionResponse,
+  encodeUserTermsAction,
+  decodeUserTermsAction
+} from '../models/user-terms-action';
 
 @Injectable({
   providedIn: 'root'
@@ -33,4 +44,32 @@ export class PiService {
       )
       .pipe(map(res => decodeLogin2(res)));
   }
+
+  public userTermsAction(
+    req: UserTermsActionRequest
+  ): Observable<UserTermsActionResponse> {
+    return this.httpClient
+      .post<any>(
+        this.moduleConfig.urls.userTermsAction,
+        {},
+        {
+          params: encodeUserTermsAction(req)
+        }
+      )
+      .pipe(map(res => decodeUserTermsAction(res)));
+  }
+
+  /**
+   * privacyTotalUrl
+   */
+  public privacyTotalUrl(req: PrivacyTotalRequest): string {
+    return UrlUtil.format(
+      this.moduleConfig.urls.policyTotal,
+      encodePrivacyTotal(req) as Parameter
+    );
+  }
+
+  public get urls(): PiUrls {
+    return this.moduleConfig.urls;
+  }
 }

projects/ucap-webmessenger-pi/src/lib/types/module-config.ts

@@ -1,5 +1,24 @@
-export interface ModuleConfig {
+export interface PiUrls {
-  urls: {
   login2: string;
-  };
+  userTermsAction: string;
+  passwordInitStep1: string;
+  passwordChange: string;
+  policyTotal: string;
+  policyService: string;
+  policyPrivacy: string;
+  tokenCheck: string;
+  userMobileAuth: string;
+  userUserAuth: string;
+  userCall: string;
+  userMoblieCallAuth: string;
+  eventSendEventMail: string;
+  userMobileInitial1: string;
+  eventSendInvite: string;
+  userRoom: string;
+  scheduleRetrieveScheduleList: string;
+  userScreenCapture: string;
+}
+
+export interface ModuleConfig {
+  urls: PiUrls;
 }

projects/ucap-webmessenger-pi/src/public-api.ts

@@ -6,6 +6,8 @@ export * from './lib/types/module-config';
 
 export * from './lib/models/pi';
 export * from './lib/models/login2';
+export * from './lib/models/privacy-total';
+export * from './lib/models/user-terms-action';
 
 export * from './lib/types/response-status.type';
 

projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.html

@@ -1,12 +1,12 @@
 <mat-card class="confirm-card">
-  <mat-card-header>
+  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
     <mat-card-title>{{ data.title }}</mat-card-title>
     <!-- <mat-card-subtitle>Confirm</mat-card-subtitle> -->
   </mat-card-header>
   <mat-card-content>
-    <p class="notice">
+    <div #messageContainer class="notice">
       {{ data.message }}
-    </p>
+    </div>
   </mat-card-content>
   <mat-card-actions class="button-farm flex-row">
     <button

projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.ts

@@ -1,9 +1,16 @@
-import { Component, OnInit, Inject } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  Inject,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 
 export interface ConfirmDialogData {
   title: string;
   message?: string;
+  html?: string;
 }
 
 export interface ConfirmDialogResult {
@@ -16,14 +23,19 @@ export interface ConfirmDialogResult {
   styleUrls: ['./confirm.dialog.component.scss']
 })
 export class ConfirmDialogComponent implements OnInit {
-  tempAgeLimits = [];
+  @ViewChild('messageContainer', { static: true })
+  messageContainer: ElementRef;
 
   constructor(
     public dialogRef: MatDialogRef<ConfirmDialogComponent, ConfirmDialogResult>,
     @Inject(MAT_DIALOG_DATA) public data: ConfirmDialogData
   ) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    if (!!this.data.html) {
+      this.messageContainer.nativeElement.innerHTML = this.data.html;
+    }
+  }
 
   onClickChoice(choice: boolean): void {
     this.dialogRef.close({

projects/ucap-webmessenger-ui/src/lib/ucap-ui.module.ts

@@ -5,6 +5,8 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { MatDialogModule } from '@angular/material/dialog';
 
+import { DragDropModule } from '@angular/cdk/drag-drop';
+
 import { BottomSheetService } from './services/bottom-sheet.service';
 import { DialogService } from './services/dialog.service';
 const SERVICES = [BottomSheetService, DialogService];
@@ -14,7 +16,13 @@ import { ConfirmDialogComponent } from './dialogs/confirm.dialog.component';
 const DIALOGS = [AlertDialogComponent, ConfirmDialogComponent];
 
 @NgModule({
-  imports: [CommonModule, MatButtonModule, MatCardModule, MatDialogModule],
+  imports: [
+    CommonModule,
+    MatButtonModule,
+    MatCardModule,
+    MatDialogModule,
+    DragDropModule
+  ],
   exports: [],
   declarations: [...DIALOGS],
   entryComponents: [...DIALOGS]