paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-02 04:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

proxy-util: Fix misuse of void.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-01 14:54:36 -07:00
parent 9ceabe02d5
commit 24b28f9ded
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/renderer/js/utils/proxy-util.ts
View File

@@ -6,12 +6,12 @@ export interface ProxyRule {
}
// Return proxy to be used for a particular uri, to be used for request
export function getProxy(_uri: string): ProxyRule | void {
export function getProxy(_uri: string): ProxyRule | undefined {
let uri;
try {
uri = new URL(_uri);
} catch {
return;
return undefined;
}
const proxyRules = ConfigUtil.getConfigItem('proxyRules', '').split(';');
@@ -19,7 +19,7 @@ export function getProxy(_uri: string): ProxyRule | void {
// environment. NO_PROXY = '*' makes request ignore all environment proxy variables.
if (proxyRules[0] === '') {
process.env.NO_PROXY = '*';
return;
return undefined;
}
const proxyRule: any = {};
@@ -42,6 +42,8 @@ export function getProxy(_uri: string): ProxyRule | void {
});
return proxyRule;
}
return undefined;
}
// TODO: Refactor to async function

2
app/renderer/js/utils/request-util.ts
View File

@@ -17,7 +17,7 @@ const logger = new Logger({
interface RequestUtilResponse {
ca: string;
proxy: string | void | ProxyUtil.ProxyRule;
proxy: string | undefined | ProxyUtil.ProxyRule;
ecdhCurve: 'auto';
headers: { 'User-Agent': string };
}