Minor refactoring to remove code duplication

3 files changed, 13 insertions, 13 deletions

diff --git a/src/components/settings/services/EditServiceForm.tsx b/src/components/settings/services/EditServiceForm.tsx
index 2b87dff1e..c04a53b50 100644
--- a/src/components/settings/services/EditServiceForm.tsx
+++ b/src/components/settings/services/EditServiceForm.tsx
@@ -2,7 +2,6 @@ import { Component, FormEvent, ReactElement } from 'react';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router-dom';
 import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
-import normalizeUrl from 'normalize-url';
 import { mdiInformation } from '@mdi/js';
 import { noop } from 'lodash';
 import Form from '../../../lib/Form';
@@ -20,6 +19,7 @@ import Icon from '../../ui/icon';
 import { H3 } from '../../ui/headline';
 import { IRecipe } from '../../../models/Recipe';
 import Service from '../../../models/Service';
+import { normalizedUrl } from '../../../helpers/url-helpers';
 
 const messages = defineMessages({
   saveService: {
@@ -194,11 +194,7 @@ class EditServiceForm extends Component<IProps, IState> {
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
-            values.customUrl = normalizeUrl(values.customUrl, {
-              stripAuthentication: false,
-              stripWWW: false,
-              removeTrailingSlash: false,
-            });
+            values.customUrl = normalizedUrl(values.customUrl);
             isValid = await recipe.validateUrl(values.customUrl);
           } catch (error) {
             console.warn('ValidateURL', error);
diff --git a/src/helpers/url-helpers.ts b/src/helpers/url-helpers.ts
index 9c5cf7752..795d3f2cb 100644
--- a/src/helpers/url-helpers.ts
+++ b/src/helpers/url-helpers.ts
@@ -2,6 +2,7 @@
 import { URL } from 'url';
 import { ensureDirSync, existsSync } from 'fs-extra';
 import { shell } from 'electron';
+import normalizeUrl from 'normalize-url';
 import { ALLOWED_PROTOCOLS } from '../config';
 
 const debug = require('../preload-safe-debug')('Ferdium:Helpers:url');
@@ -49,3 +50,11 @@ export function openExternalUrl(
     shell.openExternal(fixedUrl.toString());
   }
 }
+
+export function normalizedUrl(url: string) {
+  return normalizeUrl(url, {
+    stripAuthentication: false,
+    stripWWW: false,
+    removeTrailingSlash: false,
+  });
+}
diff --git a/src/models/Service.ts b/src/models/Service.ts
index 0cbfa60e2..af0085185 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -1,12 +1,11 @@
 import { autorun, action, computed, makeObservable, observable } from 'mobx';
 import { ipcRenderer } from 'electron';
 import { webContents } from '@electron/remote';
-import normalizeUrl from 'normalize-url';
 import { join } from 'path';
 import ElectronWebView from 'react-electron-web-view';
 
 import { todosStore } from '../features/todos';
-import { isValidExternalURL } from '../helpers/url-helpers';
+import { isValidExternalURL, normalizedUrl } from '../helpers/url-helpers';
 import UserAgent from './UserAgent';
 import { DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } from '../config';
 import { ifUndefined } from '../jsUtils';
@@ -327,11 +326,7 @@ export default class Service {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url: string = '';
       try {
-        url = normalizeUrl(this.customUrl, {
-          stripAuthentication: false,
-          stripWWW: false,
-          removeTrailingSlash: false,
-        });
+        url = normalizedUrl(this.customUrl);
       } catch {
         console.error(
           `Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`,