SDA-4181 Check beta auto-update channel from ACP

finos · Jul 10, 2023 · 4f40f34 · 4f40f34
1 parent 61805ae
commit 4f40f34
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/config/Symphony.config b/config/Symphony.config
@@ -42,5 +42,6 @@
     },
     "autoLaunchPath": "",
     "userDataPath": "",
-    "chromeFlags": ""
+    "chromeFlags": "",
+    "betaAutoUpdateChannelEnabled": true
 }
diff --git a/src/app/auto-update-handler.ts b/src/app/auto-update-handler.ts
@@ -222,11 +222,21 @@ export class AutoUpdate {
   };
 
   private getGenericServerOptions = (): GenericServerOptions => {
-    const { autoUpdateChannel } = config.getConfigFields(['autoUpdateChannel']);
+    let userAutoUpdateChannel;
+    const { autoUpdateChannel, betaAutoUpdateChannelEnabled } =
+      config.getConfigFields([
+        'autoUpdateChannel',
+        'betaAutoUpdateChannelEnabled',
+      ]);
+    userAutoUpdateChannel = betaAutoUpdateChannelEnabled
+      ? 'beta'
+      : autoUpdateChannel;
+    logger.info(`auto-update-handler: using channel ${userAutoUpdateChannel}`);
+
     const opts: GenericServerOptions = {
       provider: 'generic',
       url: this.getUpdateUrl(),
-      channel: autoUpdateChannel || null,
+      channel: userAutoUpdateChannel || null,
     };
     return opts;
   };

diff --git a/src/app/config-handler.ts b/src/app/config-handler.ts
@@ -60,6 +60,7 @@ export interface IConfig {
   startedAfterAutoUpdate?: boolean;
   enableBrowserLogin?: boolean;
   browserLoginAutoConnect?: boolean;
+  betaAutoUpdateChannelEnabled?: boolean;
 }
 
 export interface IGlobalConfig {
@@ -99,6 +100,7 @@ export interface IPodLevelEntitlements {
 }
 
 export interface IACPFeatureLevelEntitlements {
+  betaAutoUpdateChannelEnabled: boolean;
   devToolsEnabled: boolean;
   permissions: IPermission;
 }
@@ -449,6 +451,8 @@ class Config {
       autoLaunchPath: latestGlobalConfig.autoLaunchPath,
       userDataPath: latestGlobalConfig.userDataPath,
       customFlags: latestGlobalConfig.customFlags,
+      betaAutoUpdateChannelEnabled:
+        latestGlobalConfig.betaAutoUpdateChannelEnabled,
     });
   }