@or-sdk/adapters 0.2.3-beta.1189.0 → 0.2.3-beta.1359.0

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.
@@ -53,7 +53,6 @@ var discovery_1 = require("@or-sdk/discovery");
53
53
  var Adapters = (function () {
54
54
  function Adapters(params) {
55
55
  this._accountId = undefined;
56
- this._eventManagerUrl = undefined;
57
56
  var token = params.token, discoveryUrl = params.discoveryUrl, eventManagerUrl = params.eventManagerUrl, accountId = params.accountId;
58
57
  this.eventManager = new event_manager_1.EventManager({
59
58
  token: token,
@@ -64,7 +63,6 @@ var Adapters = (function () {
64
63
  token: token,
65
64
  discoveryUrl: discoveryUrl,
66
65
  });
67
- this._eventManagerUrl = eventManagerUrl;
68
66
  this._accountId = accountId;
69
67
  }
70
68
  Object.defineProperty(Adapters.prototype, "accountId", {
@@ -74,13 +72,6 @@ var Adapters = (function () {
74
72
  enumerable: false,
75
73
  configurable: true
76
74
  });
77
- Object.defineProperty(Adapters.prototype, "eventManagerUrl", {
78
- get: function () {
79
- return this._eventManagerUrl;
80
- },
81
- enumerable: false,
82
- configurable: true
83
- });
84
75
  Object.defineProperty(Adapters.prototype, "adaptersUrl", {
85
76
  get: function () {
86
77
  return this.accountId ? "/http/".concat(this.accountId) : '';
@@ -90,26 +81,15 @@ var Adapters = (function () {
90
81
  });
91
82
  Adapters.prototype.makeRequest = function (params) {
92
83
  return __awaiter(this, void 0, void 0, function () {
93
- var fullUrl;
94
84
  return __generator(this, function (_a) {
95
85
  switch (_a.label) {
96
- case 0: return [4, this.generatePath(params.route)];
97
- case 1:
98
- fullUrl = _a.sent();
99
- return [2, this.eventManager.makeRequest(__assign(__assign({}, params), { route: fullUrl }))];
100
- }
101
- });
102
- });
103
- };
104
- Adapters.prototype.getGatewayUrl = function (path) {
105
- return __awaiter(this, void 0, void 0, function () {
106
- var _a, _b;
107
- return __generator(this, function (_c) {
108
- switch (_c.label) {
109
86
  case 0:
110
- _b = (_a = "".concat(this.eventManagerUrl)).concat;
111
- return [4, this.generatePath(path)];
112
- case 1: return [2, _b.apply(_a, [_c.sent()])];
87
+ if (!!this.accountId) return [3, 2];
88
+ return [4, this.getAccountId()];
89
+ case 1:
90
+ _a.sent();
91
+ _a.label = 2;
92
+ case 2: return [2, this.eventManager.makeRequest(__assign(__assign({}, params), { route: "".concat(this.adaptersUrl, "/").concat(params.route) }))];
113
93
  }
114
94
  });
115
95
  });
@@ -129,21 +109,6 @@ var Adapters = (function () {
129
109
  });
130
110
  });
131
111
  };
132
- Adapters.prototype.generatePath = function (path) {
133
- return __awaiter(this, void 0, void 0, function () {
134
- return __generator(this, function (_a) {
135
- switch (_a.label) {
136
- case 0:
137
- if (!!this.accountId) return [3, 2];
138
- return [4, this.getAccountId()];
139
- case 1:
140
- _a.sent();
141
- _a.label = 2;
142
- case 2: return [2, "".concat(this.adaptersUrl, "/").concat(path)];
143
- }
144
- });
145
- });
146
- };
147
112
  return Adapters;
148
113
  }());
149
114
  exports.Adapters = Adapters;
@@ -1 +1 @@
1
- {"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAqD;AACrD,+CAA8C;AAW9C;IAaE,kBAAY,MAAsB;QAH1B,eAAU,GAAuB,SAAS,CAAC;QAClC,qBAAgB,GAAuB,SAAS,CAAC;QAGxD,IAAA,KAAK,GAA+C,MAAM,MAArD,EAAE,YAAY,GAAiC,MAAM,aAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC;YACnC,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,eAAe,iBAAA;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC;YAC7B,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,sBAAI,+BAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;;;OAAA;IAED,sBAAI,qCAAe;aAAnB;YACE,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAC/B,CAAC;;;OAAA;IAED,sBAAI,iCAAW;aAAf;YACE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAS,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC;;;OAAA;IAEY,8BAAW,GAAxB,UAA4B,MAAoB;;;;;4BAC9B,WAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAA;;wBAA/C,OAAO,GAAG,SAAqC;wBACrD,WAAO,IAAI,CAAC,YAAY,CAAC,WAAW,uBAC/B,MAAM,KACT,KAAK,EAAE,OAAO,IACd,EAAC;;;;KACJ;IAEY,gCAAa,GAA1B,UAA2B,IAAY;;;;;;6CAC3B,IAAI,CAAC,eAAe;wBAAG,WAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAA;4BAA9D,WAAO,cAA0B,SAA6B,EAAE,EAAC;;;;KAClE;IAEa,+BAAY,GAA1B;;;;;;wBACE,KAAA,IAAI,CAAA;wBAAc,WAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAA;;wBAA5D,GAAK,UAAU,GAAG,SAA0C,CAAC;;;;;KAC9D;IAEa,+BAAY,GAA1B,UAA2B,IAAY;;;;;6BACjC,CAAC,IAAI,CAAC,SAAS,EAAf,cAAe;wBACjB,WAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;;4BAE5B,WAAO,UAAG,IAAI,CAAC,WAAW,cAAI,IAAI,CAAE,EAAC;;;;KACtC;IACH,eAAC;AAAD,CAAC,AAhED,IAgEC;AAhEY,4BAAQ"}
1
+ {"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAqD;AACrD,+CAA8C;AAW9C;IAYE,kBAAY,MAAsB;QAF1B,eAAU,GAAuB,SAAS,CAAC;QAGzC,IAAA,KAAK,GAA+C,MAAM,MAArD,EAAE,YAAY,GAAiC,MAAM,aAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC;YACnC,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,eAAe,iBAAA;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC;YAC7B,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,sBAAI,+BAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;;;OAAA;IAED,sBAAI,iCAAW;aAAf;YACE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAS,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC;;;OAAA;IAEY,8BAAW,GAAxB,UAA4B,MAAoB;;;;;6BAC1C,CAAC,IAAI,CAAC,SAAS,EAAf,cAAe;wBACjB,WAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;;4BAE5B,WAAO,IAAI,CAAC,YAAY,CAAC,WAAW,uBAC/B,MAAM,KACT,KAAK,EAAE,UAAG,IAAI,CAAC,WAAW,cAAI,MAAM,CAAC,KAAK,CAAE,IAC5C,EAAC;;;;KACJ;IAEa,+BAAY,GAA1B;;;;;;wBACE,KAAA,IAAI,CAAA;wBAAc,WAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAA;;wBAA5D,GAAK,UAAU,GAAG,SAA0C,CAAC;;;;;KAC9D;IACH,eAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,4BAAQ"}
@@ -12,7 +12,6 @@ import { Discovery } from '@or-sdk/discovery';
12
12
  export class Adapters {
13
13
  constructor(params) {
14
14
  this._accountId = undefined;
15
- this._eventManagerUrl = undefined;
16
15
  const { token, discoveryUrl, eventManagerUrl, accountId } = params;
17
16
  this.eventManager = new EventManager({
18
17
  token,
@@ -23,27 +22,20 @@ export class Adapters {
23
22
  token,
24
23
  discoveryUrl,
25
24
  });
26
- this._eventManagerUrl = eventManagerUrl;
27
25
  this._accountId = accountId;
28
26
  }
29
27
  get accountId() {
30
28
  return this._accountId;
31
29
  }
32
- get eventManagerUrl() {
33
- return this._eventManagerUrl;
34
- }
35
30
  get adaptersUrl() {
36
31
  return this.accountId ? `/http/${this.accountId}` : '';
37
32
  }
38
33
  makeRequest(params) {
39
34
  return __awaiter(this, void 0, void 0, function* () {
40
- const fullUrl = yield this.generatePath(params.route);
41
- return this.eventManager.makeRequest(Object.assign(Object.assign({}, params), { route: fullUrl }));
42
- });
43
- }
44
- getGatewayUrl(path) {
45
- return __awaiter(this, void 0, void 0, function* () {
46
- return `${this.eventManagerUrl}${yield this.generatePath(path)}`;
35
+ if (!this.accountId) {
36
+ yield this.getAccountId();
37
+ }
38
+ return this.eventManager.makeRequest(Object.assign(Object.assign({}, params), { route: `${this.adaptersUrl}/${params.route}` }));
47
39
  });
48
40
  }
49
41
  getAccountId() {
@@ -51,13 +43,5 @@ export class Adapters {
51
43
  this._accountId = yield this.discovery.getCurrentAccountId();
52
44
  });
53
45
  }
54
- generatePath(path) {
55
- return __awaiter(this, void 0, void 0, function* () {
56
- if (!this.accountId) {
57
- yield this.getAccountId();
58
- }
59
- return `${this.adaptersUrl}/${path}`;
60
- });
61
- }
62
46
  }
63
47
  //# sourceMappingURL=Adapters.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAW9C,MAAM,OAAO,QAAQ;IAanB,YAAY,MAAsB;QAH1B,eAAU,GAAuB,SAAS,CAAC;QAClC,qBAAgB,GAAuB,SAAS,CAAC;QAGhE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;YACnC,KAAK;YACL,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC;YAC7B,KAAK;YACL,YAAY;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAEY,WAAW,CAAI,MAAoB;;YAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,iCAC/B,MAAM,KACT,KAAK,EAAE,OAAO,IACd,CAAC;QACL,CAAC;KAAA;IAEY,aAAa,CAAC,IAAY;;YACrC,OAAO,GAAG,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACnE,CAAC;KAAA;IAEa,YAAY;;YACxB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;QAC/D,CAAC;KAAA;IAEa,YAAY,CAAC,IAAY;;YACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;aAC3B;YACD,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;QACvC,CAAC;KAAA;CACF"}
1
+ {"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAW9C,MAAM,OAAO,QAAQ;IAYnB,YAAY,MAAsB;QAF1B,eAAU,GAAuB,SAAS,CAAC;QAGjD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;YACnC,KAAK;YACL,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC;YAC7B,KAAK;YACL,YAAY;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAEY,WAAW,CAAI,MAAoB;;YAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;aAC3B;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,iCAC/B,MAAM,KACT,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,IAC5C,CAAC;QACL,CAAC;KAAA;IAEa,YAAY;;YACxB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;QAC/D,CAAC;KAAA;CACF"}
@@ -4,14 +4,10 @@ export declare class Adapters {
4
4
  private readonly eventManager;
5
5
  private readonly discovery;
6
6
  private _accountId;
7
- private readonly _eventManagerUrl;
8
7
  constructor(params: AdaptersConfig);
9
8
  get accountId(): string | undefined;
10
- get eventManagerUrl(): string | undefined;
11
9
  get adaptersUrl(): string;
12
10
  makeRequest<T>(params: CalApiParams): Promise<T>;
13
- getGatewayUrl(path: string): Promise<string>;
14
11
  private getAccountId;
15
- private generatePath;
16
12
  }
17
13
  //# sourceMappingURL=Adapters.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AASzC,qBAAa,QAAQ;IAQnB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAiC;gBAEtD,MAAM,EAAE,cAAc;IAiBlC,IAAI,SAAS,uBAEZ;IAED,IAAI,eAAe,uBAElB;IAED,IAAI,WAAW,WAEd;IAEY,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;IAQhD,aAAa,CAAC,IAAI,EAAE,MAAM;YAIzB,YAAY;YAIZ,YAAY;CAM3B"}
1
+ {"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AASzC,qBAAa,QAAQ;IAQnB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,UAAU,CAAiC;gBAEvC,MAAM,EAAE,cAAc;IAgBlC,IAAI,SAAS,uBAEZ;IAED,IAAI,WAAW,WAEd;IAEY,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;YAU/C,YAAY;CAG3B"}
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "0.2.3-beta.1189.0",
2
+ "version": "0.2.3-beta.1359.0",
3
3
  "name": "@or-sdk/adapters",
4
4
  "main": "dist/cjs/index.js",
5
5
  "module": "dist/esm/index.js",
@@ -24,8 +24,8 @@
24
24
  "access": "public"
25
25
  },
26
26
  "dependencies": {
27
- "@or-sdk/base": "^0.28.2-beta.1189.0",
28
- "@or-sdk/discovery": "^1.6.3-beta.1189.0",
29
- "@or-sdk/event-manager": "^0.24.10-beta.1189.0"
27
+ "@or-sdk/base": "^0.28.2-beta.1359.0",
28
+ "@or-sdk/discovery": "^1.6.3-beta.1359.0",
29
+ "@or-sdk/event-manager": "^0.24.10-beta.1359.0"
30
30
  }
31
31
  }
package/src/Adapters.ts CHANGED
@@ -22,7 +22,6 @@ export class Adapters {
22
22
  private readonly eventManager: EventManager;
23
23
  private readonly discovery: Discovery;
24
24
  private _accountId: string | undefined = undefined;
25
- private readonly _eventManagerUrl: string | undefined = undefined;
26
25
 
27
26
  constructor(params: AdaptersConfig) {
28
27
  const { token, discoveryUrl, eventManagerUrl, accountId } = params;
@@ -37,7 +36,6 @@ export class Adapters {
37
36
  discoveryUrl,
38
37
  });
39
38
 
40
- this._eventManagerUrl = eventManagerUrl;
41
39
  this._accountId = accountId;
42
40
  }
43
41
 
@@ -45,34 +43,21 @@ export class Adapters {
45
43
  return this._accountId;
46
44
  }
47
45
 
48
- get eventManagerUrl() {
49
- return this._eventManagerUrl;
50
- }
51
-
52
46
  get adaptersUrl() {
53
47
  return this.accountId ? `/http/${this.accountId}` : '';
54
48
  }
55
49
 
56
50
  public async makeRequest<T>(params: CalApiParams): Promise<T> {
57
- const fullUrl = await this.generatePath(params.route);
51
+ if (!this.accountId) {
52
+ await this.getAccountId();
53
+ }
58
54
  return this.eventManager.makeRequest({
59
55
  ...params,
60
- route: fullUrl,
56
+ route: `${this.adaptersUrl}/${params.route}`,
61
57
  });
62
58
  }
63
59
 
64
- public async getGatewayUrl(path: string) {
65
- return `${this.eventManagerUrl}${await this.generatePath(path)}`;
66
- }
67
-
68
60
  private async getAccountId(): Promise<void> {
69
61
  this._accountId = await this.discovery.getCurrentAccountId();
70
62
  }
71
-
72
- private async generatePath(path: string) {
73
- if (!this.accountId) {
74
- await this.getAccountId();
75
- }
76
- return `${this.adaptersUrl}/${path}`;
77
- }
78
63
  }