From c1df332f1e8fbce0eabad6375c19f8a00fac7071 Mon Sep 17 00:00:00 2001
From: Richard Park <richard.park@loafle.com>
Date: Fri, 4 Oct 2019 10:19:55 +0900
Subject: [PATCH] postLogin is implemented

---
 .../src/app/app.module.ts                     |   2 +
 .../src/app/resolvers/messenger.resolver.ts   |  35 ++--
 .../store/account/authentication/actions.ts   |  52 +++++-
 .../store/account/authentication/effects.ts   | 159 +++++++++++++++++-
 .../store/account/authentication/reducers.ts  |   2 +-
 .../app/store/account/authentication/state.ts |   8 +-
 .../src/app/store/account/index.ts            |  16 +-
 .../src/app/store/account/privacy/actions.ts  |  25 ---
 .../src/app/store/account/privacy/effects.ts  | 157 -----------------
 .../src/app/store/account/privacy/index.ts    |   4 -
 .../src/app/store/account/privacy/reducers.ts |   4 -
 .../src/app/store/account/privacy/state.ts    |  11 --
 .../app/store/setting/version-info/actions.ts |  14 +-
 .../app/store/setting/version-info/effects.ts |  26 ++-
 .../store/setting/version-info/reducers.ts    |  22 +--
 .../src/public-api.ts                         |   4 +
 16 files changed, 260 insertions(+), 281 deletions(-)
 delete mode 100644 projects/ucap-webmessenger-app/src/app/store/account/privacy/actions.ts
 delete mode 100644 projects/ucap-webmessenger-app/src/app/store/account/privacy/effects.ts
 delete mode 100644 projects/ucap-webmessenger-app/src/app/store/account/privacy/index.ts
 delete mode 100644 projects/ucap-webmessenger-app/src/app/store/account/privacy/reducers.ts
 delete mode 100644 projects/ucap-webmessenger-app/src/app/store/account/privacy/state.ts

diff --git a/projects/ucap-webmessenger-app/src/app/app.module.ts b/projects/ucap-webmessenger-app/src/app/app.module.ts
index 01018b73..b0f1936a 100644
--- a/projects/ucap-webmessenger-app/src/app/app.module.ts
+++ b/projects/ucap-webmessenger-app/src/app/app.module.ts
@@ -15,6 +15,7 @@ import { UCapProtocolModule } from '@ucap-webmessenger/protocol';
 import { UCapAuthenticationProtocolModule } from '@ucap-webmessenger/protocol-authentication';
 import { UCapInnerProtocolModule } from '@ucap-webmessenger/protocol-inner';
 import { UCapOptionProtocolModule } from '@ucap-webmessenger/protocol-option';
+import { UCapServiceProtocolModule } from '@ucap-webmessenger/protocol-service';
 import { UCapSyncProtocolModule } from '@ucap-webmessenger/protocol-sync';
 
 import { UCapUiModule } from '@ucap-webmessenger/ui';
@@ -67,6 +68,7 @@ import { GUARDS } from './guards';
     UCapAuthenticationProtocolModule.forRoot(),
     UCapInnerProtocolModule.forRoot(),
     UCapOptionProtocolModule.forRoot(),
+    UCapServiceProtocolModule.forRoot(),
     UCapSyncProtocolModule.forRoot(),
 
     UCapUiModule.forRoot(),
diff --git a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts
index 038c87e7..d0084151 100644
--- a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts
+++ b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts
@@ -4,15 +4,12 @@ import {
   ActivatedRouteSnapshot,
   RouterStateSnapshot
 } from '@angular/router';
-import { Observable, throwError, of, EMPTY, forkJoin } from 'rxjs';
+import { Observable, throwError, forkJoin } from 'rxjs';
 import {
   map,
   tap,
-  mergeMap,
   catchError,
   take,
-  exhaustMap,
-  concatMap,
   switchMap,
   withLatestFrom
 } from 'rxjs/operators';
