@colijnit/ioneconnector 2.1.12 → 2.1.14

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.
Files changed (62) hide show
  1. package/build/connector.d.ts +11 -7
  2. package/build/connector.js +30 -10
  3. package/build/connector.js.map +1 -1
  4. package/build/connector.unit.test.js +22 -0
  5. package/build/connector.unit.test.js.map +1 -1
  6. package/build/enum/activate-user-account-status.enum.d.ts +6 -0
  7. package/build/enum/activate-user-account-status.enum.js +11 -0
  8. package/build/enum/activate-user-account-status.enum.js.map +1 -0
  9. package/build/enum/login-service-method.enum.d.ts +11 -6
  10. package/build/enum/login-service-method.enum.js +11 -6
  11. package/build/enum/login-service-method.enum.js.map +1 -1
  12. package/build/enum/login-status.enum.d.ts +20 -0
  13. package/build/enum/login-status.enum.js +25 -0
  14. package/build/enum/login-status.enum.js.map +1 -0
  15. package/build/enum/reset-password-status.enum.d.ts +5 -0
  16. package/build/enum/reset-password-status.enum.js +10 -0
  17. package/build/enum/reset-password-status.enum.js.map +1 -0
  18. package/build/enum/user-role-type.enum.d.ts +17 -0
  19. package/build/enum/user-role-type.enum.js +22 -0
  20. package/build/enum/user-role-type.enum.js.map +1 -0
  21. package/build/model/login-request.d.ts +13 -0
  22. package/build/model/login-request.interface.d.ts +12 -0
  23. package/build/model/login-request.interface.js +3 -0
  24. package/build/model/login-request.interface.js.map +1 -0
  25. package/build/model/login-request.js +7 -0
  26. package/build/model/login-request.js.map +1 -0
  27. package/build/model/login-response.d.ts +15 -6
  28. package/build/model/login-response.js +50 -0
  29. package/build/model/login-response.js.map +1 -1
  30. package/build/model/login-service-request-data.d.ts +15 -0
  31. package/build/model/login-service-request-data.js +3 -0
  32. package/build/model/login-service-request-data.js.map +1 -0
  33. package/build/model/login.js +0 -3
  34. package/build/model/login.js.map +1 -1
  35. package/build/model/menu-content.bo.d.ts +13 -0
  36. package/build/model/menu-content.bo.js +14 -0
  37. package/build/model/menu-content.bo.js.map +1 -0
  38. package/build/model/options.d.ts +1 -0
  39. package/build/model/options.js +1 -0
  40. package/build/model/options.js.map +1 -1
  41. package/build/model/session.d.ts +4 -0
  42. package/build/model/session.js +3 -0
  43. package/build/model/session.js.map +1 -1
  44. package/build/model/user-parameters-values.bo.d.ts +8 -0
  45. package/build/model/user-parameters-values.bo.js +8 -0
  46. package/build/model/user-parameters-values.bo.js.map +1 -0
  47. package/build/provider/ajax.service.d.ts +14 -4
  48. package/build/provider/ajax.service.js +56 -14
  49. package/build/provider/ajax.service.js.map +1 -1
  50. package/build/provider/base-backend-connection.service.d.ts +5 -3
  51. package/build/provider/base-backend-connection.service.js +5 -7
  52. package/build/provider/base-backend-connection.service.js.map +1 -1
  53. package/build/service/login.service.d.ts +13 -5
  54. package/build/service/login.service.js +76 -25
  55. package/build/service/login.service.js.map +1 -1
  56. package/build/service/public.service.d.ts +1 -1
  57. package/build/service/public.service.js +1 -1
  58. package/build/service/public.service.js.map +1 -1
  59. package/package.json +1 -1
  60. package/build/factory/business-object-factory.d.ts +0 -16
  61. package/build/factory/business-object-factory.js +0 -178
  62. package/build/factory/business-object-factory.js.map +0 -1
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MenuContent = void 0;
4
+ const business_object_1 = require("./business-object");
5
+ class MenuContent extends business_object_1.BusinessObject {
6
+ constructor() {
7
+ super();
8
+ }
9
+ getId() {
10
+ return this.itemId;
11
+ }
12
+ }
13
+ exports.MenuContent = MenuContent;
14
+ //# sourceMappingURL=menu-content.bo.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"menu-content.bo.js","sourceRoot":"","sources":["../../src/model/menu-content.bo.ts"],"names":[],"mappings":";;;AAAA,uDAAiD;AAGjD,MAAa,WAAY,SAAQ,gCAAc;IAU3C;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ;AAjBD,kCAiBC"}
@@ -17,4 +17,5 @@ export declare class Options {
17
17
  useLoginEncryption?: boolean;
18
18
  languageCode?: string;
19
19
  timeoutInMs?: number;
20
+ withCredentials?: boolean;
20
21
  }
