From 6e9f71f9429ee2f151f300f40eee6536fdfa69f3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 13 Oct 2018 23:26:38 -0400
Subject: [PATCH] move getDomain to jslib

---
 jslib                                    | 2 +-
 src/app/services/services.module.ts      | 4 ++--
 src/services/webPlatformUtils.service.ts | 4 ----
 tsconfig.json                            | 3 +++
 webpack.config.js                        | 1 +
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jslib b/jslib
index 9fa99f3a6e..0d30a1a1c9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9fa99f3a6ecf7c4a14e5d7271562b3908cf64728
+Subproject commit 0d30a1a1c9bd2c323189069fe4ec233ab85c35fe
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index b0142550d8..90aad7dfe2 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -98,7 +98,7 @@ const userService = new UserService(tokenService, storageService);
 const settingsService = new SettingsService(userService, storageService);
 export let searchService: SearchService = null;
 const cipherService = new CipherService(cryptoService, userService, settingsService,
-    apiService, storageService, i18nService, platformUtilsService, () => searchService);
+    apiService, storageService, i18nService, () => searchService);
 const folderService = new FolderService(cryptoService, userService, apiService, storageService,
     i18nService, cipherService);
 const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
@@ -110,7 +110,7 @@ const syncService = new SyncService(userService, apiService, settingsService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
 const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService);
 const totpService = new TotpService(storageService, cryptoFunctionService);
-const containerService = new ContainerService(cryptoService, platformUtilsService);
+const containerService = new ContainerService(cryptoService);
 const authService = new AuthService(cryptoService, apiService,
     userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService);
 const exportService = new ExportService(folderService, cipherService, apiService);
diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts
index 12b509abce..5dc559efde 100644
--- a/src/services/webPlatformUtils.service.ts
+++ b/src/services/webPlatformUtils.service.ts
@@ -86,10 +86,6 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
         return 'UA-81915606-3';
     }
 
-    getDomain(uriString: string): string {
-        return Utils.getHostname(uriString);
-    }
-
     isViewOpen(): boolean {
         return false;
     }
diff --git a/tsconfig.json b/tsconfig.json
index 483be82b72..2c61295281 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,9 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
+      "tldjs": [
+        "jslib/src/misc/tldjs.noop"
+      ],
       "jslib/*": [
         "jslib/src/*"
       ],
diff --git a/webpack.config.js b/webpack.config.js
index 84216bd570..2aa4822c23 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -172,6 +172,7 @@ const config = {
         extensions: ['.ts', '.js'],
         alias: {
             jslib: path.join(__dirname, 'jslib/src'),
+            tldjs: path.join(__dirname, 'jslib/src/misc/tldjs.noop'),
         },
         symlinks: false,
         modules: [path.resolve('node_modules')],