phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[MM-21835] Use URL instead of the url library (#1384)

Browse Source 
Additionally, migrate all of the URL related helper functions
from `src/utils/utils.js` to the new `src/utils/url.js` file
and migrate tests.

Issue MM-21835
Fixes #1206
This commit is contained in:
FalseHonesty
2020-11-04 14:59:07 -05:00
committed by GitHub
parent ad1871ad95
commit 5d0a937bb9
16 changed files with 308 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/Validator.js
View File

@@ -2,7 +2,7 @@
// See LICENSE.txt for license information.
import Joi from '@hapi/joi';
import Utils from '../utils/util';
import urlUtils from '../utils/url';
const defaultOptions = {
stripUnknown: true,
@@ -138,7 +138,7 @@ export function validateV1ConfigData(data) {
});
// next filter out urls that are still invalid so all is not lost
teams = teams.filter(({url}) => Utils.isValidURL(url));
teams = teams.filter(({url}) => urlUtils.isValidURL(url));
// replace original teams
data.teams = teams;
@@ -158,7 +158,7 @@ export function validateV2ConfigData(data) {
});
// next filter out urls that are still invalid so all is not lost
teams = teams.filter(({url}) => Utils.isValidURL(url));
teams = teams.filter(({url}) => urlUtils.isValidURL(url));
// replace original teams
data.teams = teams;