1
0
mirror of https://github.com/bitwarden/browser synced 2024-12-25 01:22:26 +01:00

move getDomain to jslib

This commit is contained in:
Kyle Spearrin 2018-10-13 23:26:38 -04:00
parent 65211372df
commit 6e9f71f942
5 changed files with 7 additions and 7 deletions

2
jslib

@ -1 +1 @@
Subproject commit 9fa99f3a6ecf7c4a14e5d7271562b3908cf64728 Subproject commit 0d30a1a1c9bd2c323189069fe4ec233ab85c35fe

View File

@ -98,7 +98,7 @@ const userService = new UserService(tokenService, storageService);
const settingsService = new SettingsService(userService, storageService); const settingsService = new SettingsService(userService, storageService);
export let searchService: SearchService = null; export let searchService: SearchService = null;
const cipherService = new CipherService(cryptoService, userService, settingsService, const cipherService = new CipherService(cryptoService, userService, settingsService,
apiService, storageService, i18nService, platformUtilsService, () => searchService); apiService, storageService, i18nService, () => searchService);
const folderService = new FolderService(cryptoService, userService, apiService, storageService, const folderService = new FolderService(cryptoService, userService, apiService, storageService,
i18nService, cipherService); i18nService, cipherService);
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService); 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 })); async (expired: boolean) => messagingService.send('logout', { expired: expired }));
const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService); const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService);
const totpService = new TotpService(storageService, cryptoFunctionService); const totpService = new TotpService(storageService, cryptoFunctionService);
const containerService = new ContainerService(cryptoService, platformUtilsService); const containerService = new ContainerService(cryptoService);
const authService = new AuthService(cryptoService, apiService, const authService = new AuthService(cryptoService, apiService,
userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService); userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService);
const exportService = new ExportService(folderService, cipherService, apiService); const exportService = new ExportService(folderService, cipherService, apiService);

View File

@ -86,10 +86,6 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
return 'UA-81915606-3'; return 'UA-81915606-3';
} }
getDomain(uriString: string): string {
return Utils.getHostname(uriString);
}
isViewOpen(): boolean { isViewOpen(): boolean {
return false; return false;
} }

View File

@ -16,6 +16,9 @@
"types": [], "types": [],
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"tldjs": [
"jslib/src/misc/tldjs.noop"
],
"jslib/*": [ "jslib/*": [
"jslib/src/*" "jslib/src/*"
], ],

View File

@ -172,6 +172,7 @@ const config = {
extensions: ['.ts', '.js'], extensions: ['.ts', '.js'],
alias: { alias: {
jslib: path.join(__dirname, 'jslib/src'), jslib: path.join(__dirname, 'jslib/src'),
tldjs: path.join(__dirname, 'jslib/src/misc/tldjs.noop'),
}, },
symlinks: false, symlinks: false,
modules: [path.resolve('node_modules')], modules: [path.resolve('node_modules')],