@esolve/ng-esolve-connect 0.10.2 → 0.11.0

package/fesm2020/esolve-ng-esolve-connect.mjs

@@ -1,12 +1,12 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import * as i1$1 from '@angular/common/http';
+import { InjectionToken, PLATFORM_ID, Injectable, Inject, Optional, NgModule } from '@angular/core';
+import { isPlatformBrowser, CommonModule } from '@angular/common';
+import * as i1$2 from '@angular/common/http';
 import { HttpParams, HTTP_INTERCEPTORS, HttpClientModule, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
-import * as i4 from 'ngx-cookie-service';
+import * as i1 from 'ngx-cookie-service';
 import { CookieService } from 'ngx-cookie-service';
 import { BehaviorSubject, throwError, iif, of } from 'rxjs';
-import * as i1 from '@angular/platform-browser';
+import * as i1$1 from '@angular/platform-browser';
 import { tap, catchError, map, switchMap } from 'rxjs/operators';
 
 const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
@@ -19,25 +19,22 @@ const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 // };
 
 class EsolveSession {
-    constructor(id = -1, _key = '', _key_expiration_date) {
+    constructor(id = -1, key = '', expiration_date) {
         this.id = id;
-        this._key = _key;
-        this._key_expiration_date = _key_expiration_date;
-    }
-    get key() {
-        return this._key;
+        this.key = key;
+        this.expiration_date = expiration_date;
     }
     get expired() {
         const current_date = new Date();
-        return ((this._key_expiration_date === undefined) ||
-            (current_date >= this._key_expiration_date));
+        return ((this.expiration_date === undefined) ||
+            (current_date >= this.expiration_date));
     }
     get authenticated() {
         return (this.id > 0);
     }
     get valid() {
-        return ((this._key !== '') &&
-            (this._key_expiration_date !== undefined) &&
+        return ((this.key !== '') &&
+            (this.expiration_date !== undefined) &&
             (this.id >= 0));
     }
     updateUser(user_id) {
@@ -45,13 +42,119 @@ class EsolveSession {
     }
 }
 
+class EsolveCookieService {
+    constructor(ngxCookies, platformId, request, response) {
+        this.ngxCookies = ngxCookies;
+        this.platformId = platformId;
+        this.request = request;
+        this.response = response;
+        this.is_browser = isPlatformBrowser(this.platformId);
+    }
+    check(name) {
+        if (this.is_browser) {
+            return this.ngxCookies.check(name);
+        }
+        const server_cookies = this.request.headers.cookie;
+        if (!server_cookies) {
+            return false;
+        }
+        name = encodeURIComponent(name);
+        const regExp = this.getCookieRegExp(name);
+        return regExp.test(server_cookies);
+    }
+    get(name) {
+        if (this.is_browser) {
+            return this.ngxCookies.get(name);
+        }
+        if (!this.check(name)) {
+            return '';
+        }
+        const server_cookies = this.request.headers.cookie ?? '';
+        const regExp = this.getCookieRegExp(name);
+        const result = regExp.exec(server_cookies);
+        return result && result[1] ? this.safeDecodeURIComponent(result[1]) : '';
+    }
+    set(name, value, expires, path, domain, secure) {
+        if (this.is_browser) {
+            this.ngxCookies.set(name, value, expires, path, domain, secure);
+            return;
+        }
+        this.response.cookie(name, value, { domain, path, expires, secure });
+    }
+    delete(name, path, domain, secure) {
+        if (this.is_browser) {
+            this.ngxCookies.delete(name, path, domain, secure);
+            return;
+        }
+        this.response.clearCookie(name, { path, domain, secure });
+    }
+    /*
+     * Following functions come from ngx-cookie-service project since they are primarily the same
+     */
+    /**
+     * Get cookie Regular Expression
+     *
+     * @param name Cookie name
+     * @returns property RegExp
+     *
+     * @link https://github.com/stevermeister/ngx-cookie-service/blob/bcb6ac203487c487fcd126896bffaa14981c709c/projects/ngx-cookie-service/src/lib/cookie.service.ts#L31
+     */
+    getCookieRegExp(name) {
+        const escapedName = name.replace(/([\[\]\{\}\(\)\|\=\;\+\?\,\.\*\^\$])/gi, '\\$1');
+        return new RegExp('(?:^' + escapedName + '|;\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');
+    }
+    /**
+     * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI).
+     *
+     * @param encodedURIComponent A value representing an encoded URI component.
+     *
+     * @returns The unencoded version of an encoded component of a Uniform Resource Identifier (URI).
+     *
+     * @link https://github.com/stevermeister/ngx-cookie-service/blob/bcb6ac203487c487fcd126896bffaa14981c709c/projects/ngx-cookie-service/src/lib/cookie.service.ts#L47
+     */
+    safeDecodeURIComponent(encodedURIComponent) {
+        try {
+            return decodeURIComponent(encodedURIComponent);
+        }
+        catch {
+            // probably it is not uri encoded. return as is
+            return encodedURIComponent;
+        }
+    }
+}
+EsolveCookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, deps: [{ token: i1.CookieService }, { token: PLATFORM_ID }, { token: 'REQUEST', optional: true }, { token: 'RESPONSE', optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: i1.CookieService }, { type: Object, decorators: [{
+                    type: Inject,
+                    args: [PLATFORM_ID]
+                }] }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: ['REQUEST']
+                }] }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: ['RESPONSE']
+                }] }]; } });
+
+// TODO: Rewrite session manager to use a pure rxjs solution.
 class EsolveSessionService {
-    constructor(config) {
+    constructor(platformId, config, cookieService) {
+        this.platformId = platformId;
         this.config = config;
+        this.cookieService = cookieService;
         this.storage_key = 'ngEslvUserSession';
         this.setStorageKey();
-        this._session = new BehaviorSubject(new EsolveSession(0, ''));
+        this._session = new BehaviorSubject(new EsolveSession());
         this.session = this._session.asObservable();
+        this.is_browser = isPlatformBrowser(this.platformId);
     }
     get currentSession() {
         return this._session.value;
@@ -63,7 +166,9 @@ class EsolveSessionService {
         }
     }
     startTimer(callback, duration) {
-        this.key_expiration_timer = setTimeout(callback, duration);
+        if (this.is_browser) {
+            this.key_expiration_timer = setTimeout(callback, duration);
+        }
     }
     clearTimer() {
         if (this.key_expiration_timer) {
@@ -71,53 +176,57 @@ class EsolveSessionService {
         }
     }
     restore(expirationCallback, invalidSessionCallback) {
-        if (!this.currentSession.valid) {
-            const stored_session_json = localStorage.getItem(this.storage_key);
-            const stored_session = (stored_session_json ? JSON.parse(stored_session_json) : null);
-            if (!stored_session) {
-                invalidSessionCallback();
-                return;
-            }
-            const expiration_date = new Date(stored_session._key_expiration_date);
-            const loaded_session = new EsolveSession(stored_session.id, stored_session._key, expiration_date);
-            if (!loaded_session.expired) {
-                this._session.next(loaded_session);
-                const expiration_duration = expiration_date.getTime() - new Date().getTime();
-                this.startTimer(expirationCallback, expiration_duration);
-            }
-            else {
-                expirationCallback(loaded_session);
-            }
+        if (this.currentSession.valid) {
+            return;
+        }
+        const stored_session_json = this.cookieService.get(this.storage_key);
+        const stored_session = (stored_session_json ? JSON.parse(stored_session_json) : null);
+        if (!stored_session) {
+            invalidSessionCallback();
+            return;
+        }
+        const expiration_date = new Date(stored_session.expiration_date);
+        const loaded_session = new EsolveSession(stored_session.id, stored_session.key, expiration_date);
+        if (!loaded_session.expired) {
+            this._session.next(loaded_session);
+            const expiration_duration = expiration_date.getTime() - new Date().getTime();
+            this.startTimer(expirationCallback, expiration_duration);
+        }
+        else {
+            expirationCallback(loaded_session);
         }
     }
     handleSession(user_id, key, expiry_time, expires, expirationCallback) {
         const expiration_date = new Date(expiry_time * 1000);
         const session = new EsolveSession(user_id, key, expiration_date);
-        localStorage.setItem(this.storage_key, JSON.stringify(session));
+        this.cookieService.set(this.storage_key, JSON.stringify(session), expiration_date, '/');
         this._session.next(session);
         this.startTimer(expirationCallback, expires * 1000);
     }
     handleUpdateSession(user_id, callback) {
         const current_session = this.currentSession;
         current_session.updateUser(user_id);
-        localStorage.setItem(this.storage_key, JSON.stringify(current_session));
+        this.cookieService.set(this.storage_key, JSON.stringify(current_session), current_session.expiration_date, '/');
         this._session.next(current_session);
         if (typeof callback === 'function') {
             callback();
         }
     }
 }
-EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSessionService, deps: [{ token: ESOLVE_CONNECT_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSessionService, decorators: [{
+EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, deps: [{ token: PLATFORM_ID }, { token: ESOLVE_CONNECT_CONFIG }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: Object, decorators: [{
+                    type: Inject,
+                    args: [PLATFORM_ID]
+                }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }]; } });
+                }] }, { type: EsolveCookieService }]; } });
 
 class EsolveAuthInterceptorService {
     constructor(config, session) {
@@ -125,8 +234,8 @@ class EsolveAuthInterceptorService {
         this.session = session;
     }
     intercept(req, next) {
-        if (req.url.startsWith(`${this.config.api_url}/service/`)) {
-            const service_identifier = req.url.replace(`${this.config.api_url}/service/`, '');
+        if (req.url.startsWith(`${this.config.api_url}/`)) {
+            const service_identifier = req.url.replace(`${this.config.api_url}/`, '');
             const old_params_keys = req.params.keys();
             const modified_url = req.url;
             let params = new HttpParams();
@@ -136,6 +245,7 @@ class EsolveAuthInterceptorService {
                     params = params.set('key', session.key);
                 }
             }
+            params = params.set('ws_id', this.config.wsid);
             old_params_keys.forEach(key => {
                 params = params.set(key, req.params.get(key) || '');
             });
@@ -148,9 +258,9 @@ class EsolveAuthInterceptorService {
         return next.handle(req);
     }
 }
-EsolveAuthInterceptorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthInterceptorService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAuthInterceptorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthInterceptorService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
+EsolveAuthInterceptorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthInterceptorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -175,14 +285,14 @@ class NgEsolveConnectModule {
         };
     }
 }
-NgEsolveConnectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-NgEsolveConnectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule,
+NgEsolveConnectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+NgEsolveConnectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule,
         HttpClientModule] });
-NgEsolveConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: NgEsolveConnectModule, providers: [CookieService], imports: [[
+NgEsolveConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, providers: [CookieService], imports: [[
             CommonModule,
             HttpClientModule
         ]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -297,9 +407,9 @@ class EsolveErrorHandlerService {
         return new EsolveHttpError('error', result.message, result.code);
     }
 }
-EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveErrorHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
+EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveErrorHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -336,9 +446,9 @@ class EsolveResponseHandlerService {
         return resultHandler(response);
     }
 }
-EsolveResponseHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveResponseHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
+EsolveResponseHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveResponseHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -453,9 +563,9 @@ class EsolveSeoService {
         this.setPageKeywordsTags(seoInfo.keywords);
     }
 }
-EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSeoService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.Title }, { token: i1.Meta }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveSeoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSeoService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveSeoService, decorators: [{
+EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.Title }, { token: i1$1.Meta }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSeoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -463,7 +573,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.Title }, { type: i1.Meta }]; } });
+                }] }, { type: i1$1.Title }, { type: i1$1.Meta }]; } });
 
 class EsolveAuthService {
     constructor(config, http, session, errorHandler, cookieService) {
@@ -476,7 +586,7 @@ class EsolveAuthService {
     getAccessToken(email, password, anonymous = false) {
         let params = new HttpParams();
         if (anonymous) {
-            params = params.set('anonymous', '1');
+            params = params.set('anonymous', true);
         }
         if (email !== '') {
             params = params.set('email', email);
@@ -484,25 +594,26 @@ class EsolveAuthService {
         if (password !== '') {
             params = params.set('password', password);
         }
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-access-token.php`, {
+        return this.http
+            .get(`${this.config.api_url}/get-access-token.php`, {
             params,
             headers: new HttpHeaders({
-                'Accept-Language': '*'
-            })
-        }).pipe(tap(responseData => {
+                'Accept-Language': '*',
+            }),
+        })
+            .pipe(tap((responseData) => {
             if ((responseData.type === 'error') ||
                 (responseData.type === 'exception')) {
                 throw responseData;
             }
-        }), catchError(this.handleError), tap(responseData => {
+        }), catchError(this.handleError), tap((responseData) => {
             this.handleAuthentication(responseData);
         }));
     }
     autoLogin() {
         this.session.restore(this.handleExpiration(), () => {
-            this.getAccessToken('', '', true).toPromise().then(_ => { }, error => {
-                console.log(error);
+            this.getAccessToken('', '', true).toPromise().then(() => { }, (error) => {
+                console.error(error);
             });
         });
     }
@@ -513,16 +624,15 @@ class EsolveAuthService {
                 password
             }
         };
-        return this.http.post(`${this.config.api_url}/service/set-login.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-login.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(response => {
+        })
+            .pipe(map((response) => {
             if ((response.responses === undefined) ||
                 (response.responses.length <= 0)) {
                 throw response;
@@ -533,7 +643,8 @@ class EsolveAuthService {
                 throw login_response;
             }
             for (const response_log of login_response.log) {
-                if ((response_log.type === 'success') && (response_log.message_code === 'login_success')) {
+                if ((response_log.type === 'success') &&
+                    (response_log.message_code === 'login_success')) {
                     this.session.handleUpdateSession(login_response.esolve_id);
                     return login_response.esolve_id;
                 }
@@ -551,18 +662,14 @@ class EsolveAuthService {
     checkAccessToken(session) {
         session = session || this.session.currentSession;
         const token = session?.key ?? '';
-        const params = new HttpParams({
-            fromObject: {
-                key: token,
-                ws_id: this.config.wsid
-            }
-        });
-        return this.http.get(`${this.config.api_url}/service/get-access-token.php`, {
-            params,
+        return this.http
+            .get(`${this.config.api_url}/get-access-token.php`, {
+            params: { key: token },
             headers: new HttpHeaders({
                 'Accept-Language': '*'
-            })
-        }).pipe(map(responseData => {
+            }),
+        })
+            .pipe(map((responseData) => {
             if ((responseData.type === 'error') ||
                 (responseData.type === 'exception') ||
                 (!responseData.additional_data.key_okay)) {
@@ -570,7 +677,8 @@ class EsolveAuthService {
             }
             responseData.additional_data.key = token;
             return responseData;
-        })).toPromise();
+        }))
+            .toPromise();
     }
     // Handlers
     handleExpiration() {
@@ -583,14 +691,15 @@ class EsolveAuthService {
         };
     }
     handleAuthentication(responseData) {
-        if (responseData.additional_data.key) {
-            this.session.handleSession(responseData.additional_data.user_id, responseData.additional_data.key, +responseData.additional_data.expiry_time, +responseData.additional_data.expires, this.handleExpiration());
+        if (!responseData.additional_data.key) {
+            return;
         }
+        this.session.handleSession(responseData.additional_data.user_id, responseData.additional_data.key, +responseData.additional_data.expiry_time, +responseData.additional_data.expires, this.handleExpiration());
     }
     handleError(errorRes) {
         const error = {
             message: 'An unknown error occurred',
-            data: {}
+            data: {},
         };
         if ((!errorRes.type) ||
             (!errorRes.service_type) ||
@@ -606,17 +715,17 @@ class EsolveAuthService {
         return throwError(error);
     }
 }
-EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: i4.CookieService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAuthService, decorators: [{
+EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: i4.CookieService }]; } });
+                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveCookieService }]; } });
 
 class EsolveAddress {
     constructor(id, recipient, address_type, pobox, place_name, street_number, street, suburb, city, province, country, postal_code, latitude, longitude) {
@@ -961,25 +1070,22 @@ class EsolveAccountService {
         const body = {
             account: user_account_data
         };
-        return this.http.post(`${this.config.api_url}/service/set-user-account.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-user-account.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveUserAccountResult(response))), catchError((errorRes) => {
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveUserAccountResult(response))), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-user-account', errorRes);
         }));
     }
     getUserAccount() {
-        return this.http.get(`${this.config.api_url}/service/get-account.php`, {
-            params: {
-                ws_id: this.config.wsid
-            }
-        }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-account.php`)
+            .pipe(map((response) => {
             if ((response.records === undefined) ||
                 (response.records.length === 0)) {
                 throw response;
@@ -992,28 +1098,26 @@ class EsolveAccountService {
         const body = {
             address: address_post_data
         };
-        return this.http.post(`${this.config.api_url}/service/set-address.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-address.php`, body, {
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            params: {
-                ws_id: this.config.wsid
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;',
             },
             responseType: 'json',
-            observe: 'body'
-        }).pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveAddressResult(response))), catchError((errorRes) => {
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveAddressResult(response))), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-registration', errorRes);
         }));
     }
     getAddresses() {
         try {
             this.loginGuard();
-            return this.http.get(`${this.config.api_url}/service/get-addresses.php`, {
-                params: {
-                    ws_id: this.config.wsid,
-                    user_id: this.user_id
-                }
-            }).pipe(map(response => {
+            return this.http
+                .get(`${this.config.api_url}/get-addresses.php`, {
+                params: { user_id: this.user_id }
+            })
+                .pipe(map((response) => {
                 if (response.records === undefined) {
                     throw response;
                 }
@@ -1025,14 +1129,13 @@ class EsolveAccountService {
         }
     }
     deleteAddress(id) {
-        return this.http.delete(`${this.config.api_url}/service/delete-address.php`, {
-            params: {
-                ws_id: this.config.wsid,
-                id: id
-            },
+        return this.http
+            .delete(`${this.config.api_url}/delete-address.php`, {
+            params: { id },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(http_response => {
+        })
+            .pipe(map((http_response) => {
             if ((http_response.result === undefined) ||
                 (http_response.result === null) ||
                 (http_response.result.status !== 'success')) {
@@ -1047,16 +1150,15 @@ class EsolveAccountService {
         const body = {
             user: user_registration
         };
-        return this.http.post(`${this.config.api_url}/service/set-registration.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-registration.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
             if (response.auto_login) {
                 this.sessionService.handleUpdateSession(response.esolve_id);
             }
@@ -1070,28 +1172,24 @@ class EsolveAccountService {
             password,
             confirm_password
         };
-        return this.http.post(`${this.config.api_url}/service/set-change-password.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-change-password.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
             return new EsolveChangePasswordResult(response);
         })), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-change-password', errorRes);
         }));
     }
     sendForgotPasswordRequest(email) {
-        return this.http.get(`${this.config.api_url}/service/get-forgot-password.php`, {
-            params: {
-                ws_id: this.config.wsid,
-                email: email
-            }
-        }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-forgot-password.php`, { params: { email } })
+            .pipe(map((response) => {
             if ((response.records === undefined) ||
                 !('reset_link_sent' in response.records)) {
                 throw response;
@@ -1100,7 +1198,8 @@ class EsolveAccountService {
         }));
     }
     resetPassword(reset_key, password, confirm_password, auto_login = true) {
-        return this.http.post(`${this.config.api_url}/service/set-forgot-password.php`, {
+        return this.http
+            .post(`${this.config.api_url}/set-forgot-password.php`, {
             reset_key,
             password,
             confirm_password,
@@ -1109,12 +1208,10 @@ class EsolveAccountService {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
             if (!response.login_required) {
                 this.sessionService.handleUpdateSession(response.esolve_id);
             }
@@ -1126,13 +1223,14 @@ class EsolveAccountService {
     getTransactions(options = {}) {
         try {
             this.loginGuard();
-            return this.http.get(`${this.config.api_url}/service/get-transactions.php`, {
+            return this.http
+                .get(`${this.config.api_url}/get-transactions.php`, {
                 params: {
-                    ws_id: this.config.wsid,
                     user_id: this.user_id,
                     ...options,
                 }
-            }).pipe(map(response => {
+            })
+                .pipe(map((response) => {
                 if (response.records === undefined) {
                     throw response;
                 }
@@ -1150,14 +1248,16 @@ class EsolveAccountService {
     getTransaction(id) {
         try {
             this.loginGuard();
-            return this.http.get(`${this.config.api_url}/service/get-transactions.php`, {
+            return this.http
+                .get(`${this.config.api_url}/get-transactions.php`, {
                 params: {
-                    ws_id: this.config.wsid,
                     user_id: this.user_id,
                     transaction_id: id,
                 }
-            }).pipe(map(response => {
-                if ((response.records === undefined) || (response.records.length <= 0)) {
+            })
+                .pipe(map((response) => {
+                if ((response.records === undefined) ||
+                    (response.records.length <= 0)) {
                     throw response;
                 }
                 const items = this.processTransactions(response.records);
@@ -1209,9 +1309,9 @@ class EsolveAccountService {
         }
     }
 }
-EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAccountService, decorators: [{
+EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1219,7 +1319,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+
+class EsolveHeading {
+    constructor(identifier, value) {
+        this.identifier = identifier;
+        this.value = value;
+    }
+}
 
 class EsolveMediaArticle {
     constructor(identifier, title, article, image_url = '', tags = [], topics = [], seo_title = '', seo_keywords = '', seo_description = '') {
@@ -1260,18 +1367,16 @@ class EsolveMediaService {
         this.http = http;
     }
     /**
-     * Retrieves the media record from the eSolve instance using the identifier.
-     * @param identifier String representing the eSolve media indentifier
+     * Retrieves the media record from the eSolve instance using the identifier
+     *
+     * @param identifier String representing the eSolve media identifier
      */
     getMediaArticle(identifier) {
-        const params = new HttpParams({
-            fromObject: {
-                identifier
-            }
-        });
+        const params = new HttpParams({ fromObject: { identifier } });
         // TODO: Error Handling
-        return this.getMediaRecords(params).pipe(map(response => {
-            if ((response.records === undefined) || (response.records.length <= 0)) {
+        return this.getMediaRecords(params).pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
                 throw response;
             }
             const mediaRecord = response.records[0];
@@ -1282,18 +1387,18 @@ class EsolveMediaService {
         }));
     }
     /**
-     * Retrieves a group of media records from the eSolve instance linked to a group.
+     * Retrieves a group of media records from the eSolve instance linked to a group
+     *
      * @param media_group String representing the eSolve media group
      */
     getGroupedMediaArticles(media_group) {
         const params = new HttpParams({
-            fromObject: {
-                media_group_sef: media_group
-            }
+            fromObject: { media_group_sef: media_group }
         });
-        return this.getMediaRecords(params).pipe(map(response => {
+        return this.getMediaRecords(params).pipe(map((response) => {
             const mediaArticles = [];
-            if ((response.records !== undefined) && (response.records.length > 0)) {
+            if ((response.records !== undefined) &&
+                (response.records.length > 0)) {
                 for (const mediaRecord of response.records) {
                     if (mediaRecord.active) {
                         mediaArticles.push(this.processMediaRecord(mediaRecord));
@@ -1303,6 +1408,34 @@ class EsolveMediaService {
             return mediaArticles;
         }));
     }
+    /**
+     * Retrieves the media heading records from the eSolve instance using the identifiers
+     *
+     * @param identifiers Array of strings representing the eSolve heading identifiers
+     */
+    getHeadings(identifiers) {
+        return this.http
+            .get(`${this.config.api_url}/get-headings.php`, {
+            params: {
+                identifier: identifiers.join(','),
+            },
+        })
+            .pipe(map((response) => {
+            const headings = [];
+            if ((response.records !== undefined) &&
+                (response.records.length > 0)) {
+                for (const heading_record of response.records) {
+                    headings.push(this.processHeadingRecord(heading_record));
+                }
+            }
+            return headings;
+        }));
+    }
+    /**
+     * Processes media article record
+     *
+     * @param record Record from eSolve instance
+     */
     processMediaRecord(record) {
         const tags = [];
         const topics = [];
@@ -1318,26 +1451,34 @@ class EsolveMediaService {
         }
         return new EsolveMediaArticle(record.identifier, record.title, record.article, record.image_url, tags, topics, record.seo_page_title, record.seo_keywords, record.seo_description);
     }
+    /**
+     * Processes media heading record
+     *
+     * @param record Record from eSolve instance
+     */
+    processHeadingRecord(record) {
+        return new EsolveHeading(record.identifier, record.value);
+    }
     /**
      * Retrieves media records from eSolve instance.
-     * @param params Header params
+     *
+     * @param params HTTP params
      */
     getMediaRecords(params) {
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-media.php`, { params });
+        return this.http.get(`${this.config.api_url}/get-media.php`, { params });
     }
 }
-EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMediaService, decorators: [{
+EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveNewsGroup {
     constructor(id, name, description, sef_name) {
@@ -1389,18 +1530,11 @@ class EsolveNewsService {
         this.config = config;
         this.http = http;
     }
-    getNewsRecords(params) {
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-news.php`, { params });
-    }
     getNewsArticle(identifier) {
-        const params = new HttpParams({
-            fromObject: {
-                sef_title: identifier
-            }
-        });
+        const params = new HttpParams({ fromObject: { sef_title: identifier } });
         return this.getNewsRecords(params).pipe(map(response => {
-            if ((response.records === undefined) || (response.records.length <= 0)) {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
                 throw response;
             }
             const newsRecord = response.records[0];
@@ -1451,9 +1585,9 @@ class EsolveNewsService {
         }));
     }
     getNewsGroups() {
-        let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-news-groups.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-news-groups.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -1468,18 +1602,21 @@ class EsolveNewsService {
         const author = new EsolveNewsArticleAuthor(newsRecord.user.userid, newsRecord.user.email, newsRecord.user.firstname, newsRecord.user.surname);
         return new EsolveNewsArticle(newsRecord.id, newsRecord.title, newsRecord.sef_title, newsRecord.article, newsRecord.short_description, newsRecord.txdate, newsRecord.active, newsRecord.image, newsRecord.featured, author, newsRecord.seo_page_title, newsRecord.seo_keywords);
     }
+    getNewsRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-news.php`, { params });
+    }
 }
-EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveNewsService, decorators: [{
+EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveBanner {
     constructor(id, banner_display_container, identifier, type, title, article, sort_priority, link, images) {
@@ -1541,10 +1678,7 @@ class EsolveBannerService {
      */
     getBanners(identifier, banner_display_container, enable_date_filter = false) {
         let params = new HttpParams({
-            fromObject: {
-                ws_id: this.config.wsid,
-                enable_date_filter
-            }
+            fromObject: { enable_date_filter }
         });
         if (identifier) {
             params = params.set('identifier', identifier);
@@ -1552,7 +1686,9 @@ class EsolveBannerService {
         if (banner_display_container) {
             params = params.set('banner_display_container', banner_display_container);
         }
-        return this.http.get(`${this.config.api_url}/service/get-banners.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-banners.php`, { params })
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -1612,17 +1748,17 @@ class EsolveBannerService {
         return banners;
     }
 }
-EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveBannerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveBannerService, decorators: [{
+EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveBannerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveMenuItem {
     constructor(url, name, target, children = []) {
@@ -1639,10 +1775,9 @@ class EsolveMenuService {
         this.http = http;
     }
     getMenuTree(identifier) {
-        let menuParams = new HttpParams();
-        menuParams = menuParams.set('identifier', identifier);
-        menuParams = menuParams.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-menu-tree.php`, { params: menuParams }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-menu-tree.php`, { params: { identifier } })
+            .pipe(map((response) => {
             if ((!response) || (response.records === undefined)) {
                 throw response;
             }
@@ -1662,17 +1797,17 @@ class EsolveMenuService {
         return menu;
     }
 }
-EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveMenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMenuService, decorators: [{
+EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveTopicService {
     constructor(config, http) {
@@ -1686,15 +1821,11 @@ class EsolveTopicService {
      * @param topic_id_list List of topic ID's that need to be retrieved
      */
     getTopics(topic_id_list = []) {
-        let params = new HttpParams({
-            fromObject: {
-                ws_id: this.config.wsid
-            }
-        });
+        let params = new HttpParams();
         if (topic_id_list.length > 0) {
             params = params.append('topic_id', topic_id_list.join(','));
         }
-        return this.http.get(`${this.config.api_url}/service/get-topics.php`, { params }).pipe(map(response => {
+        return this.http.get(`${this.config.api_url}/get-topics.php`, { params }).pipe(map(response => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -1712,9 +1843,9 @@ class EsolveTopicService {
         return topics;
     }
 }
-EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveTopicService, decorators: [{
+EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1722,7 +1853,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveStockBadge {
     constructor(id, text, identifier, font_colour, badge_colour, sort_priority) {
@@ -1820,6 +1951,10 @@ class EsolveStockItem {
      * Short description of stock item
      */
     description, 
+    /**
+     * Full description of stock item
+     */
+    extended_description, 
     /**
      * Active state
      */
@@ -1861,6 +1996,7 @@ class EsolveStockItem {
         this.name = name;
         this.sef_name = sef_name;
         this.description = description;
+        this.extended_description = extended_description;
         this.active = active;
         this.featured = featured;
         this.image_name = image_name;
@@ -1923,40 +2059,6 @@ class EsolveStockService {
         this.config = config;
         this.http = http;
     }
-    /**
-     * Processes the eSolve stock item record and converts it to StockItem object.
-     * @param record eSolve stock item record
-     */
-    processStockItem(record) {
-        const tags = [];
-        const topics = [];
-        const badges = [];
-        if ((record.tags) && (record.tags.length > 0)) {
-            for (const tag of record.tags) {
-                tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
-            }
-        }
-        if ((record.topics) && (record.topics.length > 0)) {
-            for (const topic of record.topics) {
-                topics.push(new EsolveTopic(+topic.id, topic.name, topic.short_description, +topic.sort_priority));
-            }
-        }
-        if ((record.badges) && (record.badges.length > 0)) {
-            for (const badge of record.badges) {
-                badges.push(new EsolveStockBadge(+badge.id, badge.text, badge.identifier, badge.font_colour, badge.badge_colour, +badge.sort_priority));
-            }
-        }
-        const price = new EsolveStockPrice(record.regular_sellprice, record.regular_sellprice_inclusive, record.sellprice, record.sellprice_inclusive);
-        return new EsolveStockItem(+record.id, record.code, record.name, record.sef_name, record.description, !!+record.is_active, !!+record.is_featured, record.image_name, price, tags, topics, badges, record.category_id, +record.subcategory_id, record.seo_page_title, record.seo_keywords);
-    }
-    /**
-     * Retrieves stock records from HTTP params.
-     * @param params HTTP client parameters
-     */
-    getStockRecords(params) {
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-items.php`, { params });
-    }
     /**
      * Retrieves the stock record from the eSolve instance using the code.
      * @param code eSolve stock code
@@ -2041,18 +2143,51 @@ class EsolveStockService {
             return new EsolveStockItemList(stockItems, +response.additional_data.total_records, options.page ?? 0);
         }));
     }
+    /**
+     * Processes the eSolve stock item record and converts it to StockItem object.
+     * @param record eSolve stock item record
+     */
+    processStockItem(record) {
+        const tags = [];
+        const topics = [];
+        const badges = [];
+        if ((record.tags) && (record.tags.length > 0)) {
+            for (const tag of record.tags) {
+                tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
+            }
+        }
+        if ((record.topics) && (record.topics.length > 0)) {
+            for (const topic of record.topics) {
+                topics.push(new EsolveTopic(+topic.id, topic.name, topic.short_description, +topic.sort_priority));
+            }
+        }
+        if ((record.badges) && (record.badges.length > 0)) {
+            for (const badge of record.badges) {
+                badges.push(new EsolveStockBadge(+badge.id, badge.text, badge.identifier, badge.font_colour, badge.badge_colour, +badge.sort_priority));
+            }
+        }
+        const price = new EsolveStockPrice(record.regular_sellprice, record.regular_sellprice_inclusive, record.sellprice, record.sellprice_inclusive);
+        return new EsolveStockItem(+record.id, record.code, record.name, record.sef_name, record.description, record.extended_description, !!+record.is_active, !!+record.is_featured, record.image_name, price, tags, topics, badges, record.category_id, +record.subcategory_id, record.seo_page_title, record.seo_keywords);
+    }
+    /**
+     * Retrieves stock records from HTTP params.
+     * @param params HTTP client parameters
+     */
+    getStockRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-items.php`, { params });
+    }
 }
-EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveStockService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveStockService, decorators: [{
+EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveStockService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveCategoryTreeItem {
     constructor(type, esolve_id, parent_id, description, sef_description, short_description, sort_priority, active, display_only, image_name, seo_title, seo_keywords, seo_description, children) {
@@ -2110,9 +2245,9 @@ class EsolveCategoryTreeService {
      * Retrieves the category tree from eSolve instance and coverts it to the correct format.
      */
     getCategoryTree() {
-        let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-tree.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-tree.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2120,7 +2255,9 @@ class EsolveCategoryTreeService {
         }));
     }
     /**
-     * Retrieve the details of a category tree item from the eSolve instance and converts it to the correct format.
+     * Retrieve the details of a category tree item from the eSolve instance and
+     * converts it to the correct format.
+     *
      * @param options Filter options
      */
     getCategoryTreeItem(options) {
@@ -2145,16 +2282,18 @@ class EsolveCategoryTreeService {
         }
         if (type && (esolve_id || sef_description)) {
             let params = new HttpParams();
-            params = params.set('ws_id', this.config.wsid.toString());
-            params = params.set('type', type.toString());
+            params = params.set('type', type);
             if (esolve_id) {
-                params = params.set('id', esolve_id.toString());
+                params = params.set('id', esolve_id);
             }
             if (sef_description) {
-                params = params.set('sef_description', sef_description.toString());
+                params = params.set('sef_description', sef_description);
             }
-            return this.http.get(`${this.config.api_url}/service/get-tree-item.php`, { params }).pipe(map(response => {
-                if ((response.records === undefined) || (response.records.length <= 0)) {
+            return this.http
+                .get(`${this.config.api_url}/get-tree-item.php`, { params })
+                .pipe(map((response) => {
+                if ((response.records === undefined) ||
+                    (response.records.length <= 0)) {
                     throw response;
                 }
                 return this.processTreeItem(response.records[0]);
@@ -2164,6 +2303,7 @@ class EsolveCategoryTreeService {
     }
     /**
      * Processes the eSolve tree records and converts them into the correct format.
+     *
      * @param tree_records Records to process
      */
     processTree(tree_records) {
@@ -2207,17 +2347,17 @@ class EsolveCategoryTreeService {
         return null;
     }
 }
-EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
+EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveCheckoutResult extends EsolveResponseResult {
     constructor(response) {
@@ -2343,14 +2483,13 @@ class EsolveCartService {
     }
     /**
      * Retrieves the current cart
+     *
      * @returns An `Observable` with an array of cart items
      */
     getCart() {
-        return this.http.get(`${this.config.api_url}/service/get-cart.php`, {
-            params: {
-                ws_id: this.config.wsid
-            }
-        }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-cart.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2359,6 +2498,7 @@ class EsolveCartService {
     }
     /**
      * Updates the cart by preforming various actions, such as adding, editing or removing items from the cart.
+     *
      * @param items An array of options to update the cart
      * @param action The default action to preform
      * @returns An `Observable` with an array of responses that gives feedback on the requested changes
@@ -2368,16 +2508,15 @@ class EsolveCartService {
             items,
             action
         };
-        return this.http.post(`${this.config.api_url}/service/set-cart-item.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-cart-item.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
             observe: 'body'
-        }).pipe(map(response => {
+        })
+            .pipe(map(response => {
             if (response.responses === undefined) {
                 throw response;
             }
@@ -2386,14 +2525,13 @@ class EsolveCartService {
     }
     /**
      * Retrieves the totals of the cart with all the totals calculated
+     *
      * @returns An `Observable` with an object containing cart totals
      */
     getTotals() {
-        return this.http.get(`${this.config.api_url}/service/get-cart-totals.php`, {
-            params: {
-                ws_id: this.config.wsid
-            }
-        }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-cart-totals.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2402,14 +2540,13 @@ class EsolveCartService {
     }
     /**
      * Retrieves a tracking code for the cart
+     *
      * @returns An `Observable` with the cart tracking code
      */
     getTrackingCode() {
-        return iif(() => this._cached_tracking > 0, of(this._cached_tracking), this.http.get(`${this.config.api_url}/service/get-checkout-tracking.php`, {
-            params: {
-                ws_id: this.config.wsid
-            }
-        }).pipe(map(response => {
+        return iif(() => this._cached_tracking > 0, of(this._cached_tracking), this.http
+            .get(`${this.config.api_url}/get-checkout-tracking.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2419,6 +2556,7 @@ class EsolveCartService {
     }
     /**
      * Initiates checkout of the cart items
+     *
      * @param type The cart type that needs to be checked out
      * @param addresses_id The ID of the delivery address
      * @param shipping_id The ID of the shipping method
@@ -2442,16 +2580,15 @@ class EsolveCartService {
                 throw tracking;
             }
             body.tracking = tracking;
-            return this.http.post(`${this.config.api_url}/service/set-checkout.php`, body, {
+            return this.http
+                .post(`${this.config.api_url}/set-checkout.php`, body, {
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
                 },
-                params: {
-                    ws_id: this.config.wsid
-                },
                 responseType: 'json',
                 observe: 'body'
-            }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            })
+                .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
                 this._cached_tracking = 0;
                 return new EsolveCheckoutResult(response);
             })), catchError((errorRes) => {
@@ -2460,7 +2597,8 @@ class EsolveCartService {
         }));
     }
     /**
-     * Processes the eSolve tree records.
+     * Processes the eSolve tree records
+     *
      * @param cart_item_records Records to process
      * @returns An array of processed cart items
      */
@@ -2476,6 +2614,7 @@ class EsolveCartService {
     }
     /**
      * Processes the eSolve cart totals
+     *
      * @param record Data to process
      * @returns Processed cart totals
      */
@@ -2484,17 +2623,17 @@ class EsolveCartService {
         return cart_totals;
     }
 }
-EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCartService, decorators: [{
+EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+                }] }, { type: i1$2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
 
 class EsolveVaultItemResult extends EsolveResponseResult {
     constructor(response) {
@@ -2608,61 +2747,15 @@ class EsolvePaymentService {
         this.errorHandler = errorHandler;
         this.responseHandler = responseHandler;
     }
-    /**
-     * Processes the eSolve payment method records.
-     * @param records Records to process
-     * @returns An array of processed payment methods.
-     */
-    processPaymentMethods(records) {
-        const payment_methods = [];
-        if (records) {
-            for (const record of records) {
-                const payment_method = new EsolvePaymentMethod(record);
-                payment_methods.push(payment_method);
-            }
-        }
-        return payment_methods;
-    }
-    /**
-     * Processes the eSolve vault records.
-     * @param records Records to process
-     * @returns An array of processed vault items (a.k.a. cards)
-     */
-    processVaultItems(records) {
-        const vault = [];
-        if (records) {
-            for (const record of records) {
-                const vault_item = new EsolveVaultItem(+record.id, +record.payment_methods_id, record.last4, record.brand, record.expiry_timestamp);
-                vault.push(vault_item);
-            }
-        }
-        return vault;
-    }
-    generateExpiry(card_data) {
-        const month_string = card_data.expiry_month.padStart(2, '0');
-        const year_string = card_data.expiry_year.padStart(4, '0');
-        return `${month_string}${year_string}`;
-    }
     /**
      * Retrieves a list of payment methods.
      * @param options Filter options
      * @returns An `Observable` with an array of payment methods
      */
     getPaymentMethods(options) {
-        let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
-        if (options) {
-            if (typeof options.live !== 'undefined') {
-                params = params.set('live', options.live);
-            }
-            if (typeof options.location_id !== 'undefined') {
-                params = params.set('location_id', options.location_id);
-            }
-            if (typeof options.is_gateway !== 'undefined') {
-                params = params.set('is_gateway', options.is_gateway);
-            }
-        }
-        return this.http.get(`${this.config.api_url}/service/get-payment-methods.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-payment-methods.php`, { params: { ...options } })
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2676,11 +2769,12 @@ class EsolvePaymentService {
      */
     getVault(payment_methods_id) {
         let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
         if (typeof payment_methods_id !== 'undefined') {
             params = params.set('payment_methods_id', payment_methods_id);
         }
-        return this.http.get(`${this.config.api_url}/service/get-vault.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-vault.php`, { params })
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2703,28 +2797,26 @@ class EsolvePaymentService {
                 card_expiry: this.generateExpiry(card_data)
             }
         };
-        return this.http.post(`${this.config.api_url}/service/set-vault.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-vault.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
-            observe: 'body'
-        }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveVaultItemResult(response))), catchError((errorRes) => {
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveVaultItemResult(response))), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-vault', errorRes);
         }));
     }
     deleteVaultItem(id) {
-        return this.http.delete(`${this.config.api_url}/service/delete-vault.php`, {
-            params: {
-                ws_id: this.config.wsid,
-                id: id
-            },
+        return this.http
+            .delete(`${this.config.api_url}/delete-vault.php`, {
+            params: { id },
             responseType: 'json',
-            observe: 'body'
-        }).pipe(map(http_response => {
+            observe: 'body',
+        })
+            .pipe(map((http_response) => {
             if ((http_response.result === undefined) ||
                 (http_response.result === null) ||
                 (http_response.result.status !== 'success')) {
@@ -2736,7 +2828,9 @@ class EsolvePaymentService {
         }));
     }
     /**
-     * Sets the payment for the specified transaction using selected payment method.
+     * Sets the payment for the specified transaction using selected payment
+     * method.
+     *
      * @param transaction_id eSolve ID to the transaction
      * @param payment_methods_id eSolve ID to the selected payment method
      * @param card ID of selected card from the vault or information to a brand new card
@@ -2760,31 +2854,65 @@ class EsolvePaymentService {
                 card_expiry: this.generateExpiry(card)
             };
         }
-        return this.http.post(`${this.config.api_url}/service/set-payment.php`, body, {
+        return this.http
+            .post(`${this.config.api_url}/set-payment.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
-            params: {
-                ws_id: this.config.wsid
-            },
             responseType: 'json',
-            observe: 'body'
-        }).pipe(map(http_response => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolvePaymentResult(response))), catchError((errorRes) => {
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolvePaymentResult(response))), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-payment', errorRes);
         }));
     }
+    /**
+     * Processes the eSolve payment method records.
+     * @param records Records to process
+     * @returns An array of processed payment methods.
+     */
+    processPaymentMethods(records) {
+        const payment_methods = [];
+        if (records) {
+            for (const record of records) {
+                const payment_method = new EsolvePaymentMethod(record);
+                payment_methods.push(payment_method);
+            }
+        }
+        return payment_methods;
+    }
+    /**
+     * Processes the eSolve vault records.
+     * @param records Records to process
+     * @returns An array of processed vault items (a.k.a. cards)
+     */
+    processVaultItems(records) {
+        const vault = [];
+        if (records) {
+            for (const record of records) {
+                const vault_item = new EsolveVaultItem(+record.id, +record.payment_methods_id, record.last4, record.brand, record.expiry_timestamp);
+                vault.push(vault_item);
+            }
+        }
+        return vault;
+    }
+    generateExpiry(card_data) {
+        const month_string = card_data.expiry_month.padStart(2, '0');
+        const year_string = card_data.expiry_year.padStart(4, '0');
+        return `${month_string}${year_string}`;
+    }
 }
-EsolvePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolvePaymentService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolvePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolvePaymentService, decorators: [{
+EsolvePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolvePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+                }] }, { type: i1$2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
 
 class EsolveShippingMethod {
     constructor(id, carrier_name, delivery_category, description, location, pricing, link_to_carrier_website, days_to_deliver, shipping_cost_calculation_method, insurance_cost_calculation_method, insurance_cost_percentage, metric_factor, allow_immediate_payment_processing, allow_postal_address, allow_physical_address, client_to_collect, is_default, location_id, use_zones, min_distance, max_distance, shipping_surge_condition, shipping_surge_percentage, sort_priority, shipping_group, shipping_slot_identifier, shipping_slot_delay_hours, image_url) {
@@ -2842,37 +2970,12 @@ class EsolveShippingService {
         this.config = config;
         this.http = http;
     }
-    /**
-     * Processes the eSolve shipping method records.
-     * @param records Records to process
-     * @returns An array of processed shipping methods
-     */
-    processShippingMethods(records) {
-        const shipping_methods = [];
-        if (records) {
-            for (const record of records) {
-                const shipping_method = new EsolveShippingMethod(+record.id, record.carrier_name, record.delivery_category, record.description, record.location, record.pricing, record.link_to_carrier_website, +record.days_to_deliver, record.shipping_cost_calculation_method, record.insurance_cost_calculation_method, +record.insurance_cost_percentage, +record.metric_factor, record.allow_immediate_payment_processing, record.allow_postal_address, record.allow_physical_address, record.client_to_collect, record.is_default_shipping_method, +record.location_id, record.use_zones, +record.min_distance, +record.max_distance, +record.shipping_surge_condition, +record.shipping_surge_percentage, +record.sort_priority, record.shipping_group, record.shipping_slot_identifier, +record.shipping_slot_delay_hours, record.image_url);
-                shipping_methods.push(shipping_method);
-            }
-        }
-        return shipping_methods;
-    }
-    /**
-     * Processes the eSolve shipping costs record.
-     * @param record Data to process
-     * @returns Processed shipping costs
-     */
-    processShippingCost(record) {
-        const shipping_cost = new EsolveShippingCost(+record.shipping_total, +record.vat_on_shipping, +record.total_saving_on_shipping, +record.insurance_total, +record.vat_on_insurance, +record.total_saving_on_insurance);
-        return shipping_cost;
-    }
     /**
      * Retrieves a list of shipping methods
      * @returns An `Observable` with an array of shipping methods
      */
     getShippingMethods(options) {
         let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
         if (options) {
             if (typeof options.addresses_id !== 'undefined') {
                 params = params.set('addresses_id', options.addresses_id);
@@ -2881,7 +2984,7 @@ class EsolveShippingService {
                 params = params.set('location_id', options.location_id);
             }
         }
-        return this.http.get(`${this.config.api_url}/service/get-shipping-methods.php`, { params }).pipe(map(response => {
+        return this.http.get(`${this.config.api_url}/get-shipping-methods.php`, { params }).pipe(map(response => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2896,23 +2999,24 @@ class EsolveShippingService {
     getShippingCost(shipping_id, addresses_id, location_id) {
         try {
             let params = new HttpParams();
-            params = params.set('ws_id', this.config.wsid);
-            if (typeof shipping_id !== 'undefined') {
-                params = params.set('shipping_id', shipping_id);
+            if (typeof shipping_id === 'undefined') {
+                throw new Error('Shipping ID is required');
             }
             else {
-                throw new Error('Shipping ID is required');
+                params = params.set('shipping_id', shipping_id);
             }
-            if (typeof addresses_id !== 'undefined') {
-                params = params.set('addresses_id', addresses_id);
+            if (typeof addresses_id === 'undefined') {
+                throw new Error('Address ID is required');
             }
             else {
-                throw new Error('Address ID is required');
+                params = params.set('addresses_id', addresses_id);
             }
             if (typeof location_id !== 'undefined') {
                 params = params.set('location_id', location_id);
             }
-            return this.http.get(`${this.config.api_url}/service/get-shipping-cost.php`, { params }).pipe(map(response => {
+            return this.http
+                .get(`${this.config.api_url}/get-shipping-cost.php`, { params })
+                .pipe(map((response) => {
                 if (response.records === undefined) {
                     throw response;
                 }
@@ -2923,18 +3027,42 @@ class EsolveShippingService {
             return throwError(err);
         }
     }
+    /**
+     * Processes the eSolve shipping method records.
+     * @param records Records to process
+     * @returns An array of processed shipping methods
+     */
+    processShippingMethods(records) {
+        const shipping_methods = [];
+        if (records) {
+            for (const record of records) {
+                const shipping_method = new EsolveShippingMethod(+record.id, record.carrier_name, record.delivery_category, record.description, record.location, record.pricing, record.link_to_carrier_website, +record.days_to_deliver, record.shipping_cost_calculation_method, record.insurance_cost_calculation_method, +record.insurance_cost_percentage, +record.metric_factor, record.allow_immediate_payment_processing, record.allow_postal_address, record.allow_physical_address, record.client_to_collect, record.is_default_shipping_method, +record.location_id, record.use_zones, +record.min_distance, +record.max_distance, +record.shipping_surge_condition, +record.shipping_surge_percentage, +record.sort_priority, record.shipping_group, record.shipping_slot_identifier, +record.shipping_slot_delay_hours, record.image_url);
+                shipping_methods.push(shipping_method);
+            }
+        }
+        return shipping_methods;
+    }
+    /**
+     * Processes the eSolve shipping costs record.
+     * @param record Data to process
+     * @returns Processed shipping costs
+     */
+    processShippingCost(record) {
+        const shipping_cost = new EsolveShippingCost(+record.shipping_total, +record.vat_on_shipping, +record.total_saving_on_shipping, +record.insurance_total, +record.vat_on_insurance, +record.total_saving_on_insurance);
+        return shipping_cost;
+    }
 }
-EsolveShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveShippingService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveShippingService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveShippingService, decorators: [{
+EsolveShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 class EsolveLocationsService {
     constructor(config, http) {
@@ -2943,12 +3071,13 @@ class EsolveLocationsService {
     }
     /**
      * Retrieves a list of stock locations
+     *
      * @returns An `Observable` with an array of stock locations
      */
     getStockLocations() {
-        let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-locations.php`, { params }).pipe(map(response => {
+        return this.http
+            .get(`${this.config.api_url}/get-locations.php`)
+            .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
@@ -2957,6 +3086,7 @@ class EsolveLocationsService {
     }
     /**
      * Processes the eSolve stock location records.
+     *
      * @param records Records to process
      * @returns An array of processed stock location records
      */
@@ -2970,17 +3100,17 @@ class EsolveLocationsService {
         return stock_locations;
     }
 }
-EsolveLocationsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveLocationsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveLocationsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveLocationsService, decorators: [{
+EsolveLocationsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveLocationsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.HttpClient }]; } });
+                }] }, { type: i1$2.HttpClient }]; } });
 
 /*
  * Public API Surface of ng-esolve-connect
@@ -2990,5 +3120,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveErrorHandlerService, EsolveHttpError, EsolveList, EsolveLocationsService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockLocationAddress, EsolveStockLocationContactInfo, EsolveStockLocationPOBoxAddress, EsolveStockLocationTradingTimes, EsolveStockLocationTradingTimesDay, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
+export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveCookieService, EsolveErrorHandlerService, EsolveHeading, EsolveHttpError, EsolveList, EsolveLocationsService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockLocationAddress, EsolveStockLocationContactInfo, EsolveStockLocationPOBoxAddress, EsolveStockLocationTradingTimes, EsolveStockLocationTradingTimesDay, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
 //# sourceMappingURL=esolve-ng-esolve-connect.mjs.map