From 8aa4e67cd1f4aeff11c6a1cc94713de7716a0759 Mon Sep 17 00:00:00 2001 From: sliezz Date: Sun, 5 Jan 2025 13:24:22 +0700 Subject: [PATCH 1/4] add allowNTLMCredentialsForDomains option to enterprise config file --- app/common/config-schemata.ts | 1 + app/main/index.ts | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/common/config-schemata.ts b/app/common/config-schemata.ts index e2db7b80f..b0b06bc75 100644 --- a/app/common/config-schemata.ts +++ b/app/common/config-schemata.ts @@ -41,4 +41,5 @@ export const configSchemata = { export const enterpriseConfigSchemata = { ...configSchemata, presetOrganizations: z.string().array(), + allowNTLMCredentialsForDomains: z.string().array(), }; diff --git a/app/main/index.ts b/app/main/index.ts index e04c59936..f495cc487 100644 --- a/app/main/index.ts +++ b/app/main/index.ts @@ -23,6 +23,8 @@ import * as t from "../common/translation-util.js"; import type {RendererMessage} from "../common/typed-ipc.js"; import type {MenuProperties} from "../common/types.js"; +import * as EnterpriseUtil from "../common/enterprise-util.js"; + import {appUpdater, shouldQuitForUpdate} from "./autoupdater.js"; import * as BadgeSettings from "./badge-settings.js"; import handleExternalLink from "./handle-external-link.js"; @@ -207,6 +209,11 @@ function createMainWindow(): BrowserWindow { const ses = session.fromPartition("persist:webviewsession"); ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`); + const allowNTLMCredentialsForDomains = EnterpriseUtil.getConfigItem("allowNTLMCredentialsForDomains", []); + for (const url of allowNTLMCredentialsForDomains) { + ses.allowNTLMCredentialsForDomains(url) + } + function configureSpellChecker() { const enable = ConfigUtil.getConfigItem("enableSpellchecker", true); if (enable && process.platform !== "darwin") { From 5ef214074942182f2145b40d98afecdd24fa5730 Mon Sep 17 00:00:00 2001 From: sliezz Date: Sun, 5 Jan 2025 17:03:58 +0700 Subject: [PATCH 2/4] prettier fix --- app/common/config-schemata.ts | 2 +- app/main/index.ts | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/common/config-schemata.ts b/app/common/config-schemata.ts index b0b06bc75..7b3ad8dcb 100644 --- a/app/common/config-schemata.ts +++ b/app/common/config-schemata.ts @@ -41,5 +41,5 @@ export const configSchemata = { export const enterpriseConfigSchemata = { ...configSchemata, presetOrganizations: z.string().array(), - allowNTLMCredentialsForDomains: z.string().array(), + allowNtlmCredentialsForDomains: z.string().array(), }; diff --git a/app/main/index.ts b/app/main/index.ts index f495cc487..950bbda49 100644 --- a/app/main/index.ts +++ b/app/main/index.ts @@ -18,13 +18,12 @@ import * as remoteMain from "@electron/remote/main"; import windowStateKeeper from "electron-window-state"; import * as ConfigUtil from "../common/config-util.js"; +import * as EnterpriseUtil from "../common/enterprise-util.js"; import {bundlePath, bundleUrl, publicPath} from "../common/paths.js"; import * as t from "../common/translation-util.js"; import type {RendererMessage} from "../common/typed-ipc.js"; import type {MenuProperties} from "../common/types.js"; -import * as EnterpriseUtil from "../common/enterprise-util.js"; - import {appUpdater, shouldQuitForUpdate} from "./autoupdater.js"; import * as BadgeSettings from "./badge-settings.js"; import handleExternalLink from "./handle-external-link.js"; @@ -209,9 +208,12 @@ function createMainWindow(): BrowserWindow { const ses = session.fromPartition("persist:webviewsession"); ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`); - const allowNTLMCredentialsForDomains = EnterpriseUtil.getConfigItem("allowNTLMCredentialsForDomains", []); - for (const url of allowNTLMCredentialsForDomains) { - ses.allowNTLMCredentialsForDomains(url) + const allowNtlmCredentialsForDomains = EnterpriseUtil.getConfigItem( + "allowNtlmCredentialsForDomains", + [] + ); + for (const domain of allowNtlmCredentialsForDomains) { + ses.allowNTLMCredentialsForDomains(domain); } function configureSpellChecker() { From 94defcfa6a43c890f54692a491975749c5cd97fd Mon Sep 17 00:00:00 2001 From: sliezz Date: Sun, 5 Jan 2025 17:05:50 +0700 Subject: [PATCH 3/4] prettier fix2 --- app/main/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/index.ts b/app/main/index.ts index 950bbda49..8d94faf6b 100644 --- a/app/main/index.ts +++ b/app/main/index.ts @@ -209,9 +209,9 @@ function createMainWindow(): BrowserWindow { ses.setUserAgent(`ZulipElectron/${app.getVersion()} ${ses.getUserAgent()}`); const allowNtlmCredentialsForDomains = EnterpriseUtil.getConfigItem( - "allowNtlmCredentialsForDomains", - [] - ); + "allowNtlmCredentialsForDomains", + [] + ); for (const domain of allowNtlmCredentialsForDomains) { ses.allowNTLMCredentialsForDomains(domain); } From 52af19ae067a4bbf0b5c806a15f37d663feb53ff Mon Sep 17 00:00:00 2001 From: sliezz Date: Sun, 5 Jan 2025 17:07:46 +0700 Subject: [PATCH 4/4] prettier fix3 --- app/main/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/index.ts b/app/main/index.ts index 8d94faf6b..ac3508500 100644 --- a/app/main/index.ts +++ b/app/main/index.ts @@ -210,7 +210,7 @@ function createMainWindow(): BrowserWindow { const allowNtlmCredentialsForDomains = EnterpriseUtil.getConfigItem( "allowNtlmCredentialsForDomains", - [] + [], ); for (const domain of allowNtlmCredentialsForDomains) { ses.allowNTLMCredentialsForDomains(domain);