@colijnit/ioneconnector 2.1.15 → 3.1.0

package/build/service/login.service.js

@@ -8,29 +8,24 @@ const datasession_service_1 = require("./datasession.service");
 const public_service_1 = require("./public.service");
 const business_object_factory_1 = require("./business-object-factory");
 const login_response_1 = require("../model/login-response");
-const rxjs_1 = require("rxjs");
 const login_request_1 = require("../model/login-request");
+const login_status_enum_1 = require("../enum/login-status.enum");
+const token_response_bo_1 = require("../model/token-response.bo");
+const health_service_1 = require("./health.service");
 class LoginService {
     constructor(backendConnection) {
         this.windowsSessionId = 1;
         this._useEncryption = false;
         this._boFactory = new business_object_factory_1.BusinessObjectFactory();
-        this._creatingDataSession = false;
-        this._dataSessionCreated = new rxjs_1.Subject();
         this.backendConnection = backendConnection;
         this.loginRequest = new login_request_1.LoginRequest();
-        if (this.backendConnection.options.schema === "") {
-            console.error("Schema is not provided");
-        }
-        if (this.backendConnection.options.version === "") {
-            console.error("Version is not provided");
-        }
+        this._healthService = new health_service_1.HealthService(backendConnection);
         if (this.backendConnection.options.username || this.backendConnection.options.password) {
             this.loginRequest.userName = this.backendConnection.options.username;
             this.loginRequest.userPassword = this.backendConnection.options.password;
         }
         this.loginRequest.upId = parseInt(this.backendConnection.options.schema, 10);
-        this.loginRequest.clientVersion = this.backendConnection.options.version;
+        this.loginRequest.clientVersion = this.backendConnection.version.toString();
         this.loginRequest.clientLanguage = this.backendConnection.options.languageCode;
         this._useEncryption = this.backendConnection.options.useLoginEncryption;
         this._encryptionService = new encrypt_service_1.EncryptService();
@@ -41,49 +36,55 @@ class LoginService {
         return this._publicService.getPublicKey();
     }
     async loginAndCreateDataSession() {
-        if (this._creatingDataSession) {
-            return new Promise((resolve) => {
-                setTimeout(() => {
-                    resolve(this.loginAndCreateDataSession());
-                }, 500);
-            });
-        }
-        if (this.backendConnection.session.created) {
+        if (this.backendConnection.sessionId) {
+            this.backendConnection.createNewSession();
             return true;
         }
-        this._creatingDataSession = true;
-        await this.login();
-        const id = this.backendConnection.session.dataSessionId;
-        const datasessionCreated = await this._datasessionService.createDataSession(id);
-        this._creatingDataSession = false;
-        if (datasessionCreated === true) {
-            this.backendConnection.session.created = true;
-            this._dataSessionCreated.next();
-            this.backendConnection.session.dataSessionCreated.next();
-            this._startHeartBeat();
-            return;
+        this.backendConnection.createNewSession();
+        const response = await this.login();
+        if (response && response.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
+            const datasessionCreated = await this._datasessionService.createDataSession(this.backendConnection.session.dataSessionId);
+            if (datasessionCreated === true) {
+                try {
+                    if (this.backendConnection.version < 252) {
+                        this._startHeartBeat();
+                    }
+                    else {
+                        this._healthService.startHeartBeat();
+                    }
+                }
+                catch (e) {
+                }
+                return;
+            }
+            else {
+                this.backendConnection.localStorageService.setDataSessionId(undefined);
+                this.backendConnection.localStorageService.setSessionId(undefined);
+                this.logout();
+                throw new Error("Openening data session failed for session '"
+                    + "'. Logging out user.");
+            }
         }
         else {
-            this.logout();
-            throw new Error("Openening data session failed for session '"
-                + "'. Logging out user.");
+            this.backendConnection.localStorageService.setDataSessionId(undefined);
+            this.backendConnection.localStorageService.setSessionId(undefined);
         }
     }
-    async waitForLoginToFinish() {
-        return new Promise((resolve) => {
-            this._dataSessionCreated.subscribe(() => {
-                resolve(true);
-            });
-            this.backendConnection.session.dataSessionCreated.subscribe(() => {
-                resolve(true);
-            });
-        });
-    }
     logout() {
-        if (!this.backendConnection.session.loggedOut) {
-            this.backendConnection.session.loggedOut = true;
+        if (this.backendConnection.localStorageService.sessionId) {
+            this.backendConnection.localStorageService.setDataSessionId(undefined);
+            this.backendConnection.localStorageService.setSessionId(undefined);
             return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
-                this._stopHeartBeat();
+                try {
+                    if (this.backendConnection.version < 252) {
+                        this._stopHeartBeat();
+                    }
+                    else {
+                        this._healthService.stopHeartBeat();
+                    }
+                }
+                catch (e) {
+                }
                 return userData;
             });
         }
@@ -99,6 +100,34 @@ class LoginService {
             this._callLogin()
                 .then((result) => {
                 const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
+                if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
+                    const loginData = {
+                        accessToken: loginResponse.accessToken,
+                        refreshToken: loginResponse.refreshToken
+                    };
+                    this.backendConnection.sessionStorageService.setLoginData(loginData);
+                    this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
+                }
+                resolve(loginResponse);
+            })
+                .catch((e) => {
+                return reject(e);
+            });
+        });
+    }
+    async loginByKeycloakCode(code, uri) {
+        return new Promise((resolve, reject) => {
+            this._loginUserByLoginCode(code, uri)
+                .then((result) => {
+                const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
+                if (loginResponse && loginResponse.loginStatus === login_status_enum_1.LoginStatus.SUCCESS) {
+                    const loginData = {
+                        accessToken: loginResponse.accessToken,
+                        refreshToken: loginResponse.refreshToken
+                    };
+                    this.backendConnection.sessionStorageService.setLoginData(loginData);
+                    this.backendConnection.jwtService.setExpirationTime(loginResponse.accessToken);
+                }
                 resolve(loginResponse);
             })
                 .catch((e) => {
@@ -106,6 +135,14 @@ class LoginService {
             });
         });
     }
+    async refreshAccessToken(refreshToken) {
+        const inputParams = {
+            sessionId: this.backendConnection.sessionId,
+            refreshToken: refreshToken,
+        };
+        const rawResponse = await this._call(login_service_method_enum_1.LoginServiceMethod.RefreshAccessToken, inputParams, false);
+        return this._boFactory.makeWithRawBackendData(token_response_bo_1.TokenResponse, rawResponse);
+    }
     async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
         const inputParams = {
             upId: upId,
@@ -187,6 +224,13 @@ class LoginService {
             return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginRequest, true);
         });
     }
