[MM-46101] Move allowed protocols to build config (#2217)
This commit is contained in:
parent
78d0bbc551
commit
1270859d39
|
@ -28,12 +28,7 @@
|
||||||
{
|
{
|
||||||
"name": "Mattermost",
|
"name": "Mattermost",
|
||||||
"schemes": [
|
"schemes": [
|
||||||
"mattermost",
|
"mattermost"
|
||||||
"http",
|
|
||||||
"https",
|
|
||||||
"ftp",
|
|
||||||
"mailto",
|
|
||||||
"tel"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -18,6 +18,7 @@ import {BuildConfig} from 'types/config';
|
||||||
* Specify at least one server for "defaultTeams"
|
* Specify at least one server for "defaultTeams"
|
||||||
* when "enableServerManagement is set to false
|
* when "enableServerManagement is set to false
|
||||||
* @prop {[]} managedResources - Defines which paths are managed
|
* @prop {[]} managedResources - Defines which paths are managed
|
||||||
|
* @prop {[]} allowedProtocols - Defines which protocols should be automatically allowed
|
||||||
*/
|
*/
|
||||||
const buildConfig: BuildConfig = {
|
const buildConfig: BuildConfig = {
|
||||||
defaultTeams: [/*
|
defaultTeams: [/*
|
||||||
|
@ -30,6 +31,12 @@ const buildConfig: BuildConfig = {
|
||||||
enableServerManagement: true,
|
enableServerManagement: true,
|
||||||
enableAutoUpdater: true,
|
enableAutoUpdater: true,
|
||||||
managedResources: ['trusted'],
|
managedResources: ['trusted'],
|
||||||
|
allowedProtocols: [
|
||||||
|
'mattermost',
|
||||||
|
'ftp',
|
||||||
|
'mailto',
|
||||||
|
'tel',
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
export default buildConfig;
|
export default buildConfig;
|
||||||
|
|
|
@ -31,14 +31,11 @@ jest.mock('electron', () => ({
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
jest.mock('../../electron-builder.json', () => ({
|
jest.mock('common/config/buildConfig', () => ({
|
||||||
protocols: [{
|
allowedProtocols: [
|
||||||
name: 'Mattermost',
|
'pone',
|
||||||
schemes: [
|
'ptwo',
|
||||||
'pone',
|
],
|
||||||
'ptwo',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
jest.mock('./Validator', () => ({
|
jest.mock('./Validator', () => ({
|
||||||
|
|
|
@ -10,7 +10,7 @@ import log from 'electron-log';
|
||||||
|
|
||||||
import {localizeMessage} from 'main/i18nManager';
|
import {localizeMessage} from 'main/i18nManager';
|
||||||
|
|
||||||
import {protocols} from '../../electron-builder.json';
|
import buildConfig from 'common/config/buildConfig';
|
||||||
|
|
||||||
import * as Validator from './Validator';
|
import * as Validator from './Validator';
|
||||||
import WindowManager from './windows/windowManager';
|
import WindowManager from './windows/windowManager';
|
||||||
|
@ -31,11 +31,7 @@ export class AllowProtocolDialog {
|
||||||
}
|
}
|
||||||
this.addScheme('http');
|
this.addScheme('http');
|
||||||
this.addScheme('https');
|
this.addScheme('https');
|
||||||
protocols.forEach((protocol) => {
|
buildConfig.allowedProtocols.forEach(this.addScheme);
|
||||||
if (protocol.schemes && protocol.schemes.length > 0) {
|
|
||||||
protocol.schemes.forEach(this.addScheme);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,7 @@ export type BuildConfig = {
|
||||||
enableServerManagement: boolean;
|
enableServerManagement: boolean;
|
||||||
enableAutoUpdater: boolean;
|
enableAutoUpdater: boolean;
|
||||||
managedResources: string[];
|
managedResources: string[];
|
||||||
|
allowedProtocols: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RegistryConfig = {
|
export type RegistryConfig = {
|
||||||
|
|
Loading…
Reference in a new issue