@colijnit/ioneconnector 3.1.10 → 3.1.11

package/build/connector.d.ts

@@ -15,7 +15,6 @@ export declare class Connector {
     connect(): Promise<boolean>;
     hasSession(): boolean;
     logIn(request: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
-    logInByKeycloakCode(code: string, uri: string): Promise<LoginResponse>;
     confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
     resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
     changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;

package/build/connector.js

@@ -30,9 +30,6 @@ class Connector {
     async logIn(request, encrypt = true) {
         return this.connection.login(request, encrypt);
     }
-    async logInByKeycloakCode(code, uri) {
-        return this.connection.logInByKeycloakCode(code, uri);
-    }
     async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
         return this.connection.confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA);
     }
@@ -58,7 +55,7 @@ class Connector {
         return this.connection.getPublicKey();
     }
     async call(method, data, showLoader, service, endPoint, ownMessage) {
-        return await this.connection.call(method, data, showLoader, service, endPoint, ownMessage);
+        return await this.connection.call(method, data, showLoader, service, endPoint, false, ownMessage);
     }
     _handleConnectionReset() {
         this.connectionResetInactivity.next();

package/build/connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}

package/build/connector.unit.test.js

@@ -8,8 +8,8 @@ const optionsPrivate = {
     schema: '815',
     version: '252',
     useLoginEncryption: true,
-    username: 'gast3',
-    password: 'gast3'
+    username: 'patrick',
+    password: 'vankeulen1234567890!'
 };
 const optionsPrivateEmpty = {
     url: 'http://localhost:8080/ione',
@@ -20,14 +20,21 @@ const optionsPublic = {
     schema: '815',
     version: '252'
 };
+const optionsKeycloak = {
+    url: 'http://130.62.7.57:8894/ione-branch/',
+    schema: '815',
+    version: '253'
+};
 describe("Connector", () => {
     let connectorPrivate;
     let connectorPrivateEmpty;
     let connectorPublic;
+    let connectorKeycloak;
     beforeEach(() => {
         connectorPrivate = new connector_1.Connector(optionsPrivate);
         connectorPrivateEmpty = new connector_1.Connector(optionsPrivateEmpty);
         connectorPublic = new connector_1.Connector(optionsPublic);
+        connectorKeycloak = new connector_1.Connector(optionsKeycloak);
     });
     it('shouldReturnSomeDataPrivateMode', async () => {
         const data = {
@@ -94,5 +101,9 @@ describe("Connector", () => {
         const response = await connectorPrivateEmpty.logOut();
         expect(response.validationResult.success).toBeTruthy();
     });
+    it('connect', async () => {
+        const success = await connectorKeycloak.connect();
+        expect(success).toBeTruthy();
+    });
 });
 //# sourceMappingURL=connector.unit.test.js.map

package/build/connector.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"connector.unit.test.js","sourceRoot":"","sources":["../src/connector.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connector.unit.test.js","sourceRoot":"","sources":["../src/connector.unit.test.ts"],"names":[],"mappings":"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"}

package/build/enum/backend-language-code.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum BackendLanguageCode {
+    Dutch = "nl",
+    English = "en",
+    German = "de",
+    French = "fr"
+}

package/build/enum/backend-language-code.enum.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BackendLanguageCode = void 0;
+var BackendLanguageCode;
+(function (BackendLanguageCode) {
+    BackendLanguageCode["Dutch"] = "nl";
+    BackendLanguageCode["English"] = "en";
+    BackendLanguageCode["German"] = "de";
+    BackendLanguageCode["French"] = "fr";
+})(BackendLanguageCode = exports.BackendLanguageCode || (exports.BackendLanguageCode = {}));
+//# sourceMappingURL=backend-language-code.enum.js.map

package/build/enum/backend-language-code.enum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backend-language-code.enum.js","sourceRoot":"","sources":["../../src/enum/backend-language-code.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC3B,mCAAY,CAAA;IACZ,qCAAc,CAAA;IACd,oCAAa,CAAA;IACb,oCAAa,CAAA;AACjB,CAAC,EALW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAK9B"}

package/build/enum/language-code.enum.d.ts

@@ -0,0 +1,7 @@
+export declare enum LanguageCode {
+    Dutch = "nl-NL",
+    English = "en-GB",
+    German = "de-DE",
+    French = "fr-FR",
+    Russian = "ru-RU"
+}

package/build/enum/language-code.enum.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LanguageCode = void 0;
+var LanguageCode;
+(function (LanguageCode) {
+    LanguageCode["Dutch"] = "nl-NL";
+    LanguageCode["English"] = "en-GB";
+    LanguageCode["German"] = "de-DE";
+    LanguageCode["French"] = "fr-FR";
+    LanguageCode["Russian"] = "ru-RU";
+})(LanguageCode = exports.LanguageCode || (exports.LanguageCode = {}));
+//# sourceMappingURL=language-code.enum.js.map

package/build/enum/language-code.enum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"language-code.enum.js","sourceRoot":"","sources":["../../src/enum/language-code.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,YAMX;AAND,WAAY,YAAY;IACpB,+BAAe,CAAA;IACf,iCAAiB,CAAA;IACjB,gCAAgB,CAAA;IAChB,gCAAgB,CAAA;IAChB,iCAAiB,CAAA;AACrB,CAAC,EANW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAMvB"}

package/build/enum/public-service-method.enum.d.ts

@@ -1,3 +1,5 @@
 export declare enum PublicServiceMethod {
-    GetPublicKey = "getPublicKey"
+    GetPublicKey = "getPublicKey",
+    GetKeycloakParams = "getKeycloakParams",
+    Companies = "companies"
 }

package/build/enum/public-service-method.enum.js

@@ -4,5 +4,7 @@ exports.PublicServiceMethod = void 0;
 var PublicServiceMethod;
 (function (PublicServiceMethod) {
     PublicServiceMethod["GetPublicKey"] = "getPublicKey";
+    PublicServiceMethod["GetKeycloakParams"] = "getKeycloakParams";
+    PublicServiceMethod["Companies"] = "companies";
 })(PublicServiceMethod = exports.PublicServiceMethod || (exports.PublicServiceMethod = {}));
 //# sourceMappingURL=public-service-method.enum.js.map

package/build/enum/public-service-method.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/public-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC3B,oDAA6B,CAAA;AACjC,CAAC,EAFW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAE9B"}
+{"version":3,"file":"public-service-method.enum.js","sourceRoot":"","sources":["../../src/enum/public-service-method.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,oDAA6B,CAAA;IAC7B,8DAAuC,CAAA;IACvC,8CAAuB,CAAA;AAC3B,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B"}

package/build/interface/login-storage-data.interface.d.ts

@@ -6,4 +6,5 @@ export interface LoginStorageData {
     windowId?: number;
     accessToken?: string;
     refreshToken?: string;
+    tokenExp?: number;
 }

package/build/model/company.bo.d.ts

@@ -0,0 +1,9 @@
+import { BusinessObject } from './business-object';
+export declare class Company extends BusinessObject {
+    upId: number;
+    description: string;
+    realmId: string;
+    clientId: string;
+    constructor();
+    getId(): number;
+}

package/build/model/company.bo.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Company = void 0;
+const business_object_1 = require("./business-object");
+class Company extends business_object_1.BusinessObject {
+    constructor() {
+        super();
+    }
+    getId() {
+        return this.upId;
+    }
+}
+exports.Company = Company;
+//# sourceMappingURL=company.bo.js.map

package/build/model/company.bo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"company.bo.js","sourceRoot":"","sources":["../../src/model/company.bo.ts"],"names":[],"mappings":";;;AAAA,uDAAiD;AAEjD,MAAa,OAAQ,SAAQ,gCAAc;IAMvC;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;CACJ;AAbD,0BAaC"}

package/build/model/ione-local-storage-root-object.d.ts

@@ -0,0 +1,5 @@
+import { LoginStorageData } from '../interface/login-storage-data.interface';
+export declare class IoneLocalStorageRootObject {
+    savedLoginData: Partial<LoginStorageData>;
+    keycloakState: string;
+}

package/build/model/ione-local-storage-root-object.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IoneLocalStorageRootObject = void 0;
+class IoneLocalStorageRootObject {
+    constructor() {
+        this.savedLoginData = {};
+    }
+}
+exports.IoneLocalStorageRootObject = IoneLocalStorageRootObject;
+//# sourceMappingURL=ione-local-storage-root-object.js.map

package/build/model/ione-local-storage-root-object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ione-local-storage-root-object.js","sourceRoot":"","sources":["../../src/model/ione-local-storage-root-object.ts"],"names":[],"mappings":";;;AAEA,MAAa,0BAA0B;IAAvC;QACW,mBAAc,GAA8B,EAAE,CAAC;IAE1D,CAAC;CAAA;AAHD,gEAGC"}

package/build/model/keycloak-parameters.bo.d.ts

@@ -0,0 +1,5 @@
+import { BusinessObject } from './business-object';
+export declare class KeycloakParameters extends BusinessObject {
+    isIdentityServerEnabled: boolean;
+    keycloakUrl: string;
+}

package/build/model/keycloak-parameters.bo.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeycloakParameters = void 0;
+const business_object_1 = require("./business-object");
+class KeycloakParameters extends business_object_1.BusinessObject {
+}
+exports.KeycloakParameters = KeycloakParameters;
+//# sourceMappingURL=keycloak-parameters.bo.js.map

package/build/model/keycloak-parameters.bo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keycloak-parameters.bo.js","sourceRoot":"","sources":["../../src/model/keycloak-parameters.bo.ts"],"names":[],"mappings":";;;AAAA,uDAAiD;AAGjD,MAAa,kBAAmB,SAAQ,gCAAc;CAGrD;AAHD,gDAGC"}

package/build/model/options.d.ts

@@ -1,3 +1,4 @@
+import { LanguageCode } from '../enum/language-code.enum';
 export declare class Options {
     url?: string;
     version?: string;
@@ -15,8 +16,9 @@ export declare class Options {
     useArticleIds?: boolean;
     use3D?: boolean;
     useLoginEncryption?: boolean;
-    languageCode?: string;
+    languageCode?: LanguageCode;
     timeoutInMs?: number;
     jwtEnabled?: boolean;
+    jwtRefreshToken?: boolean;
     logoutWhenRefresh?: boolean;
 }

package/build/model/options.js

@@ -9,6 +9,7 @@ class Options {
         this.use3D = false;
         this.useLoginEncryption = false;
         this.jwtEnabled = false;
+        this.jwtRefreshToken = true;
         this.logoutWhenRefresh = true;
     }
 }

package/build/model/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;IAApB;QAaW,cAAS,GAAa,IAAI,CAAC;QAC3B,eAAU,GAAa,KAAK,CAAC;QAC7B,kBAAa,GAAa,KAAK,CAAC;QAChC,UAAK,GAAa,KAAK,CAAC;QACxB,uBAAkB,GAAa,KAAK,CAAC;QAGrC,eAAU,GAAa,KAAK,CAAC;QAC7B,sBAAiB,GAAa,IAAI,CAAC;IAC9C,CAAC;CAAA;AAtBD,0BAsBC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAApB;QAaW,cAAS,GAAa,IAAI,CAAC;QAC3B,eAAU,GAAa,KAAK,CAAC;QAC7B,kBAAa,GAAa,KAAK,CAAC;QAChC,UAAK,GAAa,KAAK,CAAC;QACxB,uBAAkB,GAAa,KAAK,CAAC;QAMrC,eAAU,GAAa,KAAK,CAAC;QAC7B,oBAAe,GAAa,IAAI,CAAC;QACjC,sBAAiB,GAAa,IAAI,CAAC;IAC9C,CAAC;CAAA;AA1BD,0BA0BC"}

package/build/model/server-response-data.d.ts

@@ -1,4 +1,5 @@
 import { ServerResponseException } from "./data-service-response-exception";
 import { IDataServiceResponseData } from "./data-service-response-data.interface";
 import { ILoginResponse } from "./login-response.interface";
-export type ServerResponseData = IDataServiceResponseData | ServerResponseException | ILoginResponse | string | boolean;
+import { KeycloakParameters } from './keycloak-parameters.bo';
+export type ServerResponseData = IDataServiceResponseData | ServerResponseException | ILoginResponse | string | boolean | KeycloakParameters;

package/build/model/session-storage-root-object.d.ts

@@ -1,4 +1,5 @@
 import { LoginStorageData } from '../interface/login-storage-data.interface';
 export declare class SessionStorageRootObject {
     loginData: LoginStorageData;
+    busy: boolean;
 }

package/build/model/session-storage-root-object.js

@@ -4,6 +4,7 @@ exports.SessionStorageRootObject = void 0;
 class SessionStorageRootObject {
     constructor() {
         this.loginData = {};
+        this.busy = false;
     }
 }
 exports.SessionStorageRootObject = SessionStorageRootObject;

package/build/model/session-storage-root-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-storage-root-object.js","sourceRoot":"","sources":["../../src/model/session-storage-root-object.ts"],"names":[],"mappings":";;;AAEA,MAAa,wBAAwB;IAArC;QACW,cAAS,GAAqB,EAAE,CAAC;IAC5C,CAAC;CAAA;AAFD,4DAEC"}
+{"version":3,"file":"session-storage-root-object.js","sourceRoot":"","sources":["../../src/model/session-storage-root-object.ts"],"names":[],"mappings":";;;AAEA,MAAa,wBAAwB;IAArC;QACW,cAAS,GAAqB,EAAE,CAAC;QACjC,SAAI,GAAY,KAAK,CAAC;IACjC,CAAC;CAAA;AAHD,4DAGC"}

package/build/provider/ajax.service.d.ts

@@ -1,19 +1,19 @@
-import { Options } from "../model/options";
-import { DataServiceData } from "../model/data-service-data";
-import { BaseBackendConnectionService } from "./base-backend-connection.service";
-import { ServerResponseData } from "../model/server-response-data";
+import { Options } from '../model/options';
+import { DataServiceData } from '../model/data-service-data';
+import { BaseBackendConnectionService } from './base-backend-connection.service';
+import { ServerResponseData } from '../model/server-response-data';
 import { PublicServiceRequestData } from '../model/public-service-request-data';
 import { LoginRequest } from '../model/login-request';
 import { LoginResponse } from '../model/login-response';
 export declare class AjaxService extends BaseBackendConnectionService {
     private _showLoaderRequests;
     private _timeout;
+    private _methodWithoutAccessToken;
     constructor(options: Options);
     connect(): Promise<boolean>;
     hasSession(): boolean;
-    call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, ownMessage?: {}): Promise<ServerResponseData>;
+    call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<ServerResponseData>;
     login(request: LoginRequest, encrypt: boolean): Promise<LoginResponse>;
-    logInByKeycloakCode(code: string, uri: string): Promise<LoginResponse>;
     confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
     resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
     changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
@@ -22,8 +22,11 @@ export declare class AjaxService extends BaseBackendConnectionService {
     getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
     getPublicKey(): Promise<string>;
     close(): Promise<ServerResponseData>;
-    private _createPublicSession;
-    private _doCall;
+    protected _doCall(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string, isPublicService?: boolean, ownMessage?: {}): Promise<ServerResponseData>;
+    private _methodNeedsAccessToken;
     private _waitForAccessToken;
     private setShowLoaderRequests;
+    private _redirectToIdentityServerRealm;
+    private _getParameter;
+    private _createGuid;
 }

package/build/provider/ajax.service.js

@@ -8,44 +8,79 @@ const url_utils_1 = require("../utils/url-utils");
 const datasession_service_method_enum_1 = require("../enum/datasession-service-method.enum");
 const end_point_enum_1 = require("../enum/end-point.enum");
 const login_status_enum_1 = require("../enum/login-status.enum");
+const public_service_method_enum_1 = require("../enum/public-service-method.enum");
+const login_service_method_enum_1 = require("../enum/login-service-method.enum");
 class AjaxService extends base_backend_connection_service_1.BaseBackendConnectionService {
     constructor(options) {
         super(options);
         this._showLoaderRequests = 0;
         this._timeout = 180000;
+        this._methodWithoutAccessToken = [
+            public_service_method_enum_1.PublicServiceMethod.GetKeycloakParams,
+            public_service_method_enum_1.PublicServiceMethod.Companies,
+            public_service_method_enum_1.PublicServiceMethod.GetPublicKey,
+            datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession,
+            datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession,
+            login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken
+        ];
         if (options && options.timeoutInMs) {
             this._timeout = options.timeoutInMs;
         }
     }
     async connect() {
-        if (this.usePublicToken) {
-            if (this.localStorageService.publicToken) {
-                return true;
-            }
-            return await this._createPublicSession();
+        await this.loginService.getKeycloakParams();
+        await this.loginService.getCompanies();
+        const keycloakCode = this._getParameter("code");
+        const keycloakState = this._getParameter("state");
+        if (keycloakCode && keycloakState) {
+            let url = window.location.href;
+            url = url.replace('#', '?');
+            const uri = url.split("?")[0];
+            window.history.replaceState(null, "", uri);
+            return this.loginService.loginByKeycloakCode(keycloakCode, keycloakState, uri);
         }
         else {
-            if (this.localStorageService.sessionId) {
-                return true;
+            if (this.loginService.keycloakParams.isIdentityServerEnabled) {
+                this._redirectToIdentityServerRealm();
             }
-            let response = await this.loginService.loginAndCreateDataSession();
-            if (typeof response !== 'boolean') {
-                response = response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS;
+            if (this.usePublicToken) {
+                if (this.localStorageService.publicToken) {
+                    return true;
+                }
+                const tokenResponse = await this.createPublicSession();
+                return tokenResponse !== null;
+            }
+            else {
+                if (this.localStorageService.sessionId) {
+                    return true;
+                }
+                let response = await this.loginService.loginAndCreateDataSession();
+                if (typeof response !== 'boolean') {
+                    response = response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS;
+                }
+                return response;
             }
-            return response;
         }
     }
     hasSession() {
         return this.localStorageService.sessionId !== undefined;
     }
-    async call(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService, ownMessage) {
+    async call(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
+        if (!service) {
+            if (!this.usePublicToken) {
+                service = backend_service_name_enum_1.BackendServiceName.LoginService;
+            }
+            else {
+                service = backend_service_name_enum_1.BackendServiceName.PublicService;
+            }
+        }
         if (this.usePublicToken || (service === backend_service_name_enum_1.BackendServiceName.PublicService ||
             service === backend_service_name_enum_1.BackendServiceName.LoginService ||
             service === backend_service_name_enum_1.BackendServiceName.DatasessionService)) {
-            return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
+            return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
         }
         else {
-            return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
+            return this._doCall(method, data, showLoader, service, endPoint, isPublicService, ownMessage);
         }
     }
     async login(request, encrypt) {
@@ -54,9 +89,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
             return response;
         }
     }
-    async logInByKeycloakCode(code, uri) {
-        return this.loginService.loginByKeycloakCode(code, uri);
-    }
     async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
         return this.loginService.confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA);
     }
@@ -80,26 +112,23 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
     }
     close() {
         if (this.usePublicToken) {
+            this.localStorageService.clear();
             this.localStorageService.setPublicToken(undefined);
-            return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {});
+            return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {}, false, backend_service_name_enum_1.BackendServiceName.PublicService);
         }
         else {
             return this.closeDataSession();
         }
     }
-    async _createPublicSession() {
-        const data = {
-            upId: this.schema
-        };
-        const token = await this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, data, false, backend_service_name_enum_1.BackendServiceName.PublicService, end_point_enum_1.EndPoint.PublicService);
-        if (token) {
-            this.localStorageService.setPublicToken(token);
-            this.createNewSession();
-            return true;
+    _doCall(method, data = {}, showLoader = true, service = undefined, endPoint = end_point_enum_1.EndPoint.AjaxService, isPublicService = false, ownMessage) {
+        if (!service) {
+            if (!this.usePublicToken) {
+                service = backend_service_name_enum_1.BackendServiceName.LoginService;
+            }
+            else {
+                service = backend_service_name_enum_1.BackendServiceName.PublicService;
+            }
         }
-        return false;
-    }
-    _doCall(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService, ownMessage) {
         if (showLoader) {
             this.setShowLoaderRequests(this._showLoaderRequests + 1);
         }
@@ -110,7 +139,10 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
                 message = JSON.stringify(ownMessage);
             }
             else {
-                if (this.usePublicToken) {
+                if (this._methodNeedsAccessToken(method)) {
+                    await this._waitForAccessToken((data && service && service === backend_service_name_enum_1.BackendServiceName.LoginService) || method === datasession_service_method_enum_1.DatasessionServiceMethod.CreatePublicSession, this.usePublicToken);
+                }
+                if (this.usePublicToken && !isPublicService) {
                     message = JSON.stringify({
                         method: method,
                         data: data,
@@ -118,9 +150,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
                     });
                 }
                 else {
-                    if (this.options.jwtEnabled) {
-                        await this._waitForAccessToken(data && service && service === backend_service_name_enum_1.BackendServiceName.LoginService);
-                    }
                     message = JSON.stringify({
                         service: service,
                         method: method,
@@ -133,16 +162,14 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
                 }
             }
             const headers = {
-                "Content-Type": "application/json; charset=utf-8"
+                "Content-Type": "application/json; charset=utf-8",
+                "Authorization": `Bearer ${this.jwtService.jwt}`
             };
-            if (this.options.jwtEnabled) {
-                headers["Authorization"] = `Bearer ${this.jwtService.jwt}`;
-            }
             (0, axios_1.default)({
                 method: 'post',
                 url: url,
                 data: message,
-                withCredentials: this.options.jwtEnabled,
+                withCredentials: true,
                 timeout: this._timeout,
                 headers: headers
             }).then(response => {
@@ -161,7 +188,8 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
                 if (error.code === "ECONNABORTED") {
                     this.connectionAborted.next();
                 }
-                reject(error);
+                console.error(error);
+                resolve();
             });
         }).then(response => {
             if (showLoader) {
@@ -170,15 +198,26 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
             return new Promise((resolve) => { return resolve(response); });
         });
     }
-    async _waitForAccessToken(isLogin) {
-        if (!isLogin && this.jwtService.retrievingToken) {
+    _methodNeedsAccessToken(method) {
+        return this._methodWithoutAccessToken.indexOf(method) < 0;
+    }
+    async _waitForAccessToken(isLogin, publicToken) {
+        if (this.jwtService.retrievingToken) {
             return new Promise((resolve) => {
-                this.jwtService.tokenRetrieved.subscribe(() => {
+                if (window.hasOwnProperty('tokenRetrieved')) {
+                    window.tokenRetrieved.subscribe(() => {
+                        resolve(true);
+                    });
+                }
+                else {
                     resolve(true);
-                });
+                }
             });
         }
         await this.jwtService.getAccessToken(!isLogin);
+        if (publicToken) {
+            this.session.publicToken = this.jwtService.jwt;
+        }
     }
     setShowLoaderRequests(amount) {
         this._showLoaderRequests = amount;
@@ -189,6 +228,49 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
             this.showLoader.next(false);
         }
     }
+    _redirectToIdentityServerRealm() {
+        if (this.loginService.company && this.loginService.company.realmId && this.loginService.company.clientId) {
+            let state = this.localStorageService.keycloakState;
+            if (!state) {
+                state = this._createGuid();
+                this.localStorageService.setKeycloakState(state);
+            }
+            const redirectUrl = window.location.href;
+            const query = {
+                state: state,
+                client_id: this.loginService.company.clientId,
+                response_type: "code",
+                response_mode: "fragment",
+                redirect_uri: redirectUrl
+            };
+            const queryUrl = new URLSearchParams(query).toString();
+            const fullUrl = this.loginService.keycloakParams.keycloakUrl + "/realms/" + this.loginService.company.realmId + "/protocol/openid-connect/auth" + "?" + queryUrl;
+            window.location.href = fullUrl;
+        }
+        else {
+            console.error("Identity server information is not defined for the selected company");
+        }
+    }
+    _getParameter(parameterName) {
+        let url = window.location.href;
+        url = url.replace('#', '?');
+        parameterName = parameterName.replace(/[\[\]]/g, "\\$&");
+        const regex = new RegExp("[?&]" + parameterName + "(=([^&#]*)|&|#|$)");
+        const results = regex.exec(url);
+        if (!results) {
+            return null;
+        }
+        else if (!results[2]) {
+            return "";
+        }
+        return decodeURIComponent(results[2].replace(/\+/g, " "));
+    }
+    _createGuid() {
+        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+            const r = Math.random() * 16 | 0;
+            return (c === "x" ? r : (r & 0x3 | 0x8)).toString(16);
+        });
+    }
 }
 exports.AjaxService = AjaxService;
 //# sourceMappingURL=ajax.service.js.map