Add helper methods to EnvironmentService for retrieving urls (#435)

common/src/abstractions/api.service.ts

@@ -153,12 +153,6 @@ import { UserKeyResponse } from '../models/response/userKeyResponse';
 import { SendAccessView } from '../models/view/sendAccessView';
 
 export abstract class ApiService {
-    urlsSet: boolean;
-    apiBaseUrl: string;
-    identityBaseUrl: string;
-    eventsBaseUrl: string;
-
-    setUrls: (urls: EnvironmentUrls) => void;
     postIdentityToken: (request: TokenRequest) => Promise<IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse>;
     refreshIdentityToken: () => Promise<any>;
 

common/src/abstractions/environment.service.ts

@@ -1,14 +1,29 @@
-export abstract class EnvironmentService {
-    baseUrl: string;
-    webVaultUrl: string;
-    apiUrl: string;
-    identityUrl: string;
-    iconsUrl: string;
-    notificationsUrl: string;
-    eventsUrl: string;
-    enterpriseUrl: string;
+import { Observable } from 'rxjs';
 
+export type Urls = {
+    base?: string;
+    webVault?: string;
+    api?: string;
+    identity?: string;
+    icons?: string;
+    notifications?: string;
+    events?: string;
+    enterprise?: string;
+};
+
+export abstract class EnvironmentService {
+    urls: Observable<Urls>;
+
+    hasBaseUrl: () => boolean;
+    getNotificationsUrl: () => string;
+    getEnterpriseUrl: () => string;
     getWebVaultUrl: () => string;
+    getSendUrl: () => string;
+    getIconsUrl: () => string;
+    getApiUrl: () => string;
+    getIdentityUrl: () => string;
+    getEventsUrl: () => string;
     setUrlsFromStorage: () => Promise<void>;
-    setUrls: (urls: any) => Promise<any>;
+    setUrls: (urls: any, saveSettings?: boolean) => Promise<Urls>;
+    getUrls: () => Urls;
 }

common/src/abstractions/notifications.service.ts

@@ -1,7 +1,5 @@
-import { EnvironmentService } from './environment.service';
-
 export abstract class NotificationsService {
-    init: (environmentService: EnvironmentService) => Promise<void>;
+    init: () => Promise<void>;
     updateConnection: (sync?: boolean) => Promise<void>;
     reconnectFromActivity: () => Promise<void>;
     disconnectFromInactivity: () => Promise<void>;