@@ -9,6 +9,7 @@ class Options {
9
9
  this.useArticleIds = false;
10
10
  this.use3D = false;
11
11
  this.useLoginEncryption = false;
12
+ this.withCredentials = true;
12
13
  }
13
14
  }
14
15
  exports.Options = Options;
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAApB;QAEW,iBAAY,GAAa,KAAK,CAAC;QAU/B,cAAS,GAAa,IAAI,CAAC;QAC3B,eAAU,GAAa,KAAK,CAAC;QAC7B,kBAAa,GAAa,KAAK,CAAC;QAChC,UAAK,GAAa,KAAK,CAAC;QACxB,uBAAkB,GAAa,KAAK,CAAC;IAIhD,CAAC;CAAA;AApBD,0BAoBC"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/model/options.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAApB;QAEW,iBAAY,GAAa,KAAK,CAAC;QAU/B,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,oBAAe,GAAa,IAAI,CAAC;IAC5C,CAAC;CAAA;AApBD,0BAoBC"}
@@ -7,5 +7,9 @@ export declare class Session {
7
7
  get created(): boolean;
8
8
  loggingIn: boolean;
9
9
  dataSessionCreated: Subject<void>;
10
+ loggedOut: boolean;
11
+ publicToken: string;
12
+ gettingPublicToken: boolean;
13
+ publicTokenCreated: Subject<void>;
10
14
  private _created;
11
15
  }
