@colijnit/ioneconnector 2.1.11 → 2.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/connector.js +3 -2
- package/build/connector.js.map +1 -1
- package/build/model/login.js +0 -3
- package/build/model/login.js.map +1 -1
- package/build/model/session.d.ts +6 -0
- package/build/model/session.js +5 -0
- package/build/model/session.js.map +1 -1
- package/build/provider/ajax.service.d.ts +3 -3
- package/build/provider/ajax.service.js +30 -12
- package/build/provider/ajax.service.js.map +1 -1
- package/build/provider/base-backend-connection.service.d.ts +1 -1
- package/build/provider/base-backend-connection.service.js +2 -4
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/build/service/business-object-factory.js +8 -3
- package/build/service/business-object-factory.js.map +1 -1
- package/build/service/login.service.d.ts +0 -1
- package/build/service/login.service.js +10 -6
- package/build/service/login.service.js.map +1 -1
- package/package.json +1 -1
package/build/connector.js
CHANGED
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Connector = void 0;
|
|
4
4
|
const rxjs_1 = require("rxjs");
|
|
5
|
+
const session_1 = require("./model/session");
|
|
5
6
|
const business_object_factory_1 = require("./service/business-object-factory");
|
|
6
7
|
const ajax_service_1 = require("./provider/ajax.service");
|
|
7
8
|
class Connector {
|
|
8
9
|
constructor(options) {
|
|
9
|
-
this.session =
|
|
10
|
+
this.session = new session_1.Session();
|
|
10
11
|
this.useLoginEncryption = false;
|
|
11
12
|
this.boFactory = new business_object_factory_1.BusinessObjectFactory();
|
|
12
13
|
this.subs = [];
|
|
@@ -30,7 +31,7 @@ class Connector {
|
|
|
30
31
|
this.useLoginEncryption = options.hasOwnProperty("useLoginEncryption") ? options.useLoginEncryption : true;
|
|
31
32
|
}
|
|
32
33
|
this.connection = new ajax_service_1.AjaxService(options);
|
|
33
|
-
if (
|
|
34
|
+
if (this.connection.hasOwnProperty('session')) {
|
|
34
35
|
this.session = this.connection['session'];
|
|
35
36
|
}
|
|
36
37
|
this.subs.push(this.connection.showLoader.subscribe(value => this.showLoader.next(value)), this.connection.connectionAborted.subscribe(() => this.connectionAborted.next()), this.connection.connectionResetInactivity.subscribe(() => this._handleConnectionReset()));
|
package/build/connector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":";;;AACA,+BAA2C;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":";;;AACA,+BAA2C;AAC3C,6CAAwC;AACxC,+EAAwE;AACxE,0DAAoD;AAMpD,MAAa,SAAS;IAqBlB,YAAY,OAAiB;QAdtB,YAAO,GAAY,IAAI,iBAAO,EAAE,CAAC;QACjC,uBAAkB,GAAY,KAAK,CAAC;QAEpC,cAAS,GAA0B,IAAI,+CAAqB,EAAE,CAAC;QAErD,SAAI,GAAmB,EAAE,CAAC;QAK3B,eAAU,GAAqB,IAAI,cAAO,EAAW,CAAC;QACtD,sBAAiB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QACvD,8BAAyB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QAuCvE,sBAAiB,GAAG,GAAG,EAAE;YAC7B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACxC,MAAM,CAAC,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACnE,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA;QAzCG,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YACzC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YACxF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;SAC9G;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,0BAAW,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CACV,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAC1E,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAChF,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAC3F,CAAC;QAGF,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,IAAgD,EAC9E,UAAmB,EAAE,OAAe,EAAE,QAAiB;QACvD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnF,CAAC;IAEO,sBAAsB;QAC1B,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;CAQJ;AAhED,8BAgEC"}
|
package/build/model/login.js
CHANGED
package/build/model/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/model/login.ts"],"names":[],"mappings":";;;AAAA,MAAa,KAAK;IAAlB;QAEW,SAAI,GAAW,EAAE,CAAC;QAClB,kBAAa,GAAW,EAAE,CAAC;QAE3B,yBAAoB,GAAW,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/model/login.ts"],"names":[],"mappings":";;;AAAA,MAAa,KAAK;IAAlB;QAEW,SAAI,GAAW,EAAE,CAAC;QAClB,kBAAa,GAAW,EAAE,CAAC;QAE3B,yBAAoB,GAAW,GAAG,CAAC;QAiBlC,cAAS,GAAW,GAAG,CAAC;IAapC,CAAC;IA5BG,IAAW,QAAQ,CAAC,KAAa;QAC7B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAW,QAAQ,CAAC,KAAa;QAC7B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD,IAAW,aAAa,CAAC,KAAa;QAClC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAChC,CAAC;IAMM,aAAa;QAChB,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,YAAY,EAAE,IAAI,CAAC,SAAS;YAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;SAClD,CAAC;IACN,CAAC;CACJ;AAnCD,sBAmCC"}
|
package/build/model/session.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Subject } from 'rxjs';
|
|
1
2
|
export declare class Session {
|
|
2
3
|
id: string;
|
|
3
4
|
dataSessionId: string;
|
|
@@ -5,5 +6,10 @@ export declare class Session {
|
|
|
5
6
|
set created(value: boolean);
|
|
6
7
|
get created(): boolean;
|
|
7
8
|
loggingIn: boolean;
|
|
9
|
+
dataSessionCreated: Subject<void>;
|
|
10
|
+
loggedOut: boolean;
|
|
11
|
+
publicToken: string;
|
|
12
|
+
gettingPublicToken: boolean;
|
|
13
|
+
publicTokenCreated: Subject<void>;
|
|
8
14
|
private _created;
|
|
9
15
|
}
|
package/build/model/session.js
CHANGED
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Session = void 0;
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
4
5
|
class Session {
|
|
5
6
|
constructor() {
|
|
6
7
|
this.loggingIn = false;
|
|
8
|
+
this.dataSessionCreated = new rxjs_1.Subject();
|
|
9
|
+
this.loggedOut = false;
|
|
10
|
+
this.gettingPublicToken = false;
|
|
11
|
+
this.publicTokenCreated = new rxjs_1.Subject();
|
|
7
12
|
this._created = false;
|
|
8
13
|
}
|
|
9
14
|
set created(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/model/session.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/model/session.ts"],"names":[],"mappings":";;;AAAA,+BAAmD;AAEnD,MAAa,OAAO;IAApB;QAWW,cAAS,GAAY,KAAK,CAAC;QAC3B,uBAAkB,GAAkB,IAAI,cAAO,EAAE,CAAC;QAClD,cAAS,GAAY,KAAK,CAAC;QAG3B,uBAAkB,GAAY,KAAK,CAAC;QACpC,uBAAkB,GAAkB,IAAI,cAAO,EAAE,CAAC;QAEjD,aAAQ,GAAY,KAAK,CAAC;IACtC,CAAC;IAfG,IAAW,OAAO,CAAC,KAAc;QAC7B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC1B,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CAUJ;AApBD,0BAoBC"}
|
|
@@ -5,14 +5,14 @@ import { ServerResponseData } from "../model/server-response-data";
|
|
|
5
5
|
import { PublicServiceRequestData } from '../model/public-service-request-data';
|
|
6
6
|
export declare class AjaxService extends BaseBackendConnectionService {
|
|
7
7
|
private _showLoaderRequests;
|
|
8
|
-
private _schema;
|
|
9
8
|
private _usePublicToken;
|
|
10
|
-
private _token;
|
|
11
9
|
private _timeout;
|
|
12
10
|
constructor(options: Options);
|
|
13
11
|
call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string): Promise<ServerResponseData>;
|
|
14
12
|
close(): void;
|
|
13
|
+
protected waitForPublicToken(): Promise<boolean>;
|
|
14
|
+
private _createPublicSession;
|
|
15
|
+
private _waitForPublicTokenToFinish;
|
|
15
16
|
private _doCall;
|
|
16
17
|
private setShowLoaderRequests;
|
|
17
|
-
private _createPublicSession;
|
|
18
18
|
}
|
|
@@ -12,19 +12,18 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
12
12
|
super(options);
|
|
13
13
|
this._showLoaderRequests = 0;
|
|
14
14
|
this._usePublicToken = true;
|
|
15
|
-
this._token = undefined;
|
|
16
15
|
this._timeout = 180000;
|
|
17
|
-
this.
|
|
16
|
+
this.schema = options.schema;
|
|
18
17
|
if (options && options.timeoutInMs) {
|
|
19
18
|
this._timeout = options.timeoutInMs;
|
|
20
19
|
}
|
|
21
|
-
if (options && (
|
|
20
|
+
if (options && (options.username && options.password)) {
|
|
22
21
|
this._usePublicToken = false;
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
24
|
async call(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService) {
|
|
26
|
-
if (this._usePublicToken
|
|
27
|
-
|
|
25
|
+
if (this._usePublicToken) {
|
|
26
|
+
await this.waitForPublicToken();
|
|
28
27
|
}
|
|
29
28
|
if (this._usePublicToken || (service === backend_service_name_enum_1.BackendServiceName.PublicService ||
|
|
30
29
|
service === backend_service_name_enum_1.BackendServiceName.LoginService ||
|
|
@@ -44,6 +43,31 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
44
43
|
this.closeDataSession();
|
|
45
44
|
}
|
|
46
45
|
}
|
|
46
|
+
async waitForPublicToken() {
|
|
47
|
+
if (this.session && this.session.publicToken) {
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
if (this.session.gettingPublicToken) {
|
|
51
|
+
return await this._waitForPublicTokenToFinish();
|
|
52
|
+
}
|
|
53
|
+
this.session.gettingPublicToken = true;
|
|
54
|
+
await this._createPublicSession();
|
|
55
|
+
this.session.gettingPublicToken = false;
|
|
56
|
+
}
|
|
57
|
+
async _createPublicSession() {
|
|
58
|
+
const data = {
|
|
59
|
+
upId: this.schema
|
|
60
|
+
};
|
|
61
|
+
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);
|
|
62
|
+
this.session.publicTokenCreated.next();
|
|
63
|
+
}
|
|
64
|
+
async _waitForPublicTokenToFinish() {
|
|
65
|
+
return new Promise((resolve) => {
|
|
66
|
+
this.session.publicTokenCreated.subscribe(() => {
|
|
67
|
+
resolve(true);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
}
|
|
47
71
|
_doCall(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService) {
|
|
48
72
|
if (showLoader) {
|
|
49
73
|
this.setShowLoaderRequests(this._showLoaderRequests + 1);
|
|
@@ -55,7 +79,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
55
79
|
message = JSON.stringify({
|
|
56
80
|
method: method,
|
|
57
81
|
data: data,
|
|
58
|
-
token: this.
|
|
82
|
+
token: this.session.publicToken
|
|
59
83
|
});
|
|
60
84
|
}
|
|
61
85
|
else {
|
|
@@ -108,12 +132,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
|
|
|
108
132
|
this.showLoader.next(false);
|
|
109
133
|
}
|
|
110
134
|
}
|
|
111
|
-
async _createPublicSession() {
|
|
112
|
-
const data = {
|
|
113
|
-
upId: this._schema
|
|
114
|
-
};
|
|
115
|
-
return 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);
|
|
116
|
-
}
|
|
117
135
|
}
|
|
118
136
|
exports.AjaxService = AjaxService;
|
|
119
137
|
//# sourceMappingURL=ajax.service.js.map
|
|
@@ -1 +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;AAGhD,MAAa,WAAY,SAAQ,8DAA4B;
|
|
1
|
+
{"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,9 @@ export declare abstract class BaseBackendConnectionService {
|
|
|
10
10
|
options: Options;
|
|
11
11
|
protected callId: string;
|
|
12
12
|
protected url: string;
|
|
13
|
+
protected schema: string;
|
|
13
14
|
private _loginService;
|
|
14
15
|
private _datasessionService;
|
|
15
|
-
private _loginBusy;
|
|
16
16
|
constructor(options: Options);
|
|
17
17
|
abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName): Promise<any>;
|
|
18
18
|
commit(): Promise<boolean>;
|
|
@@ -10,8 +10,8 @@ class BaseBackendConnectionService {
|
|
|
10
10
|
this.showLoader = new rxjs_1.Subject();
|
|
11
11
|
this.connectionAborted = new rxjs_1.Subject();
|
|
12
12
|
this.connectionResetInactivity = new rxjs_1.Subject();
|
|
13
|
+
this.session = new session_1.Session();
|
|
13
14
|
this.callId = "1";
|
|
14
|
-
this._loginBusy = false;
|
|
15
15
|
this.options = options;
|
|
16
16
|
this.url = options.url;
|
|
17
17
|
if (options.session) {
|
|
@@ -27,9 +27,7 @@ class BaseBackendConnectionService {
|
|
|
27
27
|
return this._datasessionService.commit();
|
|
28
28
|
}
|
|
29
29
|
closeDataSession() {
|
|
30
|
-
|
|
31
|
-
this._loginService.logout();
|
|
32
|
-
}
|
|
30
|
+
this._loginService.logout();
|
|
33
31
|
}
|
|
34
32
|
resetConnection() {
|
|
35
33
|
if (this.session) {
|
|
@@ -1 +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;
|
|
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;AAOlE,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,aAAa,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,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,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;IAChC,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,aAAa,CAAC,oBAAoB,EAAE,CAAC;SAC1D;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAC9B,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,EAAE,CAAC;QACrD,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"}
|
|
@@ -10,6 +10,7 @@ const is_nill_function_1 = require("../utils/function/is-nill.function");
|
|
|
10
10
|
const array_utils_1 = require("../utils/array-utils");
|
|
11
11
|
const business_object_1 = require("../model/business-object");
|
|
12
12
|
const map_property_decorator_1 = require("../factory/decorators/map-property.decorator");
|
|
13
|
+
const json_decorator_1 = require("../factory/decorators/json.decorator");
|
|
13
14
|
class BusinessObjectFactory {
|
|
14
15
|
constructor() {
|
|
15
16
|
}
|
|
@@ -47,18 +48,22 @@ class BusinessObjectFactory {
|
|
|
47
48
|
if (!sourceData.hasOwnProperty(srcPropKey)) {
|
|
48
49
|
continue;
|
|
49
50
|
}
|
|
50
|
-
|
|
51
|
+
let srcPropVal = sourceData[srcPropKey];
|
|
51
52
|
for (let prop in destinationModel) {
|
|
52
53
|
if (destinationModel.hasOwnProperty(prop)) {
|
|
53
54
|
if (map_property_decorator_1.MapPropertyDecorator.IsMapProperty(destinationModel, prop)) {
|
|
54
|
-
const
|
|
55
|
-
|
|
55
|
+
const destPropKeys = map_property_decorator_1.MapPropertyDecorator.GetMapProperty(destinationModel, prop).split(',');
|
|
56
|
+
const keyFound = destPropKeys.find(k => k.trim() === srcPropKey);
|
|
57
|
+
if (keyFound) {
|
|
56
58
|
srcPropKey = prop;
|
|
57
59
|
break;
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
}
|
|
64
|
+
if (json_decorator_1.JsonFieldFieldDecorator.IsJsonField(destinationModel, srcPropKey)) {
|
|
65
|
+
srcPropVal = json_decorator_1.JsonFieldFieldDecorator.StringAsJson(srcPropVal);
|
|
66
|
+
}
|
|
62
67
|
if (complex_field_decorator_1.ComplexFieldDecorator.IsComplexField(destinationModel, srcPropKey)) {
|
|
63
68
|
const classOfField = complex_field_decorator_1.ComplexFieldDecorator.GetComplexFieldType(destinationModel, srcPropKey);
|
|
64
69
|
destinationModel[srcPropKey] = this.makeWithRawBackendData(classOfField, srcPropVal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"business-object-factory.js","sourceRoot":"","sources":["../../src/service/business-object-factory.ts"],"names":[],"mappings":";;;AAAA,2FAAoF;AACpF,2FAAoF;AACpF,+EAA6E;AAC7E,qFAAmF;AACnF,2FAAoF;AACpF,yEAA0D;AAC1D,sDAAgD;AAChD,8DAAwD;AACxD,yFAAkF;
|
|
1
|
+
{"version":3,"file":"business-object-factory.js","sourceRoot":"","sources":["../../src/service/business-object-factory.ts"],"names":[],"mappings":";;;AAAA,2FAAoF;AACpF,2FAAoF;AACpF,+EAA6E;AAC7E,qFAAmF;AACnF,2FAAoF;AACpF,yEAA0D;AAC1D,sDAAgD;AAChD,8DAAwD;AACxD,yFAAkF;AAClF,yEAA6E;AAG7E,MAAa,qBAAqB;IAC9B;IACA,CAAC;IAUM,sBAAsB,CAAC,UAAe,EAAE,OAAe;QAC1D,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,OAAO,UAAU,KAAK,OAAO,gCAAc,EAAE;YAC7C,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,KAAK,GAAmB,IAAI,UAAU,EAAE,CAAC;QAC/C,IAAI,CAAC,wCAAwC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACjB,CAAC;IAGM,kCAAkC,CAAC,UAAe,EAAE,eAAyB;QAChF,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,aAAa,GAAqB,EAAE,CAAC;QAC3C,IAAI,eAAe,EAAE;YACjB,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,GAAG,GAAW,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBACxE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACnF;SACJ;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,gBAAgB,CAAC,UAAe;QACnC,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IASO,wCAAwC,CAAC,UAAe,EAAE,gBAAgC;QAC9F,IAAI,CAAC,UAAU,IAAI,CAAC,gBAAgB,EAAE;YAClC,OAAO;SACV;QAGD,KAAK,IAAI,UAAU,IAAI,UAAU,EAAE;YAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;gBACxC,SAAS;aACZ;YAED,IAAI,UAAU,GAAQ,UAAU,CAAC,UAAU,CAAC,CAAC;YAE7C,KAAK,IAAI,IAAI,IAAI,gBAAgB,EAAE;gBAC/B,IAAI,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBACvC,IAAI,6CAAoB,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;wBAC5D,MAAM,YAAY,GAAa,6CAAoB,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACtG,MAAM,QAAQ,GAAW,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,UAAU,CAAC,CAAC;wBACzE,IAAI,QAAQ,EAAE;4BACV,UAAU,GAAG,IAAI,CAAC;4BAClB,MAAM;yBACT;qBACJ;iBACJ;aACJ;YACD,IAAI,wCAAuB,CAAC,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBACnE,UAAU,GAAG,wCAAuB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;aACjE;YACD,IAAI,+CAAqB,CAAC,cAAc,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBACpE,MAAM,YAAY,GAAQ,+CAAqB,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;gBAClG,gBAAgB,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aACxF;iBAAM,IAAI,+CAAqB,CAAC,cAAc,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBAC3E,MAAM,WAAW,GAAU,UAAU,CAAC;gBACtC,IAAI,CAAC,WAAW,EAAE;oBACd,SAAS;iBACZ;gBACD,MAAM,iBAAiB,GAAQ,+CAAqB,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;gBACvG,MAAM,SAAS,GAAU,EAAE,CAAC;gBAC5B,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,GAAG,GAAW,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;oBACpE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAClF;gBACD,gBAAgB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;aAC5C;iBAAM,IAAI,wCAAoB,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBAE9E,IAAI,OAAO,UAAU,KAAK,SAAS,EAAE;oBACjC,gBAAgB,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;iBAE7C;qBAAM;oBACH,gBAAgB,CAAC,UAAU,CAAC,GAAG,wCAAoB,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;iBAC1F;aACJ;iBAAM,IAAI,8CAAuB,CAAC,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBAC1E,gBAAgB,CAAC,UAAU,CAAC,GAAG,8CAAuB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;aACnF;iBAAM,IAAI,+CAAqB,CAAC,cAAc,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE;gBAC3E,gBAAgB,CAAC,UAAU,CAAC,GAAG,+CAAqB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;aACnF;iBAEI;gBACD,IAAI,IAAA,yBAAM,EAAC,UAAU,CAAC,EAAE;oBACpB,gBAAgB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;iBAC5C;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;oBAClC,gBAAgB,CAAC,UAAU,CAAC,GAAG,wBAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;iBACpE;qBAAM,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;oBACvC,IAAI,UAAU,YAAY,GAAG,EAAE;wBAC3B,gBAAgB,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;qBAC7C;yBAAM;wBACH,gBAAgB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;qBAChE;iBACJ;qBAAM;oBACH,gBAAgB,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;iBAC7C;aACJ;SACJ;IACL,CAAC;CACJ;AA5HD,sDA4HC"}
|
|
@@ -2,7 +2,6 @@ import { Login } from "../model/login";
|
|
|
2
2
|
import { BaseBackendConnectionService } from "../provider/base-backend-connection.service";
|
|
3
3
|
export declare class LoginService {
|
|
4
4
|
private static HEARTBEAT_INTERVAL_MS;
|
|
5
|
-
loggingOut: boolean;
|
|
6
5
|
protected heartbeatTimer: any;
|
|
7
6
|
protected backendConnection: BaseBackendConnectionService;
|
|
8
7
|
protected windowsSessionId: number;
|
|
@@ -12,7 +12,6 @@ const login_response_1 = require("../model/login-response");
|
|
|
12
12
|
const rxjs_1 = require("rxjs");
|
|
13
13
|
class LoginService {
|
|
14
14
|
constructor(backendConnection) {
|
|
15
|
-
this.loggingOut = false;
|
|
16
15
|
this.windowsSessionId = 1;
|
|
17
16
|
this._useEncryption = false;
|
|
18
17
|
this._boFactory = new business_object_factory_1.BusinessObjectFactory();
|
|
@@ -57,6 +56,7 @@ class LoginService {
|
|
|
57
56
|
if (datasessionCreated === true) {
|
|
58
57
|
this.backendConnection.session.created = true;
|
|
59
58
|
this._dataSessionCreated.next();
|
|
59
|
+
this.backendConnection.session.dataSessionCreated.next();
|
|
60
60
|
this._startHeartBeat();
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
@@ -71,14 +71,18 @@ class LoginService {
|
|
|
71
71
|
this._dataSessionCreated.subscribe(() => {
|
|
72
72
|
resolve(true);
|
|
73
73
|
});
|
|
74
|
+
this.backendConnection.session.dataSessionCreated.subscribe(() => {
|
|
75
|
+
resolve(true);
|
|
76
|
+
});
|
|
74
77
|
});
|
|
75
78
|
}
|
|
76
79
|
logout() {
|
|
77
|
-
this.
|
|
78
|
-
|
|
79
|
-
this.
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
if (!this.backendConnection.session.loggedOut) {
|
|
81
|
+
this.backendConnection.session.loggedOut = true;
|
|
82
|
+
return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
|
|
83
|
+
this._stopHeartBeat();
|
|
84
|
+
});
|
|
85
|
+
}
|
|
82
86
|
}
|
|
83
87
|
_login() {
|
|
84
88
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AACrE,iFAAqE;AACrE,0CAAqC;AAErC,uDAAiD;AACjD,+DAAyD;AACzD,qDAA+C;AAG/C,uEAAgE;AAEhE,4DAAsD;AACtD,+BAA6B;AAE7B,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
|