From 0069c2b70009756c3cddee2b06bd8a8bcf1690f8 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 9 Jan 2018 20:20:45 -0500
Subject: [PATCH] convert environment service to jslib

---
 src/background/main.background.ts   |  5 +-
 src/services/environment.service.ts | 90 -----------------------------
 2 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 src/services/environment.service.ts

diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 0eafa94711..f0079c863e 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -4,6 +4,7 @@ import {
     ApiService,
     AppIdService,
     CryptoService,
+    EnvironmentService,
     PasswordGenerationService,
     TokenService,
     TotpService,
@@ -15,6 +16,7 @@ import {
     ApiService as ApiServiceAbstraction,
     AppIdService as AppIdServiceAbstraction,
     CryptoService as CryptoServiceAbstraction,
+    EnvironmentService as EnvironmentServiceAbstraction,
     MessagingService as MessagingServiceAbstraction,
     PasswordGenerationService as PasswordGenerationServiceAbstraction,
     PlatformUtilsService as PlatformUtilsServiceAbstraction,
@@ -43,7 +45,6 @@ import CipherService from '../services/cipher.service';
 import CollectionService from '../services/collection.service';
 import ConstantsService from '../services/constants.service';
 import ContainerService from '../services/container.service';
-import EnvironmentService from '../services/environment.service';
 import FolderService from '../services/folder.service';
 import i18nService from '../services/i18n.service';
 import LockService from '../services/lock.service';
@@ -61,7 +62,7 @@ export default class MainBackground {
     tokenService: TokenServiceAbstraction;
     appIdService: AppIdServiceAbstraction;
     apiService: ApiServiceAbstraction;
-    environmentService: EnvironmentService;
+    environmentService: EnvironmentServiceAbstraction;
     userService: UserServiceAbstraction;
     settingsService: SettingsService;
     cipherService: CipherService;
diff --git a/src/services/environment.service.ts b/src/services/environment.service.ts
deleted file mode 100644
index faae63995c..0000000000
--- a/src/services/environment.service.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import ConstantsService from './constants.service';
-
-import { EnvironmentUrls } from 'jslib/models/domain';
-
-import {
-    ApiService,
-    StorageService,
-} from 'jslib/abstractions';
-
-export default class EnvironmentService {
-    baseUrl: string;
-    webVaultUrl: string;
-    apiUrl: string;
-    identityUrl: string;
-    iconsUrl: string;
-
-    constructor(private apiService: ApiService, private storageService: StorageService) {
-    }
-
-    async setUrlsFromStorage(): Promise<void> {
-        const urlsObj: any = await this.storageService.get(ConstantsService.environmentUrlsKey);
-        const urls = urlsObj || {
-            base: null,
-            api: null,
-            identity: null,
-            icons: null,
-            webVault: null,
-        };
-
-        const envUrls = new EnvironmentUrls();
-
-        if (urls.base) {
-            this.baseUrl = envUrls.base = urls.base;
-            await this.apiService.setUrls(envUrls);
-            return;
-        }
-
-        this.webVaultUrl = urls.webVault;
-        this.apiUrl = envUrls.api = urls.api;
-        this.identityUrl = envUrls.identity = urls.identity;
-        this.iconsUrl = urls.icons;
-        await this.apiService.setUrls(envUrls);
-    }
-
-    async setUrls(urls: any): Promise<any> {
-        urls.base = this.formatUrl(urls.base);
-        urls.webVault = this.formatUrl(urls.webVault);
-        urls.api = this.formatUrl(urls.api);
-        urls.identity = this.formatUrl(urls.identity);
-        urls.icons = this.formatUrl(urls.icons);
-
-        await this.storageService.save(ConstantsService.environmentUrlsKey, {
-            base: urls.base,
-            api: urls.api,
-            identity: urls.identity,
-            webVault: urls.webVault,
-            icons: urls.icons,
-        });
-
-        this.baseUrl = urls.base;
-        this.webVaultUrl = urls.webVault;
-        this.apiUrl = urls.api;
-        this.identityUrl = urls.identity;
-        this.iconsUrl = urls.icons;
-
-        const envUrls = new EnvironmentUrls();
-        if (this.baseUrl) {
-            envUrls.base = this.baseUrl;
-        } else {
-            envUrls.api = this.apiUrl;
-            envUrls.identity = this.identityUrl;
-        }
-
-        await this.apiService.setUrls(envUrls);
-        return urls;
-    }
-
-    private formatUrl(url: string): string {
-        if (url == null || url === '') {
-            return null;
-        }
-
-        url = url.replace(/\/+$/g, '');
-        if (!url.startsWith('http://') && !url.startsWith('https://')) {
-            url = 'https://' + url;
-        }
-
-        return url;
-    }
-}