Skip to content

Commit 976d18b

Browse files
authored
Merge pull request #141 from Accedia/develop
Develop
2 parents a3bc62e + 6d91f76 commit 976d18b

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

electron-app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

electron-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "fit-mitchell-rpa",
33
"appname": "REV Import Technology",
44
"productName": "REV Import Technology",
5-
"version": "1.5.83",
5+
"version": "1.5.84",
66
"homepage": "./",
77
"main": "./dist/main.js",
88
"description": "Automation for CCC by FIT",

electron-app/src/utils/get_custom_protocol_url.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import { CUSTOM_PROTOCOL } from '../constants/config';
22

33
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
44
export const getCustomProtocolUrl = (argv: any): string => {
5+
console.log('in get cumstom protocol');
56
const customProtocolPrefix = `${CUSTOM_PROTOCOL}://https//`;
67
let url = argv.find((arg: any) => arg.startsWith(customProtocolPrefix));
8+
console.log('url line 8 get custom protocol', url);
79
if (url) {
810
url = url.replace(customProtocolPrefix, 'https://');
911
}

electron-app/src/utils/window_manager.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,27 @@ class WindowManager {
6363
};
6464

6565
public startLoading = (): void => {
66+
console.log("starting loading");
6667
this.loadingWindow = new BrowserWindow(WINDOW_CONFIG.loading);
6768
this.loadLoadingWindowContent();
6869
this.loadingWindow.once('show', async () => {
70+
log.info('loading has started this is on show');
6971
const storedUrl = store.get('url') as string | null;
72+
log.info('storedUrl at line 70,', storedUrl);
73+
74+
7075
const newStoredUrl = storedUrl.replace('https//', 'https://');
76+
log.info('new',newStoredUrl);
7177
const url = storedUrl ? newStoredUrl : getCustomProtocolUrl(process.argv);
78+
log.info('The url at line 71 in the startLoading', url);
79+
7280
if (url) {
7381
const sessionId = extractSessionIdFromUrl(url);
7482
FirebaseService.useCurrentSession.set(sessionId);
7583
}
7684

7785
if (!isAppDev(app) && !isDev()) {
86+
console.log('here in auto updater');
7887
const autoUpdater = new AutoUpdater(this.loadingWindow);
7988
await autoUpdater.checkAndDownloadUpdates(url);
8089
}

0 commit comments

Comments
 (0)