ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update is modified

Browse Source
This commit is contained in:
richard-loafle 2020-01-23 14:15:08 +09:00
parent 91fcf7f2e5
commit 49ffe6b3d8
8 changed files with 19 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron-builder.json
View File

@ -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",

14
electron-projects/ucap-webmessenger-electron/src/index.ts
View File

@ -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 => {
if (!result) {
event.returnValue = false;
} else {
event.returnValue = true;
}
})
.then(result => {})
.catch(reason => {
event.returnValue = false;
log.error(reason);
});
} else {
event.returnValue = false;
}
});

2
package.json
View File

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

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

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

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

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

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

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

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

@ -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',

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

@ -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>;