openfin-adapter
Advanced tools
Comparing version 19.56.12 to 19.56.13
22
fin.d.ts
@@ -69,2 +69,24 @@ declare namespace OpenFin { | ||
} | ||
export interface Certificate { | ||
data: string; | ||
fingerprint: string; | ||
issuer: CertificatePrincipal; | ||
issuerCert: Certificate; | ||
issuerName: string; | ||
serialNumber: string; | ||
subject: CertificatePrincipal; | ||
subjectName: string; | ||
validExpiry: number; | ||
validStart: number; | ||
} | ||
interface CertificatePrincipal { | ||
commonName: string; | ||
country: string; | ||
locality: string; | ||
organizations: string[]; | ||
organizationUnits: string[]; | ||
state: string; | ||
} | ||
} | ||
@@ -71,0 +93,0 @@ |
{ | ||
"name": "openfin-adapter", | ||
"version": "19.56.12", | ||
"version": "19.56.13", | ||
"license": "Apache-2.0", | ||
@@ -5,0 +5,0 @@ "main": "./src/main.js", |
@@ -26,7 +26,7 @@ import { BaseEventMap, WindowEvent } from './base'; | ||
url: string; | ||
certificate: any; | ||
certificate: OpenFin.Certificate; | ||
} | ||
export interface CertificateSelectionShownEvent<Topic, Type> extends WindowEvent<Topic, Type> { | ||
url: string; | ||
certificates: Array<Electron.Certificate>; | ||
certificates: OpenFin.Certificate[]; | ||
} | ||
@@ -33,0 +33,0 @@ export interface WebContentsEventMapping<Topic = string, Type = string> extends BaseEventMap { |
@@ -164,5 +164,7 @@ "use strict"; | ||
} | ||
// eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
const { layout, ...otherDefaultWindowOptions } = defaultWindowOptions; | ||
return { | ||
name, | ||
...defaultWindowOptions, | ||
...otherDefaultWindowOptions, | ||
...givenOptions, | ||
@@ -174,6 +176,11 @@ preloadScripts, | ||
async function convertLayoutOptions(initialLayout) { | ||
var _a, _b; | ||
const modifiedLayout = { ...initialLayout }; | ||
const defaultWindowOptions = initialAppOptions.defaultWindowOptions || {}; | ||
const defaultLayoutSettings = ((_a = defaultWindowOptions.layout) === null || _a === void 0 ? void 0 : _a.settings) || {}; | ||
const defaultLayoutDimensions = ((_b = defaultWindowOptions.layout) === null || _b === void 0 ? void 0 : _b.dimensions) || {}; | ||
// NOTE: Setting mimimum dimensions for itemwidth and itemheight can result in golden-layout drag area bugs | ||
modifiedLayout.settings = { | ||
...INTERNAL_DEFAULT_SETTINGS_OPTIONS, | ||
...defaultLayoutSettings, | ||
...initialLayout.settings, | ||
@@ -184,2 +191,3 @@ ...MANDATORY_SETTINGS_OPTIONS | ||
...INTERNAL_DEFAULT_DIMENSIONS, | ||
...defaultLayoutDimensions, | ||
...initialLayout.dimensions | ||
@@ -186,0 +194,0 @@ }; |
3992687
18277