@@ -6,6 +6,9 @@ class Session {
6
6
  constructor() {
7
7
  this.loggingIn = false;
8
8
  this.dataSessionCreated = new rxjs_1.Subject();
9
+ this.loggedOut = false;
10
+ this.gettingPublicToken = false;
11
+ this.publicTokenCreated = new rxjs_1.Subject();
9
12
  this._created = false;
10
13
  }
11
14
  set created(value) {
@@ -1 +1 @@
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;QACjD,aAAQ,GAAY,KAAK,CAAC;IACtC,CAAC;IATG,IAAW,OAAO,CAAC,KAAc;QAC7B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC1B,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CAIJ;AAdD,0BAcC"}
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"}
@@ -0,0 +1,8 @@
1
+ import { BusinessObject } from './business-object';
2
+ export declare class UserParametersValues extends BusinessObject {
3
+ formatDate: string;
4
+ dayOfWeekNr: number;
5
+ decimalSign: string;
6
+ threeDAssetURL: string;
7
+ gridColor: string;
8
+ }
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.UserParametersValues = void 0;
4
+ const business_object_1 = require("./business-object");
5
+ class UserParametersValues extends business_object_1.BusinessObject {
6
+ }
7
+ exports.UserParametersValues = UserParametersValues;
8
+ //# sourceMappingURL=user-parameters-values.bo.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"user-parameters-values.bo.js","sourceRoot":"","sources":["../../src/model/user-parameters-values.bo.ts"],"names":[],"mappings":";;;AAAA,uDAAiD;AAEjD,MAAa,oBAAqB,SAAQ,gCAAc;CAevD;AAfD,oDAeC"}
@@ -3,16 +3,26 @@ import { DataServiceData } from "../model/data-service-data";
3
3
  import { BaseBackendConnectionService } from "./base-backend-connection.service";
4
4
  import { ServerResponseData } from "../model/server-response-data";
5
5
  import { PublicServiceRequestData } from '../model/public-service-request-data';
6
+ import { LoginRequest } from '../model/login-request';
7
+ import { LoginResponse } from '../model/login-response';
6
8
  export declare class AjaxService extends BaseBackendConnectionService {
7
9
  private _showLoaderRequests;
8
- private _schema;
9
10
  private _usePublicToken;
10
- private _token;
11
11
  private _timeout;
12
12
  constructor(options: Options);
13
13
  call(method: string, data?: DataServiceData | PublicServiceRequestData, showLoader?: boolean, service?: string, endPoint?: string): Promise<ServerResponseData>;
14
- close(): void;
14
+ login(request: LoginRequest, encrypt: boolean): Promise<LoginResponse>;
15
+ confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
16
+ resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
17
+ changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
18
+ changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
19
+ sendResetPasswordOrInviteMessage(upId: number, userName: string, reCaptchaResponse: string): Promise<ServerResponseData>;
20
+ getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
21
+ getPublicKey(): Promise<string>;
22
+ close(): Promise<ServerResponseData>;
23
+ protected waitForPublicToken(): Promise<boolean>;
24
+ private _createPublicSession;
25
+ private _waitForPublicTokenToFinish;
15
26
  private _doCall;
16
27
  private setShowLoaderRequests;
17
- private _createPublicSession;
18
28
  }
@@ -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._schema = options.schema;
16
+ this.schema = options.schema;
18
17
  if (options && options.timeoutInMs) {
19
18
  this._timeout = options.timeoutInMs;
20
19
  }
21
- if (options && ((options.username && options.password) || options.session)) {
20
+ if (options && ((options.username && options.password) || !options.withCredentials)) {
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 && !this._token) {
27
- this._token = await this._createPublicSession();
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 ||
@@ -36,13 +35,62 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
36
35
  return this._doCall(method, data, showLoader, service, endPoint);
37
36
  }
38
37
  }
38
+ async login(request, encrypt) {
39
+ return this.loginService.login(request, encrypt);
40
+ }
41
+ async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
42
+ return this.loginService.confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA);
43
+ }
44
+ async resetGoogleAuth(upId, userName) {
45
+ return this.loginService.resetGoogleAuth(upId, userName);
46
+ }
47
+ async changePassword(password, securityCode, upId) {
48
+ return this.loginService.changePassword(password, securityCode, upId);
49
+ }
50
+ async changePasswordAndActivateUser(password, securityCode, upId, reCaptchaResponse) {
51
+ return this.loginService.changePasswordAndActivateUser(password, securityCode, upId, reCaptchaResponse);
52
+ }
53
+ async sendResetPasswordOrInviteMessage(upId, userName, reCaptchaResponse) {
54
+ return this.loginService.sendResetPasswordOrInviteMessage(upId, userName, reCaptchaResponse);
55
+ }
56
+ async getUserNameBySecurityCode(securityCode, upId) {
57
+ return this.loginService.getUserNameBySecurityCode(securityCode, upId);
58
+ }
59
+ async getPublicKey() {
60
+ return this.loginService.getPublicKey();
61
+ }
39
62
  close() {
40
63
  if (this._usePublicToken) {
41
- this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {});
64
+ return this._doCall(datasession_service_method_enum_1.DatasessionServiceMethod.ClosePublicSession, {});
42
65
  }
43
66
  else {
44
- this.closeDataSession();
67
+ return this.closeDataSession();
68
+ }
69
+ }
70
+ async waitForPublicToken() {
71
+ if (this.session && this.session.publicToken) {
72
+ return true;
73
+ }
74
+ if (this.session.gettingPublicToken) {
75
+ return await this._waitForPublicTokenToFinish();
45
76
  }
77
+ this.session.gettingPublicToken = true;
78
+ await this._createPublicSession();
79
+ this.session.gettingPublicToken = false;
80
+ }
81
+ async _createPublicSession() {
82
+ const data = {
83
+ upId: this.schema
84
+ };
85
+ 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);
86
+ this.session.publicTokenCreated.next();
87
+ }
88
+ async _waitForPublicTokenToFinish() {
89
+ return new Promise((resolve) => {
90
+ this.session.publicTokenCreated.subscribe(() => {
91
+ resolve(true);
92
+ });
93
+ });
46
94
  }
47
95
  _doCall(method, data = {}, showLoader = true, service = backend_service_name_enum_1.BackendServiceName.LoginService, endPoint = end_point_enum_1.EndPoint.AjaxService) {
48
96
  if (showLoader) {
@@ -55,7 +103,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
55
103
  message = JSON.stringify({
56
104
  method: method,
57
105
  data: data,
58
- token: this._token
106
+ token: this.session.publicToken
59
107
  });
60
108
  }
61
109
  else {
@@ -108,12 +156,6 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
108
156
  this.showLoader.next(false);
109
157
  }
110
158
  }
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
159
  }
