@colijnit/ioneconnector 2.1.15 → 3.1.0

package/build/provider/ajax.service.js

@@ -11,33 +11,41 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
     constructor(options) {
         super(options);
         this._showLoaderRequests = 0;
-        this._usePublicToken = true;
         this._timeout = 180000;
-        this.schema = options.schema;
         if (options && options.timeoutInMs) {
             this._timeout = options.timeoutInMs;
         }
-        if (options && ((options.username && options.password) || !options.withCredentials)) {
-            this._usePublicToken = false;
-        }
     }
-    async call(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService) {
-        if (this._usePublicToken) {
-            await this.waitForPublicToken();
+    async connect() {
+        if (this.usePublicToken) {
+            if (this.localStorageService.publicToken) {
+                return true;
+            }
+            return this._createPublicSession();
         }
-        if (this._usePublicToken || (service === backend_service_name_enum_1.BackendServiceName.PublicService ||
+        else {
+            if (this.localStorageService.sessionId) {
+                return true;
+            }
+            return this.loginService.loginAndCreateDataSession();
+        }
+    }
+    async call(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService, ownMessage) {
+        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);
+            return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
         }
         else {
-            await this.waitForLogin();
-            return this._doCall(method, data, showLoader, service, endPoint);
+            return this._doCall(method, data, showLoader, service, endPoint, ownMessage);
         }
     }
     async login(request, encrypt) {
         return this.loginService.login(request, encrypt);
     }
+    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);
     }
@@ -60,68 +68,71 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
         return this.loginService.getPublicKey();
     }
     close() {
-        if (this._usePublicToken) {
+        if (this.usePublicToken) {
             return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {});
         }
         else {
             return this.closeDataSession();
         }
     }
-    async waitForPublicToken() {
-        if (this.session && this.session.publicToken) {
-            return true;
-        }
-        if (this.session.gettingPublicToken) {
-            return await this._waitForPublicTokenToFinish();
-        }
-        this.session.gettingPublicToken = true;
-        await this._createPublicSession();
-        this.session.gettingPublicToken = false;
-    }
     async _createPublicSession() {
         const data = {
             upId: this.schema
         };
-        this.session.publicToken = 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);
-        this.session.publicTokenCreated.next();
-    }
-    async _waitForPublicTokenToFinish() {
-        return new Promise((resolve) => {
-            this.session.publicTokenCreated.subscribe(() => {
-                resolve(true);
-            });
-        });
+        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;
+        }
+        return false;
     }
-    _doCall(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService) {
+    _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);
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             const url = url_utils_1.UrlUtils.createReadableUrl(method, data, this.url, endPoint);
             let message;
