itrm-tools 1.3.16-beta.11 → 1.3.16-beta.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.
@@ -32,8 +32,7 @@ class ServiceSessionManager {
32
32
  if (await this.checkKeys()) {
33
33
  if (this.authToken) {
34
34
  const response = await RequestAxiosCall_1.RequestAxiosCall.post(`${this.sessionServiceUrl}/service/validate/token`, {
35
- payload: this.encryptPayload(this.authToken),
36
- name: this.service
35
+ payload: this.encryptPayload(`${this.application}:${this.service}:${this.authToken}`),
37
36
  }, this.buildHeaders({
38
37
  authorization: `${this.application} ${this.apiKeySigner.sign({
39
38
  method: APIRequest_1.RequestMethod.POST,
@@ -46,24 +45,27 @@ class ServiceSessionManager {
46
45
  Referer: this.encryptPayload(this.serviceReferer),
47
46
  Authorization: `Bearer ${this.authToken}`,
48
47
  Platform: this.platform,
49
- Name: this.service,
48
+ Application: this.application,
49
+ Service: this.service,
50
50
  }
51
51
  };
52
52
  }
53
53
  }
54
- const response = await RequestAxiosCall_1.RequestAxiosCall.get(`${this.sessionServiceUrl}/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&name=${encodeURIComponent(this.service)}`, this.buildHeaders({
54
+ const response = await RequestAxiosCall_1.RequestAxiosCall.get(`${this.sessionServiceUrl}/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&service=${encodeURIComponent(this.service)}`, this.buildHeaders({
55
55
  authorization: `${this.application} ${this.apiKeySigner.sign({
56
56
  method: APIRequest_1.RequestMethod.GET,
57
- path: `/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&name=${encodeURIComponent(this.service)}`,
57
+ path: `/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&service=${encodeURIComponent(this.service)}`,
58
58
  }, this.keys)}`
59
59
  }));
60
60
  if (response.success) {
61
61
  this.authToken = response.payload;
62
62
  return {
63
63
  headers: {
64
+ Referer: this.encryptPayload(this.serviceReferer),
64
65
  Authorization: `Bearer ${response.payload}`,
65
66
  Platform: this.platform,
66
- Referer: this.encryptPayload(this.serviceReferer),
67
+ Application: this.application,
68
+ Service: this.service,
67
69
  },
68
70
  };
69
71
  }
@@ -77,15 +79,14 @@ class ServiceSessionManager {
77
79
  return this.keys !== undefined;
78
80
  }
79
81
  async requestKeys() {
80
- const response = await RequestAxiosCall_1.RequestAxiosCall.get(`${this.sessionServiceUrl}/service/credentials?name=${encodeURIComponent(this.service)}`, this.buildHeaders());
82
+ const response = await RequestAxiosCall_1.RequestAxiosCall.get(`${this.sessionServiceUrl}/service/credentials?service=${encodeURIComponent(this.service)}&application=${encodeURIComponent(this.application)}`, this.buildHeaders());
81
83
  if (response.success)
82
84
  this.keys = JSON.parse(this.decryptPayload(response.payload));
83
85
  return this.keys;
84
86
  }
85
87
  async isCurrentKeysValid() {
86
88
  const response = await RequestAxiosCall_1.RequestAxiosCall.post(`${this.sessionServiceUrl}/service/validate/credentials`, {
87
- payload: this.encryptPayload(this.keys?.publicKey ?? ""),
88
- name: this.service,
89
+ payload: this.encryptPayload(`${this.application}:${this.service}:${this.keys?.publicKey}`),
89
90
  }, this.buildHeaders());
90
91
  return response.success && response.payload;
91
92
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceSessionManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ServiceSessionManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ServiceSessionManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ServiceSessionManager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "itrm-tools",
3
- "version": "1.3.16-beta.11",
3
+ "version": "1.3.16-beta.13",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",