Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

electron-builder.json

@@ -51,7 +51,7 @@
     "target": ["nsis-web"],
     "icon": "./config/build/win/icon/daesang/16x16.ico",
     "legalTrademarks": "(c) 2015 lgucap.com",
-    "publisherName": "LGCNS",
+    "publisherName": "LG CNS Co.,Ltd",
     "signingHashAlgorithms": ["sha1"],
     "certificateFile": "./config/sign/www.lgcns.com.pfx",
     "certificatePassword": "it15itsm",

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

@@ -350,7 +350,7 @@ function onDidLoad(fn: OnDidLoadFn) {
   }
 }
 
-ipcMain.on(UpdaterChannel.Check, (event: IpcMainEvent, ...args: any[]) => {
+ipcMain.on(UpdaterChannel.Apply, (event: IpcMainEvent, ...args: any[]) => {
   // if (__DEV__) {
   //   event.returnValue = false;
   //   return;
@@ -365,18 +365,10 @@ ipcMain.on(UpdaterChannel.Check, (event: IpcMainEvent, ...args: any[]) => {
     };
     autoUpdater
       .checkForUpdatesAndNotify()
-      .then(result => {
+      .then(result => {})
-        if (!result) {
-          event.returnValue = false;
-        } else {
-          event.returnValue = true;
-        }
-      })
       .catch(reason => {
-        event.returnValue = false;
+        log.error(reason);
       });
-  } else {
-    event.returnValue = false;
   }
 });
 
@@ -750,7 +742,10 @@ autoUpdater.on('update-downloaded', info => {
   log.info('Update downloaded');
 
   updateWindowService.setDownloadComplete();
-  autoUpdater.quitAndInstall(true, true);
+
+  setTimeout(() => {
+    autoUpdater.quitAndInstall(true, true);
+  }, 2000);
 });
 
 function appExit() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucap-webmessenger",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "author": {
     "name": "LG CNS",
     "email": "lgucap@lgcns.com"

projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts

@@ -553,10 +553,6 @@ export class TopBarComponent implements OnInit, OnDestroy {
   }
 
   onClickApplyUpdate(event: Event) {
-    this.nativeService
+    this.nativeService.checkForUpdates(this.checkingUpdateAppVersion);
-      .checkForUpdates(this.checkingUpdateAppVersion)
-      .then(e => {
-        this.logger.debug('onClickApplyUpdate');
-      });
   }
 }

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

@@ -128,30 +128,15 @@ export class Effects {
     () =>
       this.actions$.pipe(
         ofType(webLoginSuccess),
-        switchMap(
+        tap(params => {
-          params =>
+          this.nativeService.checkForUpdates(params.login2Response.version);
-            new Observable<void>(subscriber => {
+          this.appAuthenticationService.login(
-              this.nativeService
+            params.loginInfo,
-                .checkForUpdates(params.login2Response.version)
+            params.rememberMe,
-                .then((update: boolean) => {
+            params.autoLogin
-                  if (!update) {
+          );
-                    this.appAuthenticationService.login(
+          this.router.navigate(['/messenger']);
-                      params.loginInfo,
+        })
-                      params.rememberMe,
-                      params.autoLogin
-                    );
-                    this.router.navigate(['/messenger']);
-                  }
-                  subscriber.next();
-                })
-                .catch(reason => {
-                  subscriber.error(reason);
-                })
-                .finally(() => {
-                  subscriber.complete();
-                });
-            })
-        )
       ),
     { dispatch: false }
   );

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

@@ -114,11 +114,7 @@ export class BrowserNativeService extends NativeService {
   }
   closeAllNotify(): void {}
 
-  checkForUpdates(currentVersion: string): Promise<boolean> {
+  checkForUpdates(currentVersion: string): void {}
-    return new Promise<boolean>((resolve, reject) => {
-      resolve(false);
-    });
-  }
 
   checkForInstantUpdates(config: UpdateCheckConfig): Observable<UpdateInfo> {
     return new Observable<UpdateInfo>(subscriber => {

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

@@ -183,16 +183,8 @@ export class ElectronNativeService implements NativeService {
     this.ipcRenderer.send(NotificationChannel.CloseAllNotify);
   }
 
-  checkForUpdates(currentVersion: string): Promise<boolean> {
+  checkForUpdates(currentVersion: string): void {
-    return new Promise<boolean>((resolve, reject) => {
+    this.ipcRenderer.send(UpdaterChannel.Apply, currentVersion);
-      try {
-        resolve(
-          this.ipcRenderer.sendSync(UpdaterChannel.Check, currentVersion)
-        );
-      } catch (error) {
-        reject(error);
-      }
-    });
   }
 
   checkForInstantUpdates(config: UpdateCheckConfig): Observable<UpdateInfo> {

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

@@ -23,7 +23,7 @@ export enum NotificationChannel {
 }
 
 export enum UpdaterChannel {
-  Check = 'UCAP::updater::check',
+  Apply = 'UCAP::updater::apply',
   StartCheckInstant = 'UCAP::updater::startCheckInstant',
   ExistInstant = 'UCAP::updater::existInstant',
   ApplyInstant = 'UCAP::updater::applyInstant',

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

@@ -36,7 +36,7 @@ export abstract class NativeService {
   abstract notify(noti: NotificationRequest): void;
   abstract closeAllNotify(): void;
 
-  abstract checkForUpdates(currentVersion: string): Promise<boolean>;
+  abstract checkForUpdates(currentVersion: string): void;
   abstract checkForInstantUpdates(
     config: UpdateCheckConfig
   ): Observable<UpdateInfo>;