@todesktop/shared 7.184.15 → 7.184.16

package/lib/base.d.ts

@@ -141,10 +141,39 @@ export interface IAppMeta {
     };
     forceVersionNumber?: string;
 }
+export declare enum WindowsHSMCertType {
+    ev = "ev",
+    file = "file"
+}
+export interface CustomWindowsCodeSignFile {
+    certType: string;
+    hsmCertType: WindowsHSMCertType.file;
+    hsmCertName: string;
+    certPassword?: string;
+    certUrl?: URL;
+}
+export interface CustomWindowsCodeSignEV {
+    certType: "hsm";
+    hsmCertType: WindowsHSMCertType.ev;
+    hsmCertName: string;
+}
+export interface CustomMacCodeSign {
+    certName: string;
+    certPassword: string;
+    certUrl: string;
+}
 export interface BaseApp extends Schemable {
     id: string;
     appModelId?: string;
     customDomain?: string;
+    customMacCodeSign?: CustomMacCodeSign;
+    customNotarization?: {
+        appleId: string;
+        appleIdPassword: string;
+        ascProvider?: string;
+        teamId?: string;
+    };
+    customWindowsCodeSign?: CustomWindowsCodeSignFile | CustomWindowsCodeSignEV;
     meta?: IAppMeta;
     subscription?: {
         status: string;
@@ -168,4 +197,8 @@ export interface BaseApp extends Schemable {
     shouldCreateMacUniversalInstaller?: boolean;
     appxConfig?: Partial<IAppBuilderLib["config"]["appx"]>;
     nsisConfig?: Partial<IAppBuilderLib["config"]["nsis"]>;
+    snapStore?: {
+        login?: string;
+        description?: string;
+    };
 }

package/lib/base.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WindowsEVOnboardingProvider = exports.WindowsEVOnboardingSteps = void 0;
+exports.WindowsHSMCertType = exports.WindowsEVOnboardingProvider = exports.WindowsEVOnboardingSteps = void 0;
 var WindowsEVOnboardingSteps;
 (function (WindowsEVOnboardingSteps) {
     WindowsEVOnboardingSteps["hasChosenProvider"] = "hasChosenProvider";
@@ -14,3 +14,8 @@ var WindowsEVOnboardingProvider;
     WindowsEVOnboardingProvider["globalsign"] = "globalsign";
     WindowsEVOnboardingProvider["other"] = "other";
 })(WindowsEVOnboardingProvider = exports.WindowsEVOnboardingProvider || (exports.WindowsEVOnboardingProvider = {}));
+var WindowsHSMCertType;
+(function (WindowsHSMCertType) {
+    WindowsHSMCertType["ev"] = "ev";
+    WindowsHSMCertType["file"] = "file";
+})(WindowsHSMCertType = exports.WindowsHSMCertType || (exports.WindowsHSMCertType = {}));

package/lib/desktopify2.d.ts

@@ -403,6 +403,6 @@ export interface DesktopifyApp2 {
     shouldHaveFullAccessToElectronAPIs?: boolean;
 }
 export interface IApp2 extends BaseApp {
-    desktopApp?: DesktopifyApp2;
+    desktopApp: DesktopifyApp2;
 }
 export {};

package/lib/toDesktop.d.ts

@@ -1,5 +1,5 @@
 import { BaseApp, Schemable } from "./base";
-import { IAppBuilderLib, URL } from "./desktopify";
+import { IAppBuilderLib } from "./desktopify";
 export declare type IUploadFileStatus = "error" | "success" | "done" | "uploading" | "removed";
 export interface IUploadFile {
     uid: string;
@@ -77,33 +77,12 @@ export interface IIcon {
     height: number;
     type: string;
 }
-export interface CustomMacCodeSign {
-    certName: string;
-    certPassword: string;
-    certUrl: string;
-}
 export interface CustomNotarization {
     appleId: string;
     appleIdPassword: string;
     ascProvider?: string;
     teamId?: string;
 }
-export declare enum WindowsHSMCertType {
-    ev = "ev",
-    file = "file"
-}
-export interface CustomWindowsCodeSignFile {
-    certType: string;
-    hsmCertType: WindowsHSMCertType.file;
-    hsmCertName: string;
-    certPassword?: string;
-    certUrl?: URL;
-}
-export interface CustomWindowsCodeSignEV {
-    certType: "hsm";
-    hsmCertType: WindowsHSMCertType.ev;
-    hsmCertName: string;
-}
 export interface IApp extends BaseApp {
     appModelId: string;
     appPkgName?: string;
@@ -111,16 +90,8 @@ export interface IApp extends BaseApp {
     appType?: string;
     appxConfig?: Partial<IAppBuilderLib["config"]["appx"]>;
     cssToInject?: string;
-    customMacCodeSign?: CustomMacCodeSign;
     customDomain?: string;
-    customNotarization?: {
-        appleId: string;
-        appleIdPassword: string;
-        ascProvider?: string;
-        teamId?: string;
-    };
     customUserAgent?: ISwitchableValue<string>;
-    customWindowsCodeSign?: CustomWindowsCodeSignFile | CustomWindowsCodeSignEV;
     disableContextMenu?: boolean;
     environmentVariables?: {
         [propertyName: string]: string;
@@ -151,10 +122,6 @@ export interface IApp extends BaseApp {
     shouldLaunchAtStartupByDefault?: boolean;
     shouldOnlySendAbsolutelyNecessaryRequests?: boolean;
     shouldReuseRendererProcess?: boolean;
-    snapStore?: {
-        login?: string;
-        description?: string;
-    };
     themeSource?: "system" | "light" | "dark";
     themeSourceMac?: "system" | "light" | "dark";
     toggleVisibilityKeyboardShortcut?: ISwitchableValue<string>;
@@ -178,6 +145,7 @@ export interface IUser extends Schemable {
     accessToken?: string;
     isAdmin?: boolean;
     featureFlags?: FeatureFlags;
+    disableShouldCodeSign?: boolean;
 }
 export interface FeatureFlags {
     desktopAppPlugins: boolean;

package/lib/toDesktop.js

@@ -1,8 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WindowsHSMCertType = void 0;
-var WindowsHSMCertType;
-(function (WindowsHSMCertType) {
-    WindowsHSMCertType["ev"] = "ev";
-    WindowsHSMCertType["file"] = "file";
-})(WindowsHSMCertType = exports.WindowsHSMCertType || (exports.WindowsHSMCertType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todesktop/shared",
-  "version": "7.184.15",
+  "version": "7.184.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/src/base.ts

@@ -154,10 +154,45 @@ export interface IAppMeta {
   forceVersionNumber?: string;
 }
 
+export enum WindowsHSMCertType {
+  ev = "ev",
+  file = "file",
+}
+
+export interface CustomWindowsCodeSignFile {
+  certType: string;
+  hsmCertType: WindowsHSMCertType.file;
+  hsmCertName: string;
+  // following are still used in desktopify, but no longer used/saved from web app
+  certPassword?: string;
+  certUrl?: URL;
+}
+
+export interface CustomWindowsCodeSignEV {
+  certType: "hsm";
+  hsmCertType: WindowsHSMCertType.ev;
+  hsmCertName: string;
+}
+
+export interface CustomMacCodeSign {
+  certName: string;
+  certPassword: string;
+  certUrl: string;
+}
+
 export interface BaseApp extends Schemable {
   id: string;
   appModelId?: string;
   customDomain?: string;
+  customMacCodeSign?: CustomMacCodeSign;
+  customNotarization?: {
+    appleId: string;
+    appleIdPassword: string;
+    ascProvider?: string;
+    teamId?: string;
+  };
+  customWindowsCodeSign?: CustomWindowsCodeSignFile | CustomWindowsCodeSignEV;
+
   meta?: IAppMeta;
   subscription?: {
     status: string;
@@ -185,4 +220,5 @@ export interface BaseApp extends Schemable {
   // artifact configs
   appxConfig?: Partial<IAppBuilderLib["config"]["appx"]>;
   nsisConfig?: Partial<IAppBuilderLib["config"]["nsis"]>;
+  snapStore?: { login?: string; description?: string };
 }

package/src/desktopify2.ts

@@ -531,6 +531,6 @@ export interface DesktopifyApp2 {
 }
 
 export interface IApp2 extends BaseApp {
-  // Old apps don't have the `desktopApp` property so let's not assume it exists
-  desktopApp?: DesktopifyApp2;
+  // Be careful when coercing to `IApp2` that we always check for `desktopApp` first
+  desktopApp: DesktopifyApp2;
 }

package/src/toDesktop.ts

@@ -93,12 +93,6 @@ export interface IIcon {
   type: string;
 }
 
-export interface CustomMacCodeSign {
-  certName: string;
-  certPassword: string;
-  certUrl: string;
-}
-
 export interface CustomNotarization {
   appleId: string;
   appleIdPassword: string;
@@ -106,26 +100,6 @@ export interface CustomNotarization {
   teamId?: string;
 }
 
-export enum WindowsHSMCertType {
-  ev = "ev",
-  file = "file",
-}
-
-export interface CustomWindowsCodeSignFile {
-  certType: string;
-  hsmCertType: WindowsHSMCertType.file;
-  hsmCertName: string;
-  // following are still used in desktopify, but no longer used/saved from web app
-  certPassword?: string;
-  certUrl?: URL;
-}
-
-export interface CustomWindowsCodeSignEV {
-  certType: "hsm";
-  hsmCertType: WindowsHSMCertType.ev;
-  hsmCertName: string;
-}
-
 export interface IApp extends BaseApp {
   appModelId: string;
   appPkgName?: string;
@@ -133,16 +107,8 @@ export interface IApp extends BaseApp {
   appType?: string;
   appxConfig?: Partial<IAppBuilderLib["config"]["appx"]>;
   cssToInject?: string;
-  customMacCodeSign?: CustomMacCodeSign;
   customDomain?: string;
-  customNotarization?: {
-    appleId: string;
-    appleIdPassword: string;
-    ascProvider?: string;
-    teamId?: string;
-  };
   customUserAgent?: ISwitchableValue<string>;
-  customWindowsCodeSign?: CustomWindowsCodeSignFile | CustomWindowsCodeSignEV;
   disableContextMenu?: boolean;
   environmentVariables?: { [propertyName: string]: string };
   icon?: string;
@@ -171,7 +137,6 @@ export interface IApp extends BaseApp {
   shouldLaunchAtStartupByDefault?: boolean;
   shouldOnlySendAbsolutelyNecessaryRequests?: boolean;
   shouldReuseRendererProcess?: boolean;
-  snapStore?: { login?: string; description?: string };
   themeSource?: "system" | "light" | "dark";
   themeSourceMac?: "system" | "light" | "dark";
   toggleVisibilityKeyboardShortcut?: ISwitchableValue<string>;
@@ -196,6 +161,7 @@ export interface IUser extends Schemable {
   accessToken?: string;
   isAdmin?: boolean;
   featureFlags?: FeatureFlags;
+  disableShouldCodeSign?: boolean;
 }
 
 export interface FeatureFlags {