@@ -21,10 +18,7 @@ import { Store, select } from '@ngrx/store';
 
 import { ProtocolService } from '@ucap-webmessenger/protocol';
 import { SessionStorageService } from '@ucap-webmessenger/web-storage';
-import {
-  PublicApiService,
-  VersionInfo2Response
-} from '@ucap-webmessenger/api-public';
+import { PublicApiService } from '@ucap-webmessenger/api-public';
 
 import {
   LoginInfo,
@@ -40,8 +34,6 @@ import {
 } from '@ucap-webmessenger/protocol-authentication';
 
 import * as AuthenticationStore from '@app/store/account/authentication';
-import { ConnResponse } from 'projects/ucap-webmessenger-protocol-inner/src/lib/models/conn';
-import { PiService } from '@ucap-webmessenger/pi';
 import { NGXLogger } from 'ngx-logger';
 import { QueryProtocolService } from '@ucap-webmessenger/protocol-query';
 import { OptionProtocolService } from '@ucap-webmessenger/protocol-option';
@@ -58,7 +50,6 @@ export class AppMessengerResolver implements Resolve<void> {
     private store: Store<any>,
     private sessionStorageService: SessionStorageService,
     private publicApiService: PublicApiService,
-    private piService: PiService,
     private protocolService: ProtocolService,
     private queryProtocolService: QueryProtocolService,
     private optionProtocolService: OptionProtocolService,
@@ -72,8 +63,6 @@ export class AppMessengerResolver implements Resolve<void> {
     routerStateSnapshot: RouterStateSnapshot
   ): void | Observable<void> | Promise<void> {
     return new Promise<void>((resolve, reject) => {
-      let versionInfo2Res: VersionInfo2Response;
-      let connRres: ConnResponse;
       let loginRes: LoginResponse;
 
       const loginInfo = this.sessionStorageService.get<LoginInfo>(
@@ -92,13 +81,14 @@ export class AppMessengerResolver implements Resolve<void> {
         })
         .pipe(
           take(1),
+          tap(res => {
+            this.store.dispatch(VersionInfoStore.versionInfo2Success({ res }));
+          }),
           switchMap(res => {
-            versionInfo2Res = res;
-            return this.protocolService.connect(versionInfo2Res.serverIp);
+            return this.protocolService.connect(res.serverIp);
           }),
           switchMap(() => this.innerProtocolService.conn({})),
           switchMap(res => {
-            connRres = res;
             return this.authenticationProtocolService.login({
               loginId: loginInfo.loginId,
               loginPw: loginInfo.loginPw,
@@ -119,19 +109,22 @@ export class AppMessengerResolver implements Resolve<void> {
               productName: 'EZMessenger'
             });
           }),
-          switchMap(res =>
-            forkJoin([
+          switchMap(res => {
+            loginRes = res;
+            return forkJoin([
               this.queryProtocolService.auth({
                 deviceType: environmentsInfo.deviceType
               }),
               this.optionProtocolService.regView({})
-            ])
-          ),
+            ]);
+          }),
           map(([authRes, regViewRes]) => {
             this.store.dispatch(
               OptionStore.regViewSuccess({ res: regViewRes })
             );
             this.store.dispatch(QueryStore.authSuccess({ res: authRes }));
+
+            this.store.dispatch(AuthenticationStore.postLogin({ loginRes }));
           }),
           withLatestFrom(
             this.store.pipe(
@@ -162,7 +155,7 @@ export class AppMessengerResolver implements Resolve<void> {
           () => {
             this.store.dispatch(
               AuthenticationStore.loginSuccess({
-                loginInfo: loginRes
+                loginRes
               })
             );
             resolve();
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts
index 1e10669f..c87419be 100644
--- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/actions.ts
@@ -3,7 +3,11 @@ import { createAction, props } from '@ngrx/store';
 import { Login2Response } from '@ucap-webmessenger/pi';
 import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
 
-import { LoginInfo } from '../../../types';
+import { LoginInfo } from '@app/types';
+import {
+  UserPasswordSetRequest,
+  UserPasswordSetResponse
+} from '@ucap-webmessenger/protocol-service';
 
 export const webLogin = createAction(
   '[Account::Authentication] Web Login',
@@ -30,7 +34,7 @@ export const webLoginFailure = createAction(
 export const loginSuccess = createAction(
   '[Account::Authentication] Login Success',
   props<{
-    loginInfo: LoginResponse;
+    loginRes: LoginResponse;
   }>()
 );
 
@@ -52,3 +56,47 @@ export const logoutConfirmation = createAction(
 export const logoutConfirmationDismiss = createAction(
   '[Account::Authentication] Logout Confirmation Dismiss'
 );
+
+export const postLogin = createAction(
+  '[Account::Authentication] Post Login',
+  props<{
+    loginRes: LoginResponse;
+  }>()
+);
+
+export const privacyAgree = createAction(
+  '[Account::Authentication] Privacy Agree',
+  props<{
+    loginRes: LoginResponse;
+  }>()
+);
+
+export const privacyAgreeSuccess = createAction(
+  '[Account::Authentication] Privacy Agree Success'
+);
+
+export const privacyAgreeFailure = createAction(
+  '[Account::Authentication] Privacy Agree Failure',
+  props<{ error: any }>()
+);
+
+export const privacyDisagree = createAction(
+  '[Account::Authentication] Privacy Disagree'
+);
+
+export const changePassword = createAction(
+  '[Account::Authentication] Change Password',
+  props<{ req: UserPasswordSetRequest }>()
+);
+
+export const changePasswordSuccess = createAction(
+  '[Account::Authentication] Change Password Success',
+  props<{
+    res: UserPasswordSetResponse;
+  }>()
+);
+
+export const changePasswordFailure = createAction(
+  '[Account::Authentication] Change Password Failure',
+  props<{ error: any }>()
+);
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 a6095306..c0253fd8 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
@@ -6,7 +6,11 @@ import { catchError, exhaustMap, map, tap, switchMap } from 'rxjs/operators';
 
 import { Actions, ofType, createEffect } from '@ngrx/effects';
 
-import { PiService, Login2Response } from '@ucap-webmessenger/pi';
+import {
+  PiService,
+  Login2Response,
+  UserTermsActionResponse
+} from '@ucap-webmessenger/pi';
 import { NativeService, UCAP_NATIVE_SERVICE } from '@ucap-webmessenger/native';
 import {
   DialogService,
@@ -22,11 +26,30 @@ import {
   logoutConfirmationDismiss,
   webLogin,
   webLoginSuccess,
-  webLoginFailure
+  webLoginFailure,
+  postLogin,
+  privacyAgree,
+  privacyDisagree,
+  privacyAgreeFailure,
+  privacyAgreeSuccess,
+  changePassword,
+  changePasswordFailure,
+  changePasswordSuccess
 } from './actions';
-import { LoginInfo } from '../../../types';
-import { AppAuthenticationService } from '../../../services/authentication.service';
+import {
+  LoginInfo,
+  KEY_LOGIN_INFO,
+  EnvironmentsInfo,
+  KEY_ENVIRONMENTS_INFO
+} from '@app/types';
+import { AppAuthenticationService } from '@app/services/authentication.service';
 import { NGXLogger } from 'ngx-logger';
+import { Store } from '@ngrx/store';
+import { SessionStorageService } from '@ucap-webmessenger/web-storage';
+import {
+  ServiceProtocolService,
+  UserPasswordSetResponse
+} from '@ucap-webmessenger/protocol-service';
 
 @Injectable()
 export class Effects {
@@ -125,11 +148,139 @@ export class Effects {
     )
   );
 
+  postLogin$ = createEffect(
+    () =>
+      this.actions$.pipe(
+        ofType(postLogin),
+        map(action => action.loginRes),
+        tap(async loginRes => {
+          const loginInfo = this.sessionStorageService.get<LoginInfo>(
+            KEY_LOGIN_INFO
+          );
+          const environmentsInfo = this.sessionStorageService.get<
+            EnvironmentsInfo
+          >(KEY_ENVIRONMENTS_INFO);
+
+          if (!loginRes.privateInformationAgree) {
+            const privacyTotalUrl = this.piService.privacyTotalUrl({
+              companyCode: loginInfo.companyCode,
+              userSeq: loginRes.userSeq,
+              token: loginRes.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;" />`
+              }
+            });
+
+            if (result.choice) {
+              this.store.dispatch(privacyAgree({ loginRes }));
+            } else {
+              this.store.dispatch(privacyDisagree());
+              return;
+            }
+          }
+
+          if (!!loginRes.passwordExpired) {
+            const result = await this.dialogService.open<
+              ConfirmDialogComponent,
+              ConfirmDialogData,
+              ConfirmDialogResult
+            >(ConfirmDialogComponent, {
+              width: '100%',
+              height: '500px',
+              disableClose: true,
+              data: {
+                title: '패스워드 만료',
+                message: ''
+              }
+            });
+
+            if (result.choice) {
+            } else {
+              return;
+            }
+          }
+        })
+      ),
+    { dispatch: false }
+  );
+
+  privacyAgree$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(privacyAgree),
+      map(action => {
+        const loginInfo = this.sessionStorageService.get<LoginInfo>(
+          KEY_LOGIN_INFO
+        );
+        const environmentsInfo = this.sessionStorageService.get<
+          EnvironmentsInfo
+        >(KEY_ENVIRONMENTS_INFO);
+
+        return {
+          loginInfo,
+          environmentsInfo,
+          loginResponse: action.loginRes
+        };
+      }),
+      exhaustMap(params =>
+        this.piService
+          .userTermsAction({
+            userSeq: params.loginResponse.userSeq,
+            token: params.loginResponse.tokenString,
+            deviceType: params.environmentsInfo.deviceType
+          })
+          .pipe(
+            map((res: UserTermsActionResponse) => {
+              if ('00' !== res.responseCode) {
+                return privacyAgreeFailure({ error: 'Failed' });
+              } else {
+                return privacyAgreeSuccess();
+              }
+            }),
+            catchError(error => of(privacyAgreeFailure({ error })))
+          )
+      )
+    )
+  );
+
+  changePassword$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(changePassword),
+      map(action => action.req),
+      exhaustMap(req =>
+        this.serviceProtocolService.userPasswordSet(req).pipe(
+          map((res: UserPasswordSetResponse) => {
+            return changePasswordSuccess({
+              res
+            });
+          }),
+          catchError(error => of(changePasswordFailure({ error })))
+        )
+      )
+    )
+  );
+
   constructor(
     private actions$: Actions,
     private router: Router,
+    private store: Store<any>,
+    private sessionStorageService: SessionStorageService,
     private piService: PiService,
     private appAuthenticationService: AppAuthenticationService,
+    private serviceProtocolService: ServiceProtocolService,
     private dialogService: DialogService,
     @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
     private logger: NGXLogger
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts
index c67608e3..31016fc3 100644
--- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/reducers.ts
@@ -7,7 +7,7 @@ export const reducer = createReducer(
   on(loginSuccess, (state, action) => {
     return {
       ...state,
-      loginInfo: action.loginInfo
+      loginRes: action.loginRes
     };
   })
 );
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/state.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/state.ts
index 579cad2a..95b51728 100644
--- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/state.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/state.ts
@@ -3,18 +3,18 @@ import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
 
 // tslint:disable-next-line: no-empty-interface
 export interface State {
-  loginInfo: LoginResponse | null;
+  loginRes: LoginResponse | null;
 }
 
 export const initialState: State = {
-  loginInfo: null
+  loginRes: null
 };
 
 export function selectors<S>(selector: Selector<any, State>) {
   return {
-    loginInfo: createSelector(
+    loginRes: createSelector(
       selector,
-      (state: State) => state.loginInfo
+      (state: State) => state.loginRes
     )
   };
 }
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/index.ts b/projects/ucap-webmessenger-app/src/app/store/account/index.ts
index bc8bc382..13adc103 100644
--- a/projects/ucap-webmessenger-app/src/app/store/account/index.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/account/index.ts
@@ -2,22 +2,16 @@ 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,
-  PrivacyStore.Effects
-];
+export const effects: Type<any>[] = [AuthenticationStore.Effects];
 
 export function reducers(state: State | undefined, action: Action) {
   return combineReducers({
-    authentication: AuthenticationStore.reducer,
-    privacy: PrivacyStore.reducer
+    authentication: AuthenticationStore.reducer
   })(state, action);
 }
 
@@ -28,12 +22,6 @@ export function selectors<S>(selector: Selector<any, State>) {
         selector,
         (state: State) => state.authentication
       )
-    ),
-    PrivacySelector: PrivacyStore.selectors(
-      createSelector(
-        selector,
-        (state: State) => state.privacy
-      )
     )
   };
 }
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/privacy/actions.ts b/projects/ucap-webmessenger-app/src/app/store/account/privacy/actions.ts
deleted file mode 100644
index b31794d6..00000000
--- a/projects/ucap-webmessenger-app/src/app/store/account/privacy/actions.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-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 }>()
-);
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/privacy/effects.ts b/projects/ucap-webmessenger-app/src/app/store/account/privacy/effects.ts
deleted file mode 100644
index 1515b66b..00000000
--- a/projects/ucap-webmessenger-app/src/app/store/account/privacy/effects.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-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,
-  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
-  //       );
-  //       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: 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;" />`
-  //         }
-  //       });
-
-  //       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
-        );
-        const environmentsInfo = this.sessionStorageService.get<
-          EnvironmentsInfo
-        >(KEY_ENVIRONMENTS_INFO);
-
-        return {
-          loginInfo,
-          environmentsInfo,
-          loginResponse: action.loginInfo
-        };
-      }),
-      exhaustMap(params =>
-        this.piService
-          .userTermsAction({
-            userSeq: params.loginResponse.userSeq,
-            token: params.loginResponse.tokenString,
-            deviceType: params.environmentsInfo.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
-  ) {}
-}
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/privacy/index.ts b/projects/ucap-webmessenger-app/src/app/store/account/privacy/index.ts
deleted file mode 100644
index 2663cade..00000000
--- a/projects/ucap-webmessenger-app/src/app/store/account/privacy/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './effects';
-export * from './reducers';
-export * from './state';
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/privacy/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/account/privacy/reducers.ts
deleted file mode 100644
index b6a32d37..00000000
--- a/projects/ucap-webmessenger-app/src/app/store/account/privacy/reducers.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Action, combineReducers, createReducer, on } from '@ngrx/store';
-import { State, initialState } from './state';
-
-export const reducer = createReducer(initialState);
diff --git a/projects/ucap-webmessenger-app/src/app/store/account/privacy/state.ts b/projects/ucap-webmessenger-app/src/app/store/account/privacy/state.ts
deleted file mode 100644
index e83560d9..00000000
--- a/projects/ucap-webmessenger-app/src/app/store/account/privacy/state.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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 {};
-}
diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/actions.ts b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/actions.ts
index fe0b17fd..c8d1f5aa 100644
--- a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/actions.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/actions.ts
@@ -5,17 +5,17 @@ import {
   VersionInfo2Response
 } from '@ucap-webmessenger/api-public';
 
-export const fetch = createAction(
-  '[Setting::VersionInfo] Fetch',
+export const versionInfo2 = createAction(
+  '[Setting::VersionInfo] VersionInfo2',
   props<VersionInfo2Request>()
 );
 
-export const fetchSuccess = createAction(
-  '[Setting::VersionInfo] Fetch Success',
-  props<VersionInfo2Response>()
+export const versionInfo2Success = createAction(
+  '[Setting::VersionInfo] VersionInfo2 Success',
+  props<{ res: VersionInfo2Response }>()
 );
 
-export const fetchFailure = createAction(
-  '[Setting::VersionInfo] Fetch Failure',
+export const versionInfo2Failure = createAction(
+  '[Setting::VersionInfo] VersionInfo2 Failure',
   props<{ error: any }>()
 );
diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/effects.ts b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/effects.ts
index 8c374d60..465a4042 100644
--- a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/effects.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/effects.ts
@@ -12,39 +12,33 @@ import { SessionStorageService } from '@ucap-webmessenger/web-storage';
 
 import { NGXLogger } from 'ngx-logger';
 
-import { fetch, fetchSuccess, fetchFailure } from './actions';
+import {
+  versionInfo2,
+  versionInfo2Success,
+  versionInfo2Failure
+} from './actions';
 
 @Injectable()
 export class Effects {
-  fetch$ = createEffect(() =>
+  versionInfo2$ = createEffect(() =>
     this.actions$.pipe(
-      ofType(fetch),
+      ofType(versionInfo2),
       map(action => action),
       exhaustMap(req =>
         this.publicApiService.versionInfo2(req).pipe(
           map(res => {
             if (res.statusCode === StatusCode.Success) {
-              this.logger.debug('fetchSuccess', res);
-              return fetchSuccess(res);
+              return versionInfo2Success({ res });
             } else {
-              return fetchFailure({ error: 'Failed' });
+              return versionInfo2Failure({ error: 'Failed' });
             }
           }),
-          catchError(error => of(fetchFailure({ error })))
+          catchError(error => of(versionInfo2Failure({ error })))
         )
       )
     )
   );
 
-  fetchSuccess$ = createEffect(
-    () =>
-      this.actions$.pipe(
-        ofType(fetchSuccess),
-        tap(params => {})
-      ),
-    { dispatch: false }
-  );
-
   constructor(
     private actions$: Actions,
     private publicApiService: PublicApiService,
diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/reducers.ts
index a89a373d..b924cee4 100644
--- a/projects/ucap-webmessenger-app/src/app/store/setting/version-info/reducers.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/setting/version-info/reducers.ts
@@ -1,23 +1,23 @@
 import { createReducer, on } from '@ngrx/store';
 import { initialState } from './state';
-import { fetchSuccess } from './actions';
+import { versionInfo2Success } from './actions';
 
 export const reducer = createReducer(
   initialState,
-  on(fetchSuccess, (state, action) => {
+  on(versionInfo2Success, (state, action) => {
     return {
       ...state,
-      profileImageRoot: action.profileRoot,
-      profileImageUploadUrl: action.profileUploadUrl,
+      profileImageRoot: action.res.profileRoot,
+      profileImageUploadUrl: action.res.profileUploadUrl,
       fileUploadMaxSize:
-        !!action.fileAllowSize &&
-        !isNaN(action.fileAllowSize) &&
-        0 < action.fileAllowSize
-          ? action.fileAllowSize
+        !!action.res.fileAllowSize &&
+        !isNaN(action.res.fileAllowSize) &&
+        0 < action.res.fileAllowSize
+          ? action.res.fileAllowSize
           : 0,
-      fileUploadUrl: action.uploadUrl,
-      fileDownloadUrl: action.downloadUrl,
-      serverIp: action.serverIp
+      fileUploadUrl: action.res.uploadUrl,
+      fileDownloadUrl: action.res.downloadUrl,
+      serverIp: action.res.serverIp
     };
   })
 );
diff --git a/projects/ucap-webmessenger-protocol-service/src/public-api.ts b/projects/ucap-webmessenger-protocol-service/src/public-api.ts
index 94d85a36..45a1791d 100644
--- a/projects/ucap-webmessenger-protocol-service/src/public-api.ts
+++ b/projects/ucap-webmessenger-protocol-service/src/public-api.ts
@@ -2,6 +2,10 @@
  * Public API Surface of ucap-webmessenger-protocol-service
  */
 
+export * from './lib/models/password-set';
+
 export * from './lib/services/service-protocol.service';
 
+export * from './lib/types/service';
+
 export * from './lib/ucap-service-protocol.module';