로그인시 로컬 IP, MAC 정보 송신하도록 수정 :: 세션 로그아웃시 해당 정보 내려주기로 함. [재업로드]

electron-projects/ucap-webmessenger-electron/src/index.ts

@@ -10,6 +10,7 @@ import {
 import path from 'path';
 import fse from 'fs-extra';
 import semver from 'semver';
+import os from 'os';
 
 import AutoLaunch from 'auto-launch';
 
@@ -358,6 +359,27 @@ ipcMain.on(UpdaterChannel.Check, (event: IpcMainEvent, ...args: any[]) => {
   }
 });
 
+ipcMain.on(
+  MessengerChannel.GetNetworkInfo,
+  (event: IpcMainEvent, ...args: any[]) => {
+    const interfaces = os.networkInterfaces();
+    const addresses: { ip: string; mac: string }[] = [];
+
+    // tslint:disable-next-line: forin
+    for (const k in interfaces) {
+      // tslint:disable-next-line: forin
+      for (const k2 in interfaces[k]) {
+        const address = interfaces[k][k2];
+        if (address.family === 'IPv4' && !address.internal) {
+          addresses.push({ ip: address.address, mac: address.mac });
+        }
+      }
+    }
+
+    event.returnValue = addresses;
+  }
+);
+
 ipcMain.on(
   MessengerChannel.ChangeAutoLaunch,
   (event: IpcMainEvent, ...args: any[]) => {

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 import {
   Resolve,
   ActivatedRouteSnapshot,
@@ -60,12 +60,13 @@ import {
   UrlInfoResponse,
   DaesangUrlInfoResponse
 } from '@ucap-webmessenger/api-external';
-import { DeviceType } from '@ucap-webmessenger/core';
 import { StatusCode } from '@ucap-webmessenger/api';
+import { UCAP_NATIVE_SERVICE, NativeService } from '@ucap-webmessenger/native';
 
 @Injectable()
 export class AppMessengerResolver implements Resolve<void> {
   constructor(
+    @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
     private store: Store<any>,
     private sessionStorageService: SessionStorageService,
     private publicApiService: PublicApiService,
@@ -84,7 +85,7 @@ export class AppMessengerResolver implements Resolve<void> {
     activatedRouteSnapshot: ActivatedRouteSnapshot,
     routerStateSnapshot: RouterStateSnapshot
   ): void | Observable<void> | Promise<void> {
-    return new Promise<void>((resolve, reject) => {
+    return new Promise<void>(async (resolve, reject) => {
       let loginRes: LoginResponse;
 
       const loginInfo = this.sessionStorageService.get<LoginInfo>(
@@ -94,6 +95,24 @@ export class AppMessengerResolver implements Resolve<void> {
         KEY_ENVIRONMENTS_INFO
       );
 
+      let localIp = '';
+      let localMac = '';
+
+      // get network info
+      await this.nativeService
+        .getNetworkInfo()
+        .then(result => {
+          if (!!result && result.length > 0) {
+            if (!!result[0].ip) {
+              localIp = result[0].ip;
+            }
+            if (!!result[0].mac) {
+              localMac = result[0].mac;
+            }
+          }
+        })
+        .catch(reason => {});
+
       this.publicApiService
         .versionInfo2({
           deviceType: environmentsInfo.deviceType,
@@ -146,12 +165,12 @@ export class AppMessengerResolver implements Resolve<void> {
                 passwordEncodingType: 1,
                 clientVersion: '',
                 reconnect: false,
-                ip: 'localhost',
+                ip: localIp,
-                hostName: '',
+                hostName: localMac,
                 ssoMode: SSOMode.AUTH,
                 userSpecificInformation: 'PRO_000482',
-                productId: environment.productConfig.productId,
+                andId: '',
-                productName: environment.productConfig.productName
+                andPushRefreshYn: ''
               })
               .pipe(
                 catchError(err => {

projects/ucap-webmessenger-native-browser/src/lib/services/browser-native.service.ts

@@ -72,6 +72,12 @@ export class BrowserNativeService extends NativeService {
     });
   }
 
+  getNetworkInfo(): Promise<any> {
+    return new Promise<any>((resolve, reject) => {
+      resolve(null);
+    });
+  }
+
   changeAutoLaunch(autoLaunch: boolean): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
       resolve(true);

projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts

@@ -78,6 +78,16 @@ export class ElectronNativeService implements NativeService {
     return this.logout$;
   }
 
+  getNetworkInfo(): Promise<any> {
+    return new Promise<string>((resolve, reject) => {
+      try {
+        resolve(this.ipcRenderer.sendSync(MessengerChannel.GetNetworkInfo));
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
   changeStatus(): Observable<StatusCode> {
     if (!this.changeStatusSubject) {
       this.changeStatusSubject = new Subject<StatusCode>();

projects/ucap-webmessenger-native-electron/src/lib/types/channel.type.ts

@@ -3,7 +3,8 @@ export enum MessengerChannel {
   ChangeStatus = 'UCAP::messenger::changeStatus',
   ShowSetting = 'UCAP::messenger::showSetting',
   ChangeAutoLaunch = 'UCAP::messenger::changeAutoLaunch',
-  ChangeStartupHideWindow = 'UCAP::messenger::changeStartupHideWindow'
+  ChangeStartupHideWindow = 'UCAP::messenger::changeStartupHideWindow',
+  GetNetworkInfo = 'UCAP::messenger::getNetworkInfo'
 }
 
 export enum ChatChannel {

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

@@ -24,6 +24,8 @@ export abstract class NativeService {
   abstract changeStatus(): Observable<StatusCode>;
   abstract showSetting(): Observable<void>;
 
+  abstract getNetworkInfo(): Promise<any>;
+
   abstract changeAutoLaunch(autoLaunch: boolean): Promise<boolean>;
   abstract changeStartupHideWindow(
     startupHideWindow: boolean

projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts

@@ -46,14 +46,10 @@ export interface LoginRequest extends ProtocolRequest {
   ssoMode: SSOMode;
   // 14. 사용자고유정보(s)
   userSpecificInformation: string;
-  // 15. 제품 ID(s)
+  // 15. 안드로이드 ID(s)
-  productId: string;
+  andId: string;
-  // 16. 제품명(s)
+  // 16. push_ID 갱신여부(s)
-  productName: string;
+  andPushRefreshYn: string;
-  // 17. EncData(s)
-  encriptionData?: string;
-  // 18. AccessToken(s)
-  accessToken?: string;
 }
 
 export interface LoginResponse extends ProtocolResponse {
@@ -135,25 +131,20 @@ export const encodeLogin: ProtocolEncoder<LoginRequest> = (
     { type: PacketBodyValue.String, value: req.deviceId },
     { type: PacketBodyValue.String, value: req.token },
     { type: PacketBodyValue.String, value: req.localeCode },
-    { type: PacketBodyValue.String, value: req.pushId },
+    { type: PacketBodyValue.String, value: req.pushId }, // 6
+
     { type: PacketBodyValue.String, value: req.companyCode },
     { type: PacketBodyValue.Integer, value: req.passwordEncodingType },
     { type: PacketBodyValue.String, value: req.clientVersion },
     { type: PacketBodyValue.String, value: req.reconnect ? 'Y' : 'N' },
     { type: PacketBodyValue.String, value: req.ip },
     { type: PacketBodyValue.String, value: req.hostName },
-    { type: PacketBodyValue.Integer, value: req.encriptionData ? 2 : 1 },
+    { type: PacketBodyValue.String, value: '' }, // 13
-    { type: PacketBodyValue.String, value: req.userSpecificInformation },
-    { type: PacketBodyValue.String, value: req.productId },
-    { type: PacketBodyValue.String, value: req.productName }
-  );
 
-  if (req.encriptionData) {
+    { type: PacketBodyValue.String, value: req.userSpecificInformation },
-    bodyList.push(
+    { type: PacketBodyValue.String, value: req.andId },
-      { type: PacketBodyValue.String, value: req.encriptionData },
+    { type: PacketBodyValue.String, value: req.andPushRefreshYn }
-      { type: PacketBodyValue.String, value: req.accessToken }
   );
-  }
 
   return bodyList;
 };