+    _loginUserByLoginCode(code, uri) {
+        this.loginRequest.userName = undefined;
+        this.loginRequest.userPassword = undefined;
+        this.loginRequest.loginCode = code;
+        this.loginRequest.redirectUri = uri;
+        return this._call(login_service_method_enum_1.LoginServiceMethod.LoginWithCode, this.loginRequest, true);
+    }
     _call(method, data, showLoader) {
         if (data === undefined) {
             data = {};

package/build/service/login.service.js.map

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

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

@@ -0,0 +1,12 @@
+import { SessionStorageRootObject } from '../model/session-storage-root-object';
+import { LoginStorageData } from '../interface/login-storage-data.interface';
+export declare class SessionStorageService {
+    readonly storage: Storage;
+    protected storageObj: SessionStorageRootObject;
+    protected appRoot: string;
+    constructor();
+    getLoginData(): LoginStorageData;
+    setLoginData(data: LoginStorageData): void;
+    save(): void;
+    protected _initLocalStorageObj(): void;
+}

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionStorageService = void 0;
+const CircularJSON = require("circular-json");
+const session_storage_root_object_1 = require("../model/session-storage-root-object");
+class SessionStorageService {
+    constructor() {
+        this.storage = sessionStorage;
+        this.storageObj = new session_storage_root_object_1.SessionStorageRootObject();
+        this.appRoot = "/";
+        this._initLocalStorageObj();
+    }
+    getLoginData() {
+        return this.storageObj.loginData;
+    }
+    setLoginData(data) {
+        const currentLoginData = this.getLoginData();
+        const newLoginData = Object.assign(currentLoginData, data);
+        this.storageObj.loginData = newLoginData;
+        this.save();
+    }
+    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;
+    }
+}
+exports.SessionStorageService = SessionStorageService;
+//# sourceMappingURL=session-storage.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"session-storage.service.js","sourceRoot":"","sources":["../../src/service/session-storage.service.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AAC9C,sFAA8E;AAG9E,MAAa,qBAAqB;IAO9B;QALgB,YAAO,GAAY,cAAc,CAAC;QAExC,eAAU,GAA6B,IAAI,sDAAwB,EAAE,CAAC;QACtE,YAAO,GAAW,GAAG,CAAC;QAG5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;IACrC,CAAC;IAEM,YAAY,CAAC,IAAsB;QACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,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;IAChG,CAAC;CAEJ;AA/BD,sDA+BC"}

package/build/tests/int/connector.int.test.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const connector_1 = require("../../connector");
 const options = {
     url: 'http://localhost:8080/ione',
-    ajaxUrl: 'http://localhost:8080/ione',
     schema: '1',
     version: "250",
     useLoginEncryption: true

package/build/tests/int/connector.int.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"connector.int.test.js","sourceRoot":"","sources":["../../../src/tests/int/connector.int.test.ts"],"names":[],"mappings":";;AAAA,+CAA0C;AAG1C,MAAM,OAAO,GAAY;IACrB,GAAG,EAAE,4BAA4B;IACjC,OAAO,EAAE,4BAA4B;IACrC,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,KAAK;IACd,kBAAkB,EAAE,IAAI;CAC3B,CAAC;AAEF,MAAM,SAAS,GAAc,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC;AAEpD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;AA+B3B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"connector.int.test.js","sourceRoot":"","sources":["../../../src/tests/int/connector.int.test.ts"],"names":[],"mappings":";;AAAA,+CAA0C;AAG1C,MAAM,OAAO,GAAY;IACrB,GAAG,EAAE,4BAA4B;IACjC,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,KAAK;IACd,kBAAkB,EAAE,IAAI;CAC3B,CAAC;AAEF,MAAM,SAAS,GAAc,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC;AAEpD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;AA+B3B,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/ioneconnector",
-  "version": "2.1.15",
+  "version": "3.1.0",
   "scripts": {
     "build": "grunt clean && tsc",
     "uglify": "grunt uglify",
@@ -16,6 +16,7 @@
     "axios": "^0.27.2",
     "circular-json": "0.5.4",
     "jsencrypt": "3.2.0",
+    "jwt-decode": "^3.1.2",
     "reflect-metadata": "^0.1.12",
     "rxjs": "6.6.3"
   },