자동로그인 수정 / 로그아웃 수정.

projects/ucap-webmessenger-app/src/app/guards/auto-login.guard.ts

@@ -9,7 +9,10 @@ import {
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-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 * as AuthenticationStore from '@app/store/account/authentication';
@@ -21,7 +24,8 @@ export class AppAutoLoginGuard implements CanActivate {
   constructor(
     private router: Router,
     private store: Store<any>,
-    private localStorageService: LocalStorageService
+    private localStorageService: LocalStorageService,
+    private sessionStorageService: SessionStorageService
   ) {}
 
   canActivate(
@@ -38,7 +42,11 @@ export class AppAutoLoginGuard implements CanActivate {
         environment.customConfig.appKey
       );
 
-      if (!!appUserInfo && appUserInfo.autoLogin) {
+      const personLogout: boolean = this.sessionStorageService.get(
+        'PERSON_LOGOUT'
+      );
+
+      if (!!appUserInfo && appUserInfo.autoLogin && !personLogout) {
         this.store.dispatch(
           AuthenticationStore.webLogin({
             loginInfo: {

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html

@@ -150,7 +150,7 @@
 
   <ucap-profile-my-profile-widget
     [profileImageRoot]="sessionVerinfo.profileRoot"
-    [profileImageFile]="loginRes.userInfo.profileImageFile"
+    [profileImageFile]="getMyProfileImageWidget()"
     (click)="onClickOpenProfile(loginRes.userInfo)"
     class="myprofile"
   ></ucap-profile-my-profile-widget>

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts

@@ -437,4 +437,12 @@ export class LeftSideComponent implements OnInit, OnDestroy {
       )
       .subscribe();
   }
+
+  getMyProfileImageWidget(): string {
+    if (!!this.loginRes) {
+      return this.loginRes.userInfo.profileImageFile;
+    } else {
+      return '';
+    }
+  }
 }

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

@@ -74,7 +74,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
 
     this.store.dispatch(
       CompanyStore.companyList({
-        companyGroupCode: 'LG'
+        companyGroupCode: environment.companyConfig.companyGroupCode
       })
     );
 

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

@@ -9,7 +9,8 @@ import {
   LoginInfo,
   KEY_LOGIN_INFO,
   KEY_LOGIN_RES_INFO,
-  KEY_VER_INFO
+  KEY_VER_INFO,
+  KEY_URL_INFO
 } from '../types';
 import { PasswordUtil } from '@ucap-webmessenger/pi';
 import { DaesangCipherService } from '@ucap-webmessenger/daesang';
@@ -64,6 +65,9 @@ export class AppAuthenticationService {
     if (rememberMe || autoLogin) {
       appUserInfo = {
         ...appUserInfo,
+        companyGroupType: loginInfo.companyGroupType,
+        companyCode: loginInfo.companyCode,
+        loginId: loginInfo.loginId,
         loginPw: autoLogin ? loginInfo.loginPw : undefined,
         rememberMe,
         autoLogin
@@ -75,11 +79,16 @@ export class AppAuthenticationService {
       appUserInfo,
       environment.customConfig.appKey
     );
+
+    this.sessionStorageService.remove('PERSON_LOGOUT');
   }
 
   logout() {
     this.sessionStorageService.remove(KEY_LOGIN_RES_INFO);
     this.sessionStorageService.remove(KEY_VER_INFO);
     this.sessionStorageService.remove(KEY_LOGIN_INFO);
+    this.sessionStorageService.remove(KEY_URL_INFO);
+
+    this.sessionStorageService.set<boolean>('PERSON_LOGOUT', true);
   }
 }