build: update dependencies

Additionally adjust the code after the latest
rebase.

src/app/modules/config/config.provider.spec.ts

@@ -13,8 +13,8 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {TestBed} from '@angular/core/testing';
-import {SCIndexResponse} from '@openstapps/core';
-import {StAppsWebHttpClient} from '../data/data.provider';
+import {SCIndexResponse, SCThingOriginType, SCThingType} from '@openstapps/core';
+import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
 import {StorageProvider} from '../storage/storage.provider';
 import {ConfigProvider, STORAGE_KEY_CONFIG} from './config.provider';
 import {
@@ -50,7 +50,7 @@ describe('ConfigProvider', () => {
   });
 
   it('should fetch app configuration', async () => {
-    spyOn(configProvider.client, 'handshake').and.returnValue(sampleIndexResponse);
+    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
     const result = await configProvider.fetch();
     expect(result).toEqual(sampleIndexResponse);
   });
@@ -67,8 +67,8 @@ describe('ConfigProvider', () => {
   });
 
   it('should init from remote and saved config not available', async () => {
-    storageProviderSpy.has.and.returnValue(false);
-    spyOn(configProvider.client, 'handshake').and.returnValue(sampleIndexResponse);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(false));
+    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
     try {
       await configProvider.init();
     } catch (error) {
@@ -82,8 +82,8 @@ describe('ConfigProvider', () => {
   });
 
   it('should init from storage with remote fails', async () => {
-    storageProviderSpy.has.and.returnValue(true);
-    storageProviderSpy.get.and.returnValue(sampleIndexResponse);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
     spyOn(configProvider.client, 'handshake').and.throwError('');
     let error = new Error('');
     try {
@@ -99,7 +99,7 @@ describe('ConfigProvider', () => {
   });
 
   it('should throw error on failed initialisation', async () => {
-    storageProviderSpy.has.and.returnValue(false);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     spyOn(configProvider.client, 'handshake').and.throwError('');
     let error = null;
     try {
@@ -111,11 +111,11 @@ describe('ConfigProvider', () => {
   });
 
   it('should throw error on wrong config version in storage', async () => {
-    storageProviderSpy.has.and.returnValue(true);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
     const wrongConfig = JSON.parse(JSON.stringify(sampleIndexResponse));
     wrongConfig.backend.SCVersion = '0.1.0';
     storageProviderSpy.get.and.returnValue(wrongConfig);
-    spyOn(configProvider.client, 'handshake').and.returnValue(sampleIndexResponse);
+    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
     let error = null;
     try {
       await configProvider.init();
@@ -126,7 +126,7 @@ describe('ConfigProvider', () => {
   });
 
   it('should throw error on saved app configuration not available', async () => {
-    storageProviderSpy.has.and.returnValue(false);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     let error = new Error('');
     try {
       await configProvider.loadLocal();
@@ -147,16 +147,16 @@ describe('ConfigProvider', () => {
   });
 
   it('should return app configuration value', async () => {
-    storageProviderSpy.has.and.returnValue(true);
-    storageProviderSpy.get.and.returnValue(sampleIndexResponse);
-    spyOn(configProvider.client, 'handshake').and.returnValue(sampleIndexResponse);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
+    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
     await configProvider.init();
     expect(await configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
 
   it('should return app configuration value if only saved config is available and fetch fails', async () => {
-    storageProviderSpy.has.and.returnValue(true);
-    storageProviderSpy.get.and.returnValue(sampleIndexResponse);
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
     spyOn(configProvider.client, 'handshake').and.throwError('');
     expect(await configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
@@ -216,6 +216,7 @@ const sampleIndexResponse: SCIndexResponse = {
         origin: {
           indexed: '2018-09-11T12:30:00Z',
           name: 'Dummy',
+          type: SCThingOriginType.Remote,
         },
         translations: {
           de: {
@@ -227,7 +228,7 @@ const sampleIndexResponse: SCIndexResponse = {
             name: 'Username',
           },
         },
-        type: 'setting',
+        type: SCThingType.Setting,
         uid: '',
       },
     ],
@@ -235,10 +236,12 @@ const sampleIndexResponse: SCIndexResponse = {
   backend: {
     SCVersion: '1.0.0',
     hiddenTypes: [
-      'date series',
-      'diff',
-      'floor',
+      SCThingType.DateSeries,
+      SCThingType.Diff,
+      SCThingType.Floor,
     ],
+    maxMultiSearchRouteQueries: 5,
+    maxRequestBodySize: 512 * 1024,
     name: 'Technische Universität Berlin',
     namespace: '909a8cbc-8520-456c-b474-ef1525f14209',
     sortableFields: [
@@ -253,50 +256,50 @@ const sampleIndexResponse: SCIndexResponse = {
       {
         fieldName: 'categories',
         onlyOnTypes: [
-          'academic event',
-          'building',
-          'catalog',
-          'dish',
-          'point of interest',
-          'room',
+          SCThingType.AcademicEvent,
+          SCThingType.Building,
+          SCThingType.Catalog,
+          SCThingType.Dish,
+          SCThingType.PointOfInterest,
+          SCThingType.Room,
         ],
         sortTypes: ['ducet'],
       },
       {
         fieldName: 'geo.point.coordinates',
         onlyOnTypes: [
-          'building',
-          'point of interest',
-          'room',
+          SCThingType.Building,
+          SCThingType.PointOfInterest,
+          SCThingType.Room,
         ],
         sortTypes: ['distance'],
       },
       {
         fieldName: 'geo.point.coordinates',
         onlyOnTypes: [
-          'building',
-          'point of interest',
-          'room',
+          SCThingType.Building,
+          SCThingType.PointOfInterest,
+          SCThingType.Room,
         ],
         sortTypes: ['distance'],
       },
       {
         fieldName: 'inPlace.geo.point.coordinates',
         onlyOnTypes: [
-          'date series',
-          'dish',
-          'floor',
-          'organization',
-          'point of interest',
-          'room',
-          'ticket',
+          SCThingType.DateSeries,
+          SCThingType.Dish,
+          SCThingType.Floor,
+          SCThingType.Organization,
+          SCThingType.PointOfInterest,
+          SCThingType.Room,
+          SCThingType.Ticket,
         ],
         sortTypes: ['distance'],
       },
       {
         fieldName: 'offers',
         onlyOnTypes: [
-          'dish',
+          SCThingType.Dish,
         ],
         sortTypes: ['price'],
       },

src/app/modules/config/config.provider.ts

@@ -17,7 +17,7 @@ import {Client} from '@openstapps/api/lib/client';
 import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
 import {Logger} from '@openstapps/logger';
 import {environment} from '../../../environments/environment';
-import {StAppsWebHttpClient} from '../data/data.provider';
+import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
 import {StorageProvider} from '../storage/storage.provider';
 import {
   ConfigFetchError,

src/app/modules/config/errors.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {AppError} from '../_helpers/errors';
+import {AppError} from './../../_helpers/errors';
 
 /**
  * Error that is thrown when fetching from backend fails