118
160
  exports.AjaxService = AjaxService;
119
161
  //# 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;IAQzD,YAAY,OAAgB;QACxB,KAAK,CAAC,OAAO,CAAC,CAAC;QARX,wBAAmB,GAAW,CAAC,CAAC;QAEhC,oBAAe,GAAY,IAAI,CAAC;QAChC,WAAM,GAAW,SAAS,CAAC;QAE3B,aAAQ,GAAW,MAAM,CAAC;QAI9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9B,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,OAAO,CAAC,OAAO,CAAC,EAAE;YACxE,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,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;SACnD;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;QACR,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,0DAAwB,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;SACjE;aAAM;YACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC3B;IACL,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,MAAM;iBACrB,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;IAEO,KAAK,CAAC,oBAAoB;QAC9B,MAAM,IAAI,GAAoB;YAC1B,IAAI,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;QAEF,OAAO,MAAuB,IAAI,CAAC,OAAO,CACtC,0DAAwB,CAAC,mBAAmB,EAC5C,IAAI,EACJ,KAAK,EACL,8CAAkB,CAAC,aAAa,EAChC,yBAAQ,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;CACJ;AA3HD,kCA2HC"}
1
+ {"version":3,"file":"ajax.service.js","sourceRoot":"","sources":["../../src/provider/ajax.service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
1
  import { BackendServiceName } from "../enum/backend-service-name.enum";
2
2
  import { Session } from "../model/session";
3
+ import { LoginService } from "../service/login.service";
3
4
  import { Subject } from 'rxjs';
4
5
  import { Options } from "../model/options";
6
+ import { ServerResponseData } from '../model/server-response-data';
5
7
  export declare abstract class BaseBackendConnectionService {
6
8
  readonly showLoader: Subject<boolean>;
7
9
  readonly connectionAborted: Subject<void>;
@@ -10,13 +12,13 @@ export declare abstract class BaseBackendConnectionService {
10
12
  options: Options;
11
13
  protected callId: string;
12
14
  protected url: string;
13
- private _loginService;
15
+ protected schema: string;
16
+ protected loginService: LoginService;
14
17
  private _datasessionService;
15
- private _loginBusy;
16
18
  constructor(options: Options);
17
19
  abstract call(method: string, data: any, showLoader: boolean, service: BackendServiceName): Promise<any>;
18
20
  commit(): Promise<boolean>;
19
- closeDataSession(): void;
21
+ closeDataSession(): Promise<ServerResponseData>;
20
22
  protected resetConnection(): void;
21
23
  protected waitForLogin(): Promise<boolean>;
22
24
  private _createNewSession;
@@ -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) {
@@ -20,16 +20,14 @@ class BaseBackendConnectionService {
20
20
  else {
21
21
  this.session = this._createNewSession();
22
22
  }
23
- this._loginService = new login_service_1.LoginService(this);
23
+ this.loginService = new login_service_1.LoginService(this);
24
24
  this._datasessionService = new datasession_service_1.DatasessionService(this);
25
25
  }
26
26
  async commit() {
27
27
  return this._datasessionService.commit();
28
28
  }
29
29
  closeDataSession() {
30
- if (!this._loginService.loggingOut) {
31
- this._loginService.logout();
32
- }
30
+ return this.loginService.logout();
33
31
  }
34
32
  resetConnection() {
35
33
  if (this.session) {
@@ -41,10 +39,10 @@ class BaseBackendConnectionService {
41
39
  return true;
42
40
  }
43
41
  if (this.session.loggingIn) {
44
- return await this._loginService.waitForLoginToFinish();
42
+ return await this.loginService.waitForLoginToFinish();
45
43
  }
46
44
  this.session.loggingIn = true;
47
- await this._loginService.loginAndCreateDataSession();
45
+ await this.loginService.loginAndCreateDataSession();
48
46
  this.session.loggingIn = false;
49
47
  }
50
48
  _createNewSession() {
@@ -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;AAIlE,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;QAKrE,WAAM,GAAW,GAAG,CAAC;QAKvB,eAAU,GAAY,KAAK,CAAC;QAGhC,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,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;SAC/B;IACL,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;AA7ED,oEA6EC"}
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"}
@@ -1,12 +1,13 @@
1
- import { Login } from "../model/login";
2
1
  import { BaseBackendConnectionService } from "../provider/base-backend-connection.service";
2
+ import { ServerResponseData } from "../model/server-response-data";
3
+ import { LoginResponse } from "../model/login-response";
4
+ import { LoginRequest } from '../model/login-request';
3
5
  export declare class LoginService {
4
6
  private static HEARTBEAT_INTERVAL_MS;
5
- loggingOut: boolean;
6
7
  protected heartbeatTimer: any;
7
8
  protected backendConnection: BaseBackendConnectionService;
8
9
  protected windowsSessionId: number;
9
- protected loginModel: Login;
10
+ protected loginRequest: LoginRequest;
10
11
  private _encryptionService;
11
12
  private _useEncryption;
12
13
  private _publicService;
@@ -15,10 +16,17 @@ export declare class LoginService {
15
16
  private _creatingDataSession;
16
17
  private _dataSessionCreated;
17
18
  constructor(backendConnection: BaseBackendConnectionService);
19
+ getPublicKey(): Promise<string>;
18
20
  loginAndCreateDataSession(): Promise<boolean>;
19
21
  waitForLoginToFinish(): Promise<boolean>;
20
- logout(): Promise<any>;
21
- private _login;
22
+ logout(): Promise<ServerResponseData>;
23
+ login(request?: LoginRequest, encrypt?: boolean): Promise<LoginResponse>;
24
+ confirmCode(upId: number, userName: string, confirmationCode: string, clientDeviceFingerprint: string, clientDeviceDescription: string, rememberClientDeviceForMFA: boolean): Promise<ServerResponseData>;
25
+ resetGoogleAuth(upId: number, userName: string): Promise<ServerResponseData>;
26
+ changePassword(password: string, securityCode: string, upId: number): Promise<ServerResponseData>;
27
+ changePasswordAndActivateUser(password: string, securityCode: string, upId: number, reCaptchaResponse?: string): Promise<ServerResponseData>;
28
+ sendResetPasswordOrInviteMessage(upId: number, userName: string, reCaptchaResponse: string): Promise<ServerResponseData>;
29
+ getUserNameBySecurityCode(securityCode: string, upId: number): Promise<ServerResponseData>;
22
30
  private _startHeartBeat;
23
31
  private _stopHeartBeat;
24
32
  private _checkEncryption;
@@ -3,23 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LoginService = void 0;
4
4
  const login_service_method_enum_1 = require("../enum/login-service-method.enum");
5
5
  const backend_service_name_enum_1 = require("../enum/backend-service-name.enum");
6
- const login_1 = require("../model/login");
7
6
  const encrypt_service_1 = require("./encrypt.service");
8
7
  const datasession_service_1 = require("./datasession.service");
9
8
  const public_service_1 = require("./public.service");
10
9
  const business_object_factory_1 = require("./business-object-factory");
11
10
  const login_response_1 = require("../model/login-response");
12
11
  const rxjs_1 = require("rxjs");
12
+ const login_request_1 = require("../model/login-request");
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();
19
18
  this._creatingDataSession = false;
20
19
  this._dataSessionCreated = new rxjs_1.Subject();
21
20
  this.backendConnection = backendConnection;
22
- this.loginModel = new login_1.Login();
21
+ this.loginRequest = new login_request_1.LoginRequest();
23
22
  if (this.backendConnection.options.schema === "") {
24
23
  console.error("Schema is not provided");
25
24
  }
@@ -27,17 +26,20 @@ class LoginService {
27
26
  console.error("Version is not provided");
28
27
  }
29
28
  if (this.backendConnection.options.username || this.backendConnection.options.password) {
30
- this.loginModel.userName = this.backendConnection.options.username;
31
- this.loginModel.passWordClean = this.backendConnection.options.password;
29
+ this.loginRequest.userName = this.backendConnection.options.username;
30
+ this.loginRequest.userPassword = this.backendConnection.options.password;
32
31
  }
33
- this.loginModel.upId = this.backendConnection.options.schema;
34
- this.loginModel.clientVersion = this.backendConnection.options.version;
35
- this.loginModel.clientLanguage = this.backendConnection.options.languageCode;
32
+ this.loginRequest.upId = parseInt(this.backendConnection.options.schema, 10);
33
+ this.loginRequest.clientVersion = this.backendConnection.options.version;
34
+ this.loginRequest.clientLanguage = this.backendConnection.options.languageCode;
36
35
  this._useEncryption = this.backendConnection.options.useLoginEncryption;
37
36
  this._encryptionService = new encrypt_service_1.EncryptService();
38
37
  this._publicService = new public_service_1.PublicService(this.backendConnection, this._encryptionService);
39
38
  this._datasessionService = new datasession_service_1.DatasessionService(this.backendConnection);
40
39
  }
40
+ async getPublicKey() {
41
+ return this._publicService.getPublicKey();
42
+ }
41
43
  async loginAndCreateDataSession() {
42
44
  if (this._creatingDataSession) {
43
45
  return new Promise((resolve) => {
@@ -50,7 +52,7 @@ class LoginService {
50
52
  return true;
51
53
  }
52
54
  this._creatingDataSession = true;
53
- await this._login();
55
+ await this.login();
54
56
  const id = this.backendConnection.session.dataSessionId;
55
57
  const datasessionCreated = await this._datasessionService.createDataSession(id);
56
58
  this._creatingDataSession = false;
@@ -78,30 +80,80 @@ class LoginService {
78
80
  });
79
81
  }
80
82
  logout() {
81
- this.loggingOut = true;
82
- return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
83
- this.loggingOut = false;
84
- this._stopHeartBeat();
85
- });
83
+ if (!this.backendConnection.session.loggedOut) {
84
+ this.backendConnection.session.loggedOut = true;
85
+ return this._call(login_service_method_enum_1.LoginServiceMethod.LogoutUser, {}, false).then((userData) => {
86
+ this._stopHeartBeat();
87
+ return userData;
88
+ });
89
+ }
86
90
  }
87
- _login() {
91
+ login(request, encrypt = false) {
92
+ if (request) {
93
+ this.loginRequest = request;
94
+ }
95
+ this._useEncryption = encrypt;
88
96
  return new Promise((resolve, reject) => {
89
97
  this._callLogin()
90
98
  .then((result) => {
91
99
  const loginResponse = this._boFactory.makeWithRawBackendData(login_response_1.LoginResponse, result);
92
- if (loginResponse.loginStatus === "SUCCESS") {
93
- this.loginModel.loggedIn = true;
94
- resolve(loginResponse);
95
- }
96
- else {
97
- reject(loginResponse);
98
- }
100
+ resolve(loginResponse);
99
101
  })
100
102
  .catch((e) => {
101
103
  return reject(e);
102
104
  });
103
105
  });
104
106
  }
107
+ async confirmCode(upId, userName, confirmationCode, clientDeviceFingerprint, clientDeviceDescription, rememberClientDeviceForMFA) {
108
+ const inputParams = {
109
+ upId: upId,
110
+ userName: userName,
111
+ confirmationCode: confirmationCode,
112
+ clientDeviceFingerprint: clientDeviceFingerprint,
113
+ clientDeviceDescription: clientDeviceDescription,
114
+ rememberClientDeviceForMFA: rememberClientDeviceForMFA
115
+ };
116
+ return this._call(login_service_method_enum_1.LoginServiceMethod.ConfirmCode, inputParams, false);
117
+ }
118
+ async resetGoogleAuth(upId, userName) {
119
+ const inputParams = {
120
+ upId: upId,
121
+ userName: userName,
122
+ };
123
+ return this._call(login_service_method_enum_1.LoginServiceMethod.ResetGoogleAuth, inputParams, false);
124
+ }
125
+ async changePassword(password, securityCode, upId) {
126
+ const inputParams = {
127
+ securityCode: securityCode,
128
+ password: password,
129
+ upId: upId
130
+ };
131
+ return this._call(login_service_method_enum_1.LoginServiceMethod.ChangePassword, inputParams, false);
132
+ }
133
+ async changePasswordAndActivateUser(password, securityCode, upId, reCaptchaResponse) {
134
+ const inputParams = {
135
+ password: password,
136
+ securityCode: securityCode,
137
+ upId: upId,
138
+ response: reCaptchaResponse
139
+ };
140
+ return this._call(login_service_method_enum_1.LoginServiceMethod.ChangePasswordAndActivateUser, inputParams, false);
141
+ }
142
+ async sendResetPasswordOrInviteMessage(upId, userName, reCaptchaResponse) {
143
+ const inputParams = {
144
+ upId: upId,
145
+ userName: userName,
146
+ response: reCaptchaResponse
147
+ };
148
+ return this._call(login_service_method_enum_1.LoginServiceMethod.SendResetPasswordOrInviteMessage, inputParams, false);
149
+ }
150
+ async getUserNameBySecurityCode(securityCode, upId) {
151
+ const inputParams = {
152
+ securityCode: securityCode,
153
+ upId: upId,
154
+ };
155
+ return this._call(login_service_method_enum_1.LoginServiceMethod.GetUserNameBySecurityCode, inputParams, true);
156
+ }
105
157
  _startHeartBeat() {
106
158
  if (!this.heartbeatTimer) {
107
159
  this.heartbeatTimer = setInterval(() => {
@@ -118,12 +170,11 @@ class LoginService {
118
170
  _checkEncryption() {
119
171
  return new Promise((resolve) => {
120
172
  if (!this._useEncryption) {
121
- this.loginModel.passWord = this.loginModel.passWordClean;
122
173
  resolve();
123
174
  }
124
175
  else {
125
176
  this._publicService.getPublicKey().then(() => {
126
- this.loginModel.passWord = this._encryptionService.encRsa(this.loginModel.passWordClean);
177
+ this.loginRequest.userPassword = this._encryptionService.encRsa(this.loginRequest.userPassword);
127
178
  resolve();
128
179
  });
129
180
  }
@@ -131,7 +182,7 @@ class LoginService {
131
182
  }
132
183
  _callLogin() {
133
184
  return this._checkEncryption().then(() => {
134
- return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginModel.getSerialized(), true);
185
+ return this._call(login_service_method_enum_1.LoginServiceMethod.Login, this.loginRequest, true);
135
186
  });
136
187
  }
137
188
  _call(method, data, showLoader) {
@@ -1 +1 @@
1
- {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../src/service/login.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AACrE,iFAAqE;AAGrE,uDAAiD;AACjD,+DAAyD;AACzD,qDAA+C;AAG/C,uEAAgE;AAEhE,4DAAsD;AACtD,+BAA6B;AAC7B,0DAAoD;AAIpD,MAAa,YAAY;IAgBrB,YAAY,iBAA+C;QAXjD,qBAAgB,GAAW,CAAC,CAAC;QAI/B,mBAAc,GAAY,KAAK,CAAC;QAGhC,eAAU,GAA0B,IAAI,+CAAqB,EAAE,CAAC;QAChE,yBAAoB,GAAY,KAAK,CAAC;QACtC,wBAAmB,GAAqB,IAAI,cAAO,EAAW,CAAC;QAGnE,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;YAC9C,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,KAAK,EAAE,EAAE;YAC/C,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpF,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;YAErE,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC5E;QACD,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC;QAE/E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACxE,IAAI,CAAC,kBAAkB,GAAG,IAAI,gCAAc,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACzF,IAAI,CAAC,mBAAmB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC9E,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,yBAAyB;QAElC,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;gBACrC,UAAU,CAAC,GAAG,EAAE;oBACZ,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;gBAC9C,CAAC,EAAE,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;SACN;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE;YACxC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,EAAE,GAAW,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC;QAChE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,IAAI,kBAAkB,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;YAC9C,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,OAAO;SACV;aAAM;YACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,6CAA6C;kBACvD,sBAAsB,CAAC,CAAC;SACjC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACrC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,EAAE;gBACpC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,GAAG,EAAE;gBAC7D,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM;QACT,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE;YAC3C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;YAChD,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC1E,IAAI,CAAC,cAAc,EAAE,CAAC;gBACtB,OAAO,QAAQ,CAAC;YACpB,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEM,KAAK,CAAC,OAAsB,EAAE,UAAmB,KAAK;QACzD,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;SAC/B;QACD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,MAAgB,EAAE,EAAE;YACvD,IAAI,CAAC,UAAU,EAAE;iBACZ,IAAI,CAAC,CAAC,MAAsB,EAAE,EAAE;gBAC7B,MAAM,aAAa,GAAiC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,8BAAa,EAAE,MAAM,CAAC,CAAC;gBAClH,OAAO,CAAC,aAAa,CAAC,CAAC;YAO3B,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,WAAW,CACpB,IAAY,EACZ,QAAgB,EAChB,gBAAwB,EACxB,uBAA+B,EAC/B,uBAA+B,EAC/B,0BAAmC;QAEnC,MAAM,WAAW,GAA4B;YACzC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,gBAAgB,EAAE,gBAAgB;YAClC,uBAAuB,EAAE,uBAAuB;YAChD,uBAAuB,EAAE,uBAAuB;YAChD,0BAA0B,EAAE,0BAA0B;SACzD,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,QAAgB;QACvD,MAAM,WAAW,GAA4B;YACzC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;SACrB,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,eAAe,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9E,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY;QAC5E,MAAM,WAAW,GAA4B;YACzC,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,IAAI;SACb,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,6BAA6B,CAAC,QAAgB,EAAE,YAAoB,EAAE,IAAY,EAAE,iBAA0B;QACvH,MAAM,WAAW,GAA4B;YACzC,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,iBAAiB;SAC9B,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,6BAA6B,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,IAAY,EAAE,QAAgB,EAAE,iBAAyB;QACnG,MAAM,WAAW,GAA4B;YACzC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,iBAAiB;SAC9B,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,gCAAgC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,YAAoB,EAAE,IAAY;QACrE,MAAM,WAAW,GAA4B;YACzC,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI;SACb,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,yBAAyB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACvF,CAAC;IAEO,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3D,CAAC,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;SAC1C;IACL,CAAC;IAEO,cAAc;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC9B;IACL,CAAC;IAEO,gBAAgB;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACtB,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBACzC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAChG,OAAO,EAAE,CAAC;gBACd,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,UAAU;QACd,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACrC,OAAO,IAAI,CAAC,KAAK,CAAC,8CAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,MAA0B,EAAE,IAAS,EAAE,UAAmB;QACpE,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,YAAY,CAAC,CAAC;IAClG,CAAC;;AA/NL,oCAgOC;AA/NkB,kCAAqB,GAAW,KAAK,CAAC"}
@@ -4,6 +4,6 @@ export declare class PublicService {
4
4
  protected backendConnection: BaseBackendConnectionService;
5
5
  private _encryptionService;
6
6
  constructor(backendConnection: BaseBackendConnectionService, encryptionService: EncryptService);
7
- getPublicKey(): Promise<void>;
7
+ getPublicKey(): Promise<string>;
8
8
  private _call;
9
9
  }
@@ -12,7 +12,7 @@ class PublicService {
12
12
  return new Promise((resolve) => {
13
13
  this._call(public_service_method_enum_1.PublicServiceMethod.GetPublicKey, {}, false).then((result) => {
14
14
  this._encryptionService.publicKey = result;
15
- resolve();
15
+ resolve(result);
16
16
  });
17
17
  });
18
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"public.service.js","sourceRoot":"","sources":["../../src/service/public.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAIvE,MAAa,aAAa;IAMtB,YAAY,iBAA+C,EAAE,iBAAiC;QAC1F,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACrC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE;gBAC5E,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,MAAM,CAAC;gBAC3C,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,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;CACJ;AA7BD,sCA6BC"}
1
+ {"version":3,"file":"public.service.js","sourceRoot":"","sources":["../../src/service/public.service.ts"],"names":[],"mappings":";;;AAAA,iFAAqE;AAGrE,mFAAuE;AAIvE,MAAa,aAAa;IAMtB,YAAY,iBAA+C,EAAE,iBAAiC;QAC1F,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;YACrC,IAAI,CAAC,KAAK,CAAC,gDAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE;gBAC5E,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,MAAM,CAAC;gBAC3C,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,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;CACJ;AA7BD,sCA6BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@colijnit/ioneconnector",
3
- "version": "2.1.12",
3
+ "version": "2.1.14",
4
4
  "scripts": {
5
5
  "build": "grunt clean && tsc",
6
6
  "uglify": "grunt uglify",