-            if (this._usePublicToken) {
-                message = JSON.stringify({
-                    method: method,
-                    data: data,
-                    token: this.session.publicToken
-                });
+            if (ownMessage) {
+                message = JSON.stringify(ownMessage);
             }
             else {
-                message = JSON.stringify({
-                    service: service,
-                    method: method,
-                    id: this.callId,
-                    data: data,
-                    dataSessionId: this.session ? this.session.dataSessionId : "",
-                    windowSessionId: this.session ? this.session.windowsId : "1",
-                    sessionId: this.session ? this.session.id : ""
-                });
+                if (this.usePublicToken) {
+                    message = JSON.stringify({
+                        method: method,
+                        data: data,
+                        token: this.session.publicToken
+                    });
+                }
+                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,
+                        id: this.callId,
+                        data: data,
+                        dataSessionId: this.session ? this.session.dataSessionId : "",
+                        windowSessionId: this.session ? this.session.windowsId : "1",
+                        sessionId: this.session ? this.session.id : ""
+                    });
+                }
+            }
+            const headers = {
+                "Content-Type": "application/json; charset=utf-8"
+            };
+            if (this.options.jwtEnabled) {
+                headers["Authorization"] = `Bearer ${this.jwtService.jwt}`;
             }
             (0, axios_1.default)({
                 method: 'post',
                 url: url,
                 data: message,
-                timeout: this._timeout
+                withCredentials: this.options.jwtEnabled,
+                timeout: this._timeout,
+                headers: headers
             }).then(response => {
                 if (response.data) {
                     if (response.data.exception) {
@@ -147,6 +158,16 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
             return new Promise((resolve) => { return resolve(response); });
         });
     }
+    async _waitForAccessToken(isLogin) {
+        if (!isLogin && this.jwtService.retrievingToken) {
+            return new Promise((resolve) => {
+                this.jwtService.tokenRetrieved.subscribe(() => {
+                    resolve(true);
+                });
+            });
+        }
+        await this.jwtService.getAccessToken(!isLogin);
+    }
     setShowLoaderRequests(amount) {
         this._showLoaderRequests = amount;
         if (this._showLoaderRequests > 0) {

package/build/provider/ajax.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,uFAA+E;AAC/E,iCAA0B;AAC1B,kDAA4C;AAC5C,6FAAiF;AAEjF,2DAAgD;AAOhD,MAAa,WAAY,SAAQ,8DAA4B;IAMzD,YAAY,OAAgB;QACxB,KAAK,CAAC,OAAO,CAAC,CAAC;QANX,wBAAmB,GAAW,CAAC,CAAC;QAChC,oBAAe,GAAY,IAAI,CAAC;QAEhC,aAAQ,GAAW,MAAM,CAAC;QAI9B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE;YAChC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;SACvC;QACD,IAAI,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YACjF,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;SAChC;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,OAAmD,EAAE,EAAE,aAAsB,IAAI,EAC/G,UAAkB,8CAAkB,CAAC,YAAY,EAAE,WAAmB,yBAAQ,CAAC,WAAW;QAC1F,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;SACnC;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,CACxB,OAAO,KAAK,8CAAkB,CAAC,aAAa;YAC5C,OAAO,KAAK,8CAAkB,CAAC,YAAY;YAC3C,OAAO,KAAK,8CAAkB,CAAC,kBAAkB,CAAC,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SACpE;aAAM;YACH,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SACpE;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,OAAqB,EAAE,OAAgB;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,WAAW,CACpB,IAAY,EACZ,QAAgB,EAChB,gBAAwB,EACxB,uBAA+B,EAC/B,uBAA+B,EAC/B,0BAAmC;QAEnC,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,0BAA0B,CAAC,CAAC;IACzJ,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,QAAgB;QACvD,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY;QAC5E,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,6BAA6B,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY,EAAE,iBAA0B;QACvH,OAAO,IAAI,CAAC,YAAY,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC5G,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,IAAY,EAAE,QAAgB,EAAE,iBAAyB;QACnG,OAAO,IAAI,CAAC,YAAY,CAAC,gCAAgC,CAAC,IAAI,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACjG,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,YAAoB,EAAE,IAAY;QACrE,OAAO,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK;QACR,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,OAAO,IAAI,CAAC,OAAO,CAAC,0DAAwB,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;SACxE;aAAM;YACH,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAClC;IACL,CAAC;IAES,KAAK,CAAC,kBAAkB;QAC9B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;YACjC,OAAO,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;SACnD;QACD,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACvC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,IAAI,GAAoB;YAC1B,IAAI,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,WAAW,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,0DAAwB,CAAC,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,8CAAkB,CAAC,aAAa,EAAE,yBAAQ,CAAC,aAAa,CAAC,CAAC;QACrL,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,2BAA2B;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,GAAG,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,OAAO,CAAC,MAAc,EAAE,OAAmD,EAAE,EAAE,aAAsB,IAAI,EAC7G,UAAkB,8CAAkB,CAAC,YAAY,EAAE,WAAmB,yBAAQ,CAAC,WAAW;QAC1F,IAAI,UAAU,EAAE;YACZ,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;SAC5D;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,MAAgB,EAAE,EAAE;YACvD,MAAM,GAAG,GAAW,oBAAQ,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACjF,IAAI,OAAe,CAAC;YACpB,IAAI,IAAI,CAAC,eAAe,EAAE;gBACtB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;oBACrB,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;iBAClC,CAAC,CAAC;aACN;iBAAM;gBACH,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;oBACrB,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,MAAM;oBACd,EAAE,EAAE,IAAI,CAAC,MAAM;oBACf,IAAI,EAAE,IAAI;oBACV,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;oBAC7D,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;oBAC5D,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;iBACjD,CAAC,CAAC;aACN;YAED,IAAA,eAAK,EAAC;gBACF,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,IAAI,CAAC,QAAQ;aACzB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACf,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACf,IAAK,QAAQ,CAAC,IAAY,CAAC,SAAS,EAAE;wBAClC,OAAO,CAAE,QAAQ,CAAC,IAAY,CAAC,SAAS,CAAC,CAAC;qBAC7C;yBAAM;wBACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACb,IAAI,UAAU,EAAE;oBACZ,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;iBACjC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE;oBAC/B,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;iBACjC;gBAID,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACf,IAAI,UAAU,EAAE;gBACZ,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;aAC5D;YACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE,GAAG,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;QAC9E,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,qBAAqB,CAAC,MAAc;QACxC,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC;QAClC,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/B;IACL,CAAC;CACJ;AA/KD,kCA+KC"}
+{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,uFAA+E;AAC/E,iCAA0B;AAC1B,kDAA4C;AAC5C,6FAAiF;AAEjF,2DAAgD;AAOhD,MAAa,WAAY,SAAQ,8DAA4B;IAIzD,YAAY,OAAgB;QACxB,KAAK,CAAC,OAAO,CAAC,CAAC;QAJX,wBAAmB,GAAW,CAAC,CAAC;QAChC,aAAQ,GAAW,MAAM,CAAC;QAI9B,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE;YAChC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;SACvC;IACL,CAAC;IAMM,KAAK,CAAC,OAAO;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBACtC,OAAO,IAAI,CAAC;aACf;YACD,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC;SACtC;aAAM;YACH,IAAI,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE;gBACpC,OAAO,IAAI,CAAC;aACf;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC;SACxD;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,OAAmD,EAAE,EAAE,aAAsB,IAAI,EAC/G,UAAkB,8CAAkB,CAAC,YAAY,EAAE,WAAmB,yBAAQ,CAAC,WAAW,EAAE,UAAe;QAC3G,IAAI,IAAI,CAAC,cAAc,IAAI,CACvB,OAAO,KAAK,8CAAkB,CAAC,aAAa;YAC5C,OAAO,KAAK,8CAAkB,CAAC,YAAY;YAC3C,OAAO,KAAK,8CAAkB,CAAC,kBAAkB,CAAC,EAAE;YACpD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SAChF;aAAM;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SAChF;IACL,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,OAAqB,EAAE,OAAgB;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,IAAY,EAAE,GAAW;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,WAAW,CACpB,IAAY,EACZ,QAAgB,EAChB,gBAAwB,EACxB,uBAA+B,EAC/B,uBAA+B,EAC/B,0BAAmC;QAEnC,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,0BAA0B,CAAC,CAAC;IACzJ,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,QAAgB;QACvD,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY;QAC5E,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,6BAA6B,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY,EAAE,iBAA0B;QACvH,OAAO,IAAI,CAAC,YAAY,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC5G,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,IAAY,EAAE,QAAgB,EAAE,iBAAyB;QACnG,OAAO,IAAI,CAAC,YAAY,CAAC,gCAAgC,CAAC,IAAI,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACjG,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,YAAoB,EAAE,IAAY;QACrE,OAAO,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK;QACR,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,OAAO,IAAI,CAAC,OAAO,CAAC,0DAAwB,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;SACxE;aAAM;YACH,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAClC;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,IAAI,GAAoB;YAC1B,IAAI,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;QACF,MAAM,KAAK,GAA6B,MAAM,IAAI,CAAC,OAAO,CAAC,0DAAwB,CAAC,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,8CAAkB,CAAC,aAAa,EAAE,yBAAQ,CAAC,aAAa,CAAC,CAAC;QAChL,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,OAAO,CAAC,MAAc,EAAE,OAAmD,EAAE,EAAE,aAAsB,IAAI,EAC7G,UAAkB,8CAAkB,CAAC,YAAY,EAAE,WAAmB,yBAAQ,CAAC,WAAW,EAAE,UAAe;QAC3G,IAAI,UAAU,EAAE;YACZ,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;SAC5D;QACD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAiB,EAAE,MAAgB,EAAE,EAAE;YAC7D,MAAM,GAAG,GAAW,oBAAQ,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACjF,IAAI,OAAe,CAAC;YACpB,IAAI,UAAU,EAAE;gBACZ,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;aACxC;iBAAM;gBACH,IAAI,IAAI,CAAC,cAAc,EAAE;oBACrB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;wBACrB,MAAM,EAAE,MAAM;wBACd,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;qBAClC,CAAC,CAAC;iBACN;qBAAM;oBACH,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;wBACzB,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,IAAI,OAAO,IAAI,OAAO,KAAK,8CAAkB,CAAC,YAAY,CAAC,CAAC;qBAClG;oBACD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;wBACrB,OAAO,EAAE,OAAO;wBAChB,MAAM,EAAE,MAAM;wBACd,EAAE,EAAE,IAAI,CAAC,MAAM;wBACf,IAAI,EAAE,IAAI;wBACV,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;wBAC7D,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;wBAC5D,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;qBACjD,CAAC,CAAC;iBACN;aACJ;YACD,MAAM,OAAO,GAAG;gBACZ,cAAc,EAAE,iCAAiC;aACpD,CAAC;YACF,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;gBACzB,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;aAC9D;YACD,IAAA,eAAK,EAAC;gBACF,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,OAAO;gBACb,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACxC,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACf,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACf,IAAK,QAAQ,CAAC,IAAY,CAAC,SAAS,EAAE;wBAClC,OAAO,CAAE,QAAQ,CAAC,IAAY,CAAC,SAAS,CAAC,CAAC;qBAC7C;yBAAM;wBACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACb,IAAI,UAAU,EAAE;oBACZ,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;iBACjC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE;oBAC/B,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;iBACjC;gBAID,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACf,IAAI,UAAU,EAAE;gBACZ,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;aAC5D;YACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE,GAAG,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;QAC9E,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,OAAgB;QAC9C,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE;YAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;gBACrC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,EAAE;oBAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAEO,qBAAqB,CAAC,MAAc;QACxC,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC;QAClC,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/B;IACL,CAAC;CACJ;AArMD,kCAqMC"}

package/build/provider/base-backend-connection.service.d.ts

@@ -1,26 +1,36 @@
-import { BackendServiceName } from "../enum/backend-service-name.enum";
-import { Session } from "../model/session";
-import { LoginService } from "../service/login.service";
+import { BackendServiceName } from '../enum/backend-service-name.enum';
+import { Session } from '../model/session';
+import { LoginService } from '../service/login.service';
 import { Subject } from 'rxjs';
-import { Options } from "../model/options";
+import { Options } from '../model/options';
 import { ServerResponseData } from '../model/server-response-data';
+import { LocalStorageService } from '../service/local-storage.service';
+import { JwtTokenService } from '../service/jwt-token.service';
+import { SessionStorageService } from '../service/session-storage.service';
 export declare abstract class BaseBackendConnectionService {
     readonly showLoader: Subject<boolean>;
     readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     session: Session;
+    dataSessionId: string;
+    sessionId: string;
+    module: string;
     options: Options;
+    localStorageService: LocalStorageService;
+    sessionStorageService: SessionStorageService;
+    jwtService: JwtTokenService;
+    version: number;
     protected callId: string;
     protected url: string;
     protected schema: string;
     protected loginService: LoginService;
+    protected usePublicToken: boolean;
     private _datasessionService;
     constructor(options: Options);
-    abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName): Promise<any>;
+    abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName, ownMessage?: {}): Promise<any>;
     commit(): Promise<boolean>;
     closeDataSession(): Promise<ServerResponseData>;
-    protected resetConnection(): void;
-    protected waitForLogin(): Promise<boolean>;
-    private _createNewSession;
-    private _generateUniqueId;
+    createNewSession(): void;
+    generateUniqueId(): string;
+    private _checkSession;
 }

package/build/provider/base-backend-connection.service.js

@@ -5,23 +5,48 @@ const session_1 = require("../model/session");
 const login_service_1 = require("../service/login.service");
 const rxjs_1 = require("rxjs");
 const datasession_service_1 = require("../service/datasession.service");
+const local_storage_service_1 = require("../service/local-storage.service");
+const jwt_token_service_1 = require("../service/jwt-token.service");
+const session_storage_service_1 = require("../service/session-storage.service");
 class BaseBackendConnectionService {
     constructor(options) {
         this.showLoader = new rxjs_1.Subject();
         this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this.session = new session_1.Session();
+        this.module = 'webselector';
         this.callId = "1";
+        this.usePublicToken = true;
         this.options = options;
-        this.url = options.url;
-        if (options.session) {
-            this.session = options.session;
+        if (this.options.schema === "") {
+            console.error("Schema is not provided");
+        }
+        if (this.options.version === "") {
+            console.error("Version is not provided");
         }
         else {
-            this.session = this._createNewSession();
+            this.version = parseInt(this.options.version);
+        }
+        if (options && ((options.username && options.password) || !options.jwtEnabled)) {
+            this.usePublicToken = false;
+        }
+        this.schema = options.schema;
+        this.url = options.url;
+        if (options.sessionId) {
+            this.sessionId = options.sessionId;
+        }
+        if (options.dataSessionId) {
+            this.dataSessionId = options.dataSessionId;
         }
+        if (options.module) {
+            this.module = options.module;
+        }
+        this.localStorageService = new local_storage_service_1.LocalStorageService();
+        this.sessionStorageService = new session_storage_service_1.SessionStorageService();
         this.loginService = new login_service_1.LoginService(this);
+        this.jwtService = new jwt_token_service_1.JwtTokenService(this.sessionStorageService, this.loginService);
         this._datasessionService = new datasession_service_1.DatasessionService(this);
+        this._checkSession();
     }
     async commit() {
         return this._datasessionService.commit();
@@ -29,30 +54,23 @@ class BaseBackendConnectionService {
     closeDataSession() {
         return this.loginService.logout();
     }
-    resetConnection() {
-        if (this.session) {
-            this.session.created = false;
-        }
-    }
-    async waitForLogin() {
-        if (this.session && this.session.created) {
-            return true;
+    createNewSession() {
+        this.session = new session_1.Session();
+        if (this.usePublicToken) {
+            this.session.publicToken = this.localStorageService.publicToken;
         }
-        if (this.session.loggingIn) {
-            return await this.loginService.waitForLoginToFinish();
+        else {
+            if (!this.dataSessionId) {
+                this.dataSessionId = `${this.module}_${this.generateUniqueId()}`;
+            }
+            this.session.dataSessionId = this.dataSessionId;
+            this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
+            this.session.windowsId = "1";
+            this.localStorageService.setDataSessionId(this.session.dataSessionId);
+            this.localStorageService.setSessionId(this.session.id);
         }
-        this.session.loggingIn = true;
-        await this.loginService.loginAndCreateDataSession();
-        this.session.loggingIn = false;
-    }
-    _createNewSession() {
-        const session = new session_1.Session();
-        session.dataSessionId = 'webselector_' + this._generateUniqueId();
-        session.id = this._generateUniqueId();
-        session.windowsId = "1";
-        return session;
     }
-    _generateUniqueId() {
+    generateUniqueId() {
         function s4() {
             return Math.floor((1 + Math.random()) * 0x10000)
                 .toString(16)
@@ -60,6 +78,21 @@ class BaseBackendConnectionService {
         }
         return s4() + s4() + s4();
     }
+    _checkSession() {
+        if (this.usePublicToken && this.localStorageService.publicToken) {
+            this.createNewSession();
+        }
+        else {
+            if (this.sessionId && this.dataSessionId) {
+                this.createNewSession();
+            }
+            else if (this.localStorageService.sessionId && this.localStorageService.dataSessionId) {
+                this.sessionId = this.localStorageService.sessionId;
+                this.dataSessionId = this.localStorageService.dataSessionId;
+                this.createNewSession();
+            }
+        }
+    }
 }
 exports.BaseBackendConnectionService = BaseBackendConnectionService;
 //# sourceMappingURL=base-backend-connection.service.js.map

package/build/provider/base-backend-connection.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":";;;AACA,8CAAyC;AACzC,4DAAsD;AACtD,+BAAyC;AACzC,wEAAkE;AAQlE,MAAsB,4BAA4B;IAe9C,YAAY,OAAgB;QAdZ,eAAU,GAAqB,IAAI,cAAO,EAAW,CAAC;QACtD,sBAAiB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QACvD,8BAAyB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QAExE,YAAO,GAAY,IAAI,iBAAO,EAAE,CAAC;QAG9B,WAAM,GAAW,GAAG,CAAC;QAQ3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QAEvB,IAAI,OAAO,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAClC;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC3C;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,mBAAmB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAIM,KAAK,CAAC,MAAM;QAEf,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;IAC7C,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAES,eAAe;QACrB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;SAChC;IACL,CAAC;IAES,KAAK,CAAC,YAAY;QACxB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACtC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACxB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;SACzD;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;IACnC,CAAC;IAEO,iBAAiB;QACrB,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;QAC9B,OAAO,CAAC,aAAa,GAAG,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClE,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QACxB,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,iBAAiB;QACrB,SAAS,EAAE;YACP,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC;iBAC3C,QAAQ,CAAC,EAAE,CAAC;iBACZ,SAAS,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;IAC9B,CAAC;CACJ;AA3ED,oEA2EC"}
+{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":"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"}

package/build/service/health.service.d.ts

@@ -0,0 +1,10 @@
+import { BaseBackendConnectionService } from '../provider/base-backend-connection.service';
+export declare class HealthService {
+    private static HEARTBEAT_INTERVAL_MS;
+    protected heartbeatTimer: any;
+    protected backendConnection: BaseBackendConnectionService;
+    constructor(backendConnection: BaseBackendConnectionService);
+    startHeartBeat(): void;
+    stopHeartBeat(): void;
+    private _call;
+}

package/build/service/health.service.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HealthService = void 0;
+const backend_service_name_enum_1 = require("../enum/backend-service-name.enum");
+const health_service_method_enum_1 = require("../enum/health-service-method.enum");
+class HealthService {
+    constructor(backendConnection) {
+        this.backendConnection = backendConnection;
+    }
+    startHeartBeat() {
+        if (!this.heartbeatTimer) {
+            this.heartbeatTimer = setInterval(() => {
+                this._call(health_service_method_enum_1.HealthServiceMethod.GetHeartBeat, {}, false);
+            }, HealthService.HEARTBEAT_INTERVAL_MS);
+        }
+    }
+    stopHeartBeat() {
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = null;
+        }
+    }
+    _call(method, data, showLoader) {
+        if (data === undefined) {
+            data = {};
+        }
+        if (showLoader === undefined) {
+            showLoader = true;
+        }
+        return this.backendConnection.call(method, data, showLoader, backend_service_name_enum_1.BackendServiceName.HealthService);
+    }
+}
+exports.HealthService = HealthService;
+HealthService.HEARTBEAT_INTERVAL_MS = 59000;
+//# sourceMappingURL=health.service.js.map

package/build/service/health.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"health.service.js","sourceRoot":"","sources":["../../src/service/health.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAEvE,MAAa,aAAa;IAMtB,YAAY,iBAA+C;QACvD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAEM,cAAc;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAC5D,CAAC,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;SAC3C;IACL,CAAC;IAEM,aAAa;QAChB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC9B;IACL,CAAC;IAEO,KAAK,CAAC,MAA2B,EAAE,IAAS,EAAE,UAAmB;QACrE,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,IAAI,GAAG,EAAE,CAAC;SACb;QACD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,UAAU,GAAG,IAAI,CAAC;SACrB;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,8CAAkB,CAAC,aAAa,CAAC,CAAC;IACnG,CAAC;;AAjCL,sCAkCC;AAjCkB,mCAAqB,GAAW,KAAK,CAAC"}

package/build/service/jwt-token.service.d.ts

@@ -0,0 +1,14 @@
+import { Subject } from 'rxjs';
+export declare class JwtTokenService {
+    jwt: string;
+    retrievingToken: boolean;
+    tokenRetrieved: Subject<boolean>;
+    private _tokenExpiredTime;
+    private _sessionStorageService;
+    private _loginService;
+    constructor(sessionStorageService: any, loginService: any);
+    getAccessToken(refresh?: boolean): Promise<void>;
+    setExpirationTime(jwt: string): void;
+    private _tokenExpired;
+    private _refreshToken;
+}

package/build/service/jwt-token.service.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JwtTokenService = void 0;
+const rxjs_1 = require("rxjs");
+const jwt_decode_1 = require("jwt-decode");
+class JwtTokenService {
+    constructor(sessionStorageService, loginService) {
+        this.retrievingToken = false;
+        this.tokenRetrieved = new rxjs_1.Subject();
+        this._sessionStorageService = sessionStorageService;
+        this._loginService = loginService;
+    }
+    async getAccessToken(refresh = true) {
+        if (refresh && this._tokenExpired()) {
+            await this._refreshToken();
+        }
+        this.jwt = this._sessionStorageService.getLoginData().accessToken;
+    }
+    setExpirationTime(jwt) {
+        const decoded = (0, jwt_decode_1.default)(jwt);
+        this._tokenExpiredTime = decoded.exp;
+    }
+    _tokenExpired() {
+        if (this._sessionStorageService.getLoginData().accessToken && this._tokenExpiredTime) {
+            return ((1000 * this._tokenExpiredTime) - (new Date()).getTime()) < 120000;
+        }
+        return false;
+    }
+    async _refreshToken() {
+        this.retrievingToken = true;
+        const tokenResponse = await this._loginService.refreshAccessToken(this._sessionStorageService.getLoginData().refreshToken);
+        const loginData = this._sessionStorageService.getLoginData();
+        loginData.accessToken = tokenResponse.accessToken;
+        loginData.refreshToken = tokenResponse.refreshToken;
+        this.setExpirationTime(tokenResponse.accessToken);
+        this._sessionStorageService.setLoginData(loginData);
+        this.retrievingToken = false;
+        this.tokenRetrieved.next(true);
+    }
+}
+exports.JwtTokenService = JwtTokenService;
+//# sourceMappingURL=jwt-token.service.js.map

package/build/service/jwt-token.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../src/service/jwt-token.service.ts"],"names":[],"mappings":";;;AAAA,+BAA6B;AAI7B,2CAAoC;AAGpC,MAAa,eAAe;IASxB,YAAY,qBAAqB,EAAE,YAAY;QAPxC,oBAAe,GAAY,KAAK,CAAC;QACjC,mBAAc,GAAqB,IAAI,cAAO,EAAW,CAAC;QAO7D,IAAI,CAAC,sBAAsB,GAAG,qBAAqB,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,UAAmB,IAAI;QAC/C,IAAI,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACjC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;SAC9B;QACD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC;IACtE,CAAC;IAEM,iBAAiB,CAAC,GAAW;QAChC,MAAM,OAAO,GAAQ,IAAA,oBAAU,EAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IACzC,CAAC;IAEO,aAAa;QACjB,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,WAAW,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAClF,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC;SAC9E;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,aAAa;QACvB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,CAAC;QAC1I,MAAM,SAAS,GAAqB,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;QAC/E,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAClD,SAAS,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;QACpD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CACJ;AA5CD,0CA4CC"}

package/build/service/local-storage.service.d.ts

@@ -0,0 +1,17 @@
+import { LocalStorageRootObject } from '../model/local-storage-root-object';
+export declare class LocalStorageService {
+    readonly storage: Storage;
+    setSessionId(id: string): void;
+    get sessionId(): string;
+    setDataSessionId(id: string): void;
+    get dataSessionId(): string;
+    setPublicToken(token: string): void;
+    get publicToken(): string;
+    setKeycloakState(keycloakState: string): void;
+    get keycloakState(): string;
+    protected storageObj: LocalStorageRootObject;
+    protected appRoot: string;
+    constructor();
+    save(): void;
+    protected _initLocalStorageObj(): void;
+}

package/build/service/local-storage.service.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalStorageService = void 0;
+const CircularJSON = require("circular-json");
+const local_storage_root_object_1 = require("../model/local-storage-root-object");
+class LocalStorageService {
+    setSessionId(id) {
+        this.storageObj.sessionId = id;
+        this.save();
+    }
+    get sessionId() {
+        return this.storageObj.sessionId;
+    }
+    setDataSessionId(id) {
+        this.storageObj.dataSessionId = id;
+        this.save();
+    }
+    get dataSessionId() {
+        return this.storageObj.dataSessionId;
+    }
+    setPublicToken(token) {
+        this.storageObj.token = token;
+        this.save();
+    }
+    get publicToken() {
+        return this.storageObj.token;
+    }
+    setKeycloakState(keycloakState) {
+        this.storageObj.keycloakState = keycloakState;
+        this.save();
+    }
+    get keycloakState() {
+        return this.storageObj.keycloakState;
+    }
+    constructor() {
+        this.storage = localStorage;
+        this.storageObj = new local_storage_root_object_1.LocalStorageRootObject();
+        this.appRoot = "/";
+        this._initLocalStorageObj();
+    }
+    save() {
+        this.storage.setItem(this.appRoot, CircularJSON.stringify(this.storageObj));
+    }
+    _initLocalStorageObj() {
+        this.appRoot = window.location.pathname;
+        this.storageObj = CircularJSON.parse(this.storage.getItem(this.appRoot)) || this.storageObj;
+        this.save();
+    }
+}
+exports.LocalStorageService = LocalStorageService;
+//# sourceMappingURL=local-storage.service.js.map

package/build/service/local-storage.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-storage.service.js","sourceRoot":"","sources":["../../src/service/local-storage.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,kFAA0E;AAE1E,MAAa,mBAAmB;IAIrB,YAAY,CAAC,EAAU;QAC1B,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;IACrC,CAAC;IAEM,gBAAgB,CAAC,EAAU;QAC9B,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACzC,CAAC;IAEM,cAAc,CAAC,KAAa;QAC/B,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;IACjC,CAAC;IAEM,gBAAgB,CAAC,aAAqB;QACzC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACzC,CAAC;IAKD;QAzCgB,YAAO,GAAY,YAAY,CAAC;QAsCtC,eAAU,GAA2B,IAAI,kDAAsB,EAAE,CAAC;QAClE,YAAO,GAAW,GAAG,CAAC;QAG5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAChF,CAAC;IAES,oBAAoB;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC;QAC5F,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;CAEJ;AAzDD,kDAyDC"}

package/build/service/login.service.d.ts

@@ -1,7 +1,8 @@
-import { BaseBackendConnectionService } from "../provider/base-backend-connection.service";
-import { ServerResponseData } from "../model/server-response-data";
-import { LoginResponse } from "../model/login-response";
+import { BaseBackendConnectionService } from '../provider/base-backend-connection.service';
+import { ServerResponseData } from '../model/server-response-data';
+import { LoginResponse } from '../model/login-response';
 import { LoginRequest } from '../model/login-request';
+import { TokenResponse } from '../model/token-response.bo';
 export declare class LoginService {
     private static HEARTBEAT_INTERVAL_MS;
     protected heartbeatTimer: any;
@@ -9,18 +10,18 @@ export declare class LoginService {
     protected windowsSessionId: number;
     protected loginRequest: LoginRequest;
     private _encryptionService;
+    private _healthService;
     private _useEncryption;
     private _publicService;
     private _datasessionService;
     private _boFactory;
-    private _creatingDataSession;
-    private _dataSessionCreated;
     constructor(backendConnection: BaseBackendConnectionService);
     getPublicKey(): Promise<string>;
     loginAndCreateDataSession(): Promise<boolean>;
-    waitForLoginToFinish(): Promise<boolean>;
     logout(): Promise<ServerResponseData>;
     login(request?: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
+    loginByKeycloakCode(code: string, uri: string): Promise<LoginResponse>;
+    refreshAccessToken(refreshToken: string): Promise<TokenResponse>;
     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>;
@@ -31,5 +32,6 @@ export declare class LoginService {
     private _stopHeartBeat;
     private _checkEncryption;
     private _callLogin;
+    private _loginUserByLoginCode;
     private _call;
 }