@pgds/api-interface 1.4.71 → 1.6.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.
- package/README.md +19 -3
- package/client/FairtrailClient.d.ts +1 -2
- package/client/FairtrailClient.js +18 -86
- package/client/FairtrailClient.js.map +1 -1
- package/lib/auth/mustbeConfig.js +92 -18
- package/lib/auth/mustbeConfig.js.map +1 -1
- package/lib/config.d.ts +2 -0
- package/lib/config.js +4 -2
- package/lib/config.js.map +1 -1
- package/lib/constants/constants.d.ts +2 -0
- package/lib/constants/constants.js +4 -3
- package/lib/constants/constants.js.map +1 -1
- package/lib/index.js +11 -5
- package/lib/index.js.map +1 -1
- package/lib/models/ReqUser.js +1 -1
- package/lib/models/ReqUser.js.map +1 -1
- package/lib/repositories/organizationHierarchyRepo.d.ts +19 -0
- package/lib/repositories/organizationHierarchyRepo.js +241 -0
- package/lib/repositories/organizationHierarchyRepo.js.map +1 -0
- package/lib/server/server.d.ts +1 -1
- package/lib/server/server.js +16 -1
- package/lib/server/server.js.map +1 -1
- package/lib/utils/asyncHooks.d.ts +4 -0
- package/lib/utils/asyncHooks.js +5 -2
- package/lib/utils/asyncHooks.js.map +1 -1
- package/lib/utils/jsonSchemaUtils.js +3 -3
- package/lib/utils/jsonSchemaUtils.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -1
- package/package.json +13 -9
- package/utils/index.d.ts +1 -0
- package/utils/index.js +5 -1
- package/utils/index.js.map +1 -1
package/README.md
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
## **NOTE**: This repository is using `yarn`
|
|
2
|
+
|
|
1
3
|
### hiot-api-interface
|
|
2
4
|
|
|
3
5
|
Examples:
|
|
@@ -352,6 +354,20 @@ The export of the endpoint file is both a function for registering the endpoint
|
|
|
352
354
|
|
|
353
355
|
</details>
|
|
354
356
|
|
|
357
|
+
## Running tests
|
|
358
|
+
|
|
359
|
+
Since the tests rely on redis, they have to be run through docker compose.
|
|
360
|
+
|
|
361
|
+
```bash
|
|
362
|
+
yarn test:docker
|
|
363
|
+
```
|
|
364
|
+
|
|
365
|
+
alternatively
|
|
366
|
+
|
|
367
|
+
```bash
|
|
368
|
+
docker-compose run hiot-api-interface bash && yarn test
|
|
369
|
+
```
|
|
370
|
+
|
|
355
371
|
# Publishing
|
|
356
372
|
|
|
357
373
|
Prerequisites:
|
|
@@ -362,7 +378,7 @@ Prerequisites:
|
|
|
362
378
|
Then, in root, run:
|
|
363
379
|
|
|
364
380
|
```typescript
|
|
365
|
-
// Check out any untracked/ignored files (e.g. previously built files)
|
|
381
|
+
// Check out any untracked/ignored files (e.g. previously built files) ⚠ Do not do this unless you have committed any changes you want to keep ⚠
|
|
366
382
|
yarn clean
|
|
367
383
|
|
|
368
384
|
// Install dependencies
|
|
@@ -371,8 +387,8 @@ yarn install
|
|
|
371
387
|
// Build
|
|
372
388
|
yarn build
|
|
373
389
|
|
|
374
|
-
// Make sure tests pass
|
|
375
|
-
yarn test
|
|
390
|
+
// Make sure tests pass (see above)
|
|
391
|
+
yarn test:docker
|
|
376
392
|
|
|
377
393
|
// Publish
|
|
378
394
|
npm publish --access public
|
|
@@ -34,6 +34,5 @@ export declare class FairtrailClient extends HttpClient {
|
|
|
34
34
|
*/
|
|
35
35
|
asOrganizationManager(organizationId: string): Omit<this, "asOrganizationManager" | "asGlobal" | "asUser">;
|
|
36
36
|
private get serviceApiUser();
|
|
37
|
-
protected getAuthHeaders(_authenticated?: boolean
|
|
38
|
-
protected getOrganizationHierarchyHeader(organizationId?: string): Promise<string | undefined>;
|
|
37
|
+
protected getAuthHeaders(_authenticated?: boolean): Promise<Record<string, string>>;
|
|
39
38
|
}
|
|
@@ -63,10 +63,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
63
63
|
};
|
|
64
64
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
65
65
|
exports.FairtrailClient = void 0;
|
|
66
|
-
var restify_errors_1 = require("restify-errors");
|
|
67
66
|
var constants_1 = require("../constants");
|
|
68
67
|
var lib_1 = require("../lib");
|
|
69
|
-
var config_1 = require("../lib/config");
|
|
70
68
|
var constants_2 = require("../lib/constants/constants");
|
|
71
69
|
var HttpClient_1 = require("./HttpClient");
|
|
72
70
|
/**
|
|
@@ -177,103 +175,37 @@ var FairtrailClient = /** @class */ (function (_super) {
|
|
|
177
175
|
enumerable: false,
|
|
178
176
|
configurable: true
|
|
179
177
|
});
|
|
180
|
-
FairtrailClient.prototype.getAuthHeaders = function (
|
|
181
|
-
return __awaiter(this,
|
|
182
|
-
var authOrganizationHierarchyHeader, authOrganizationHierarchyHeader;
|
|
178
|
+
FairtrailClient.prototype.getAuthHeaders = function (_authenticated) {
|
|
179
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
183
180
|
var _a, _b, _c;
|
|
184
|
-
var _d, _e, _f, _g
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
_a)];
|
|
197
|
-
}
|
|
198
|
-
if (!this.reqAsGlobal) return [3 /*break*/, 3];
|
|
199
|
-
authOrganizationHierarchyHeader = otherHeaders[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER];
|
|
200
|
-
if (!!authOrganizationHierarchyHeader) return [3 /*break*/, 2];
|
|
201
|
-
return [4 /*yield*/, this.getOrganizationHierarchyHeader(this.reqOrganizationId)];
|
|
202
|
-
case 1:
|
|
203
|
-
authOrganizationHierarchyHeader = _j.sent();
|
|
204
|
-
_j.label = 2;
|
|
205
|
-
case 2: return [2 /*return*/, (_b = {},
|
|
181
|
+
var _d, _e, _f, _g;
|
|
182
|
+
return __generator(this, function (_h) {
|
|
183
|
+
if (this.reqUser) {
|
|
184
|
+
return [2 /*return*/, (_a = {},
|
|
185
|
+
_a[constants_1.AUTH_USER_HEADER] = (_d = this.reqUser.userId) !== null && _d !== void 0 ? _d : this.serviceApiUser,
|
|
186
|
+
_a[constants_1.AUTH_ACTIVE_LOGIN_HEADER] = (_e = this.reqUser.activeLogin) !== null && _e !== void 0 ? _e : "",
|
|
187
|
+
_a[constants_1.AUTH_ACTIVITIES_HEADER] = Object.keys((_f = this.reqUser.activities) !== null && _f !== void 0 ? _f : []).join(","),
|
|
188
|
+
_a[constants_1.AUTH_ORGANIZATION_HEADER] = (_g = this.reqUser.organizationId) !== null && _g !== void 0 ? _g : "",
|
|
189
|
+
_a)];
|
|
190
|
+
}
|
|
191
|
+
if (this.reqAsGlobal) {
|
|
192
|
+
return [2 /*return*/, (_b = {},
|
|
206
193
|
_b[constants_1.AUTH_USER_HEADER] = this.serviceApiUser,
|
|
207
194
|
_b[constants_1.AUTH_ACTIVITIES_HEADER] = constants_1.GLOBAL_ACTIVITY,
|
|
208
|
-
_b[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER] = authOrganizationHierarchyHeader,
|
|
209
195
|
_b)];
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
if (!!authOrganizationHierarchyHeader) return [3 /*break*/, 5];
|
|
214
|
-
return [4 /*yield*/, this.getOrganizationHierarchyHeader(this.reqOrganizationId)];
|
|
215
|
-
case 4:
|
|
216
|
-
authOrganizationHierarchyHeader = _j.sent();
|
|
217
|
-
_j.label = 5;
|
|
218
|
-
case 5: return [2 /*return*/, (_c = {},
|
|
196
|
+
}
|
|
197
|
+
if (this.reqAsOrganizationManager) {
|
|
198
|
+
return [2 /*return*/, (_c = {},
|
|
219
199
|
_c[constants_1.AUTH_USER_HEADER] = this.serviceApiUser,
|
|
220
200
|
_c[constants_1.AUTH_ACTIVITIES_HEADER] = constants_1.CAN_MANAGE_ORGANIZATION_ACTIVITY,
|
|
221
201
|
_c[constants_1.AUTH_ORGANIZATION_HEADER] = this.reqOrganizationId,
|
|
222
|
-
_c[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER] = authOrganizationHierarchyHeader,
|
|
223
202
|
_c)];
|
|
224
|
-
case 6: return [2 /*return*/, {}];
|
|
225
|
-
}
|
|
226
|
-
});
|
|
227
|
-
});
|
|
228
|
-
};
|
|
229
|
-
FairtrailClient.prototype.getOrganizationHierarchyHeader = function (organizationId) {
|
|
230
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
231
|
-
var accountsApiClient, organizationHierarchy;
|
|
232
|
-
return __generator(this, function (_a) {
|
|
233
|
-
switch (_a.label) {
|
|
234
|
-
case 0:
|
|
235
|
-
if (!this.testMode && constants_2.CI) {
|
|
236
|
-
return [2 /*return*/, JSON.stringify({})];
|
|
237
|
-
}
|
|
238
|
-
accountsApiClient = new AccountsApiClient();
|
|
239
|
-
return [4 /*yield*/, accountsApiClient.getOrganizationHierarchy(organizationId)];
|
|
240
|
-
case 1:
|
|
241
|
-
organizationHierarchy = _a.sent();
|
|
242
|
-
return [2 /*return*/, JSON.stringify(organizationHierarchy)];
|
|
243
203
|
}
|
|
204
|
+
return [2 /*return*/, {}];
|
|
244
205
|
});
|
|
245
206
|
});
|
|
246
207
|
};
|
|
247
208
|
return FairtrailClient;
|
|
248
209
|
}(HttpClient_1.HttpClient));
|
|
249
210
|
exports.FairtrailClient = FairtrailClient;
|
|
250
|
-
var AccountsApiClient = /** @class */ (function (_super) {
|
|
251
|
-
__extends(AccountsApiClient, _super);
|
|
252
|
-
function AccountsApiClient() {
|
|
253
|
-
return _super.call(this, config_1.ACCOUNTS_URL + "/v1") || this;
|
|
254
|
-
}
|
|
255
|
-
AccountsApiClient.prototype.getOrganizationHierarchy = function (organizationId) {
|
|
256
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
257
|
-
var data, err_1;
|
|
258
|
-
return __generator(this, function (_a) {
|
|
259
|
-
switch (_a.label) {
|
|
260
|
-
case 0:
|
|
261
|
-
_a.trys.push([0, 2, , 3]);
|
|
262
|
-
return [4 /*yield*/, this.internal.get({
|
|
263
|
-
path: "/accounts/organizations/organization-hierarchy",
|
|
264
|
-
query: { organizationId: organizationId },
|
|
265
|
-
})];
|
|
266
|
-
case 1:
|
|
267
|
-
data = (_a.sent()).data;
|
|
268
|
-
return [2 /*return*/, data];
|
|
269
|
-
case 2:
|
|
270
|
-
err_1 = _a.sent();
|
|
271
|
-
throw new restify_errors_1.InternalServerError("Organization hierarchy could not be retrieved: ".concat(err_1.message));
|
|
272
|
-
case 3: return [2 /*return*/];
|
|
273
|
-
}
|
|
274
|
-
});
|
|
275
|
-
});
|
|
276
|
-
};
|
|
277
|
-
return AccountsApiClient;
|
|
278
|
-
}(FairtrailClient));
|
|
279
211
|
//# sourceMappingURL=FairtrailClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FairtrailClient.js","sourceRoot":"","sources":["FairtrailClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"FairtrailClient.js","sourceRoot":"","sources":["FairtrailClient.ts"],"names":[],"mappings":"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"}
|
package/lib/auth/mustbeConfig.js
CHANGED
|
@@ -32,6 +32,45 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
45
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
46
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
47
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
48
|
+
function step(op) {
|
|
49
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
50
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
51
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
52
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
53
|
+
switch (op[0]) {
|
|
54
|
+
case 0: case 1: t = op; break;
|
|
55
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
56
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
57
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
58
|
+
default:
|
|
59
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
60
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
61
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
62
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
63
|
+
if (t[2]) _.ops.pop();
|
|
64
|
+
_.trys.pop(); continue;
|
|
65
|
+
}
|
|
66
|
+
op = body.call(thisArg, _);
|
|
67
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
68
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
72
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
73
|
+
};
|
|
35
74
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
75
|
exports.routeHelpers = void 0;
|
|
37
76
|
exports.configureMustBe = configureMustBe;
|
|
@@ -41,8 +80,10 @@ var constants_1 = require("../../constants");
|
|
|
41
80
|
// TODO: this import crashes the library when used by a service
|
|
42
81
|
// import Configurator from "../../types/mustbe/config";
|
|
43
82
|
var ReqUser_1 = require("../models/ReqUser");
|
|
83
|
+
var organizationHierarchyRepo_1 = __importDefault(require("../repositories/organizationHierarchyRepo"));
|
|
44
84
|
var jsonSchemaUtils_1 = require("../utils/jsonSchemaUtils");
|
|
45
85
|
var logger_1 = require("../utils/logger");
|
|
86
|
+
var constants_2 = require("../constants/constants");
|
|
46
87
|
var mustbe = require("mustbe");
|
|
47
88
|
/** Only needed if used along side legacy setup of endpoints */
|
|
48
89
|
var routeHelpers = (function () {
|
|
@@ -55,17 +96,27 @@ var routeHelpers = (function () {
|
|
|
55
96
|
});
|
|
56
97
|
exports.routeHelpers = routeHelpers;
|
|
57
98
|
function configureMustBe() {
|
|
99
|
+
var _this = this;
|
|
58
100
|
mustbe.configure(function (config /* Configurator */) {
|
|
59
101
|
config.routeHelpers(function (rh) {
|
|
60
|
-
rh.getUser(function (req, cb) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
102
|
+
rh.getUser(function (req, cb) { return __awaiter(_this, void 0, void 0, function () {
|
|
103
|
+
var user, err_1;
|
|
104
|
+
return __generator(this, function (_a) {
|
|
105
|
+
switch (_a.label) {
|
|
106
|
+
case 0:
|
|
107
|
+
_a.trys.push([0, 2, , 3]);
|
|
108
|
+
return [4 /*yield*/, parseUser(req)];
|
|
109
|
+
case 1:
|
|
110
|
+
user = _a.sent();
|
|
111
|
+
cb(null, user);
|
|
112
|
+
return [3 /*break*/, 3];
|
|
113
|
+
case 2:
|
|
114
|
+
err_1 = _a.sent();
|
|
115
|
+
return [2 /*return*/, cb(err_1, null)];
|
|
116
|
+
case 3: return [2 /*return*/];
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
}); });
|
|
69
120
|
rh.notAuthorized(function (_req, _res, next) { return next(new restifyErrors.ResourceNotFoundError()); });
|
|
70
121
|
rh.notAuthenticated(function (_req, _res, next) { return next(new restifyErrors.InvalidCredentialsError()); });
|
|
71
122
|
});
|
|
@@ -87,15 +138,38 @@ function configureMustBe() {
|
|
|
87
138
|
});
|
|
88
139
|
}
|
|
89
140
|
function parseUser(req) {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
141
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
142
|
+
var userId, organizationId, activities, activeLogin, organizationHierarchy, _a, _b, user;
|
|
143
|
+
return __generator(this, function (_c) {
|
|
144
|
+
switch (_c.label) {
|
|
145
|
+
case 0:
|
|
146
|
+
userId = req.header(constants_1.AUTH_USER_HEADER, undefined);
|
|
147
|
+
organizationId = req.header(constants_1.AUTH_ORGANIZATION_HEADER, undefined);
|
|
148
|
+
activities = parseActivities(req.header(constants_1.AUTH_ACTIVITIES_HEADER, ""));
|
|
149
|
+
activeLogin = req.header(constants_1.AUTH_ACTIVE_LOGIN_HEADER, undefined);
|
|
150
|
+
if (!constants_2.GLOBAL_CI) return [3 /*break*/, 1];
|
|
151
|
+
_a = JSON.parse(req.header(constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER, "{}"));
|
|
152
|
+
return [3 /*break*/, 5];
|
|
153
|
+
case 1:
|
|
154
|
+
if (!organizationId) return [3 /*break*/, 3];
|
|
155
|
+
return [4 /*yield*/, organizationHierarchyRepo_1.default.getOrganizationHierarchy(organizationId)];
|
|
156
|
+
case 2:
|
|
157
|
+
_b = _c.sent();
|
|
158
|
+
return [3 /*break*/, 4];
|
|
159
|
+
case 3:
|
|
160
|
+
_b = {};
|
|
161
|
+
_c.label = 4;
|
|
162
|
+
case 4:
|
|
163
|
+
_a = _b;
|
|
164
|
+
_c.label = 5;
|
|
165
|
+
case 5:
|
|
166
|
+
organizationHierarchy = _a;
|
|
167
|
+
user = new ReqUser_1.ReqUser({ userId: userId, organizationId: organizationId, activities: activities, activeLogin: activeLogin, organizationHierarchy: organizationHierarchy });
|
|
168
|
+
req.user = user;
|
|
169
|
+
return [2 /*return*/, user];
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
});
|
|
99
173
|
}
|
|
100
174
|
function userIsUndefined(user) {
|
|
101
175
|
if (!user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mustbeConfig.js","sourceRoot":"","sources":["mustbeConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mustbeConfig.js","sourceRoot":"","sources":["mustbeConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/config.d.ts
CHANGED
package/lib/config.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b;
|
|
2
|
+
var _a, _b, _c;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.ACCOUNTS_URL = exports.HTTP_CLIENT_TIMEOUT = void 0;
|
|
4
|
+
exports.REDIS_DB_URL = exports.ACCOUNTS_URL = exports.HTTP_CLIENT_TIMEOUT = void 0;
|
|
5
5
|
exports.HTTP_CLIENT_TIMEOUT = Number.parseInt((_a = process.env.API_INTERFACE_HTTP_CLIENT_TIMEOUT) !== null && _a !== void 0 ? _a : "3000");
|
|
6
6
|
exports.ACCOUNTS_URL = (_b = process.env.API_INTERFACE_ACCOUNTS_URL) !== null && _b !== void 0 ? _b : "http://accounts-api-service";
|
|
7
|
+
/** The Redis URL for organization hierarchy storage */
|
|
8
|
+
exports.REDIS_DB_URL = (_c = process.env.API_INTERFACE_REDIS_ORGANIZATION_HIERARCHY_DB_URL) !== null && _c !== void 0 ? _c : "redis://redis-master/5";
|
|
7
9
|
//# sourceMappingURL=config.js.map
|
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":";;;;AAAa,QAAA,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,mCAAI,MAAM,CAAC,CAAC;AAE/F,QAAA,YAAY,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,mCAAI,6BAA6B,CAAC"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":";;;;AAAa,QAAA,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,mCAAI,MAAM,CAAC,CAAC;AAE/F,QAAA,YAAY,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,mCAAI,6BAA6B,CAAC;AAEpG,uDAAuD;AAC1C,QAAA,YAAY,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,iDAAiD,mCAAI,wBAAwB,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export declare const CI: boolean;
|
|
2
|
+
/** Whether we are running in a user's CI environment, e.g. a service using this package */
|
|
3
|
+
export declare const GLOBAL_CI: boolean;
|
|
2
4
|
export declare const SCHEMA_BASE_PATH = "api/schemas";
|
|
3
5
|
export declare const INTERNAL_ENDPOINT_PREFIX = "/internal";
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.INTERNAL_ENDPOINT_PREFIX = exports.SCHEMA_BASE_PATH = exports.CI = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
exports.INTERNAL_ENDPOINT_PREFIX = exports.SCHEMA_BASE_PATH = exports.GLOBAL_CI = exports.CI = void 0;
|
|
4
|
+
exports.CI = process.env.CI === "true" || process.env.CI === "1";
|
|
5
|
+
/** Whether we are running in a user's CI environment, e.g. a service using this package */
|
|
6
|
+
exports.GLOBAL_CI = !exports.CI && typeof global.it === "function";
|
|
6
7
|
exports.SCHEMA_BASE_PATH = "api/schemas";
|
|
7
8
|
exports.INTERNAL_ENDPOINT_PREFIX = "/internal";
|
|
8
9
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["constants.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC;AAEtE,2FAA2F;AAC9E,QAAA,SAAS,GAAG,CAAC,UAAE,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,UAAU,CAAC;AAEnD,QAAA,gBAAgB,GAAG,aAAa,CAAC;AAEjC,QAAA,wBAAwB,GAAG,WAAW,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -99,6 +99,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
99
99
|
}
|
|
100
100
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
101
101
|
};
|
|
102
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
103
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
104
|
+
};
|
|
102
105
|
var _a;
|
|
103
106
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
104
107
|
exports.endpointMetadata = exports.Method = void 0;
|
|
@@ -121,6 +124,7 @@ var asyncHooks_1 = require("./utils/asyncHooks");
|
|
|
121
124
|
var jsonSchemaUtils_1 = require("./utils/jsonSchemaUtils");
|
|
122
125
|
var logger_1 = require("./utils/logger");
|
|
123
126
|
var urlUtils_1 = require("./utils/urlUtils");
|
|
127
|
+
var organizationHierarchyRepo_1 = __importDefault(require("./repositories/organizationHierarchyRepo"));
|
|
124
128
|
var mustbe = require("mustbe");
|
|
125
129
|
var Method;
|
|
126
130
|
(function (Method) {
|
|
@@ -241,7 +245,7 @@ function registerEndpoint(options) {
|
|
|
241
245
|
requestHandlers.push(getSchemaValidationHandler(options.querySchema, jsonSchemaUtils_1.RequestKey.Query));
|
|
242
246
|
}
|
|
243
247
|
var responseSchemas = [];
|
|
244
|
-
if (constants_1.CI) {
|
|
248
|
+
if (constants_1.CI || constants_1.GLOBAL_CI) {
|
|
245
249
|
responseSchemas = (0, jsonSchemaUtils_1.prepareResponseSchemas)(options);
|
|
246
250
|
}
|
|
247
251
|
requestHandlers.push(function (req, res, next) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -267,7 +271,7 @@ function registerEndpoint(options) {
|
|
|
267
271
|
}
|
|
268
272
|
}
|
|
269
273
|
if (response.body) {
|
|
270
|
-
if (constants_1.CI && !!responseSchemas.length) {
|
|
274
|
+
if ((constants_1.CI || constants_1.GLOBAL_CI) && !!responseSchemas.length) {
|
|
271
275
|
(0, jsonSchemaUtils_1.validateResponseBody)(responseSchemas, response.body);
|
|
272
276
|
}
|
|
273
277
|
res.json(response.body);
|
|
@@ -322,7 +326,7 @@ function registerEndpoint(options) {
|
|
|
322
326
|
function handleErrors(err, next) {
|
|
323
327
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
324
328
|
try {
|
|
325
|
-
if (constants_1.CI) {
|
|
329
|
+
if (constants_1.CI || constants_1.GLOBAL_CI) {
|
|
326
330
|
console.log(require("util").inspect(err, null, null, true));
|
|
327
331
|
}
|
|
328
332
|
else {
|
|
@@ -407,10 +411,12 @@ function setupApiInterface(options) {
|
|
|
407
411
|
throw err_2;
|
|
408
412
|
}
|
|
409
413
|
return [3 /*break*/, 4];
|
|
410
|
-
case 4:
|
|
414
|
+
case 4: return [4 /*yield*/, organizationHierarchyRepo_1.default.connect()];
|
|
415
|
+
case 5:
|
|
416
|
+
_b.sent();
|
|
411
417
|
(0, mustbeConfig_1.configureMustBe)();
|
|
412
418
|
return [4 /*yield*/, (0, server_1.startServer)({ port: port, onUncaughtException: onUncaughtException, maxParamLength: maxParamLength })];
|
|
413
|
-
case
|
|
419
|
+
case 6:
|
|
414
420
|
server = _b.sent();
|
|
415
421
|
if (shouldRegisterMetadataEndpoint) {
|
|
416
422
|
registerMetadataEndpoint();
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/lib/models/ReqUser.js
CHANGED
|
@@ -66,7 +66,7 @@ var ReqUser = /** @class */ (function () {
|
|
|
66
66
|
return result;
|
|
67
67
|
};
|
|
68
68
|
ReqUser.prototype.getCompleteOrganizationTreeIds = function (organizationId) {
|
|
69
|
-
if ((0, utils_1.isGlobal)(this)) {
|
|
69
|
+
if ((0, utils_1.isGlobal)(this) && !organizationId) {
|
|
70
70
|
return Object.keys(this.organizationHierarchy);
|
|
71
71
|
}
|
|
72
72
|
var stack = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReqUser.js","sourceRoot":"","sources":["ReqUser.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAQvC;IAaE,iBAAY,EAYX;YAXC,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,UAAU,gBAAA,EACV,WAAW,iBAAA,EACX,qBAAqB,2BAAA;QAQrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,wCAAsB,GAA7B,UAA8B,cAAuB,EAAE,cAAuB;QAC5E,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,4BAA4B,CAAC,cAAe,EAAE,cAAc,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,8BAA8B,CAAC,cAAc,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEO,8CAA4B,GAApC,UAAqC,gBAAwB,EAAE,cAAsB;QACnF,IACE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC;YAC1C,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACtE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC;gBAC5C,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EACxE,CAAC;YACD,OAAO,CAAC,cAAc,CAAC,CAAC;QAC1B,CAAC;QAED,IAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,IAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE3B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAM,YAAY,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;YAElC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,YAAY,KAAK,gBAAgB,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE1B,KAAkC,UAA0C,EAA1C,KAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAA1C,cAA0C,EAA1C,IAA0C,EAAE,CAAC;gBAApE,IAAA,WAAmB,EAAlB,OAAO,QAAA,EAAE,QAAQ,QAAA;gBAC3B,IAAI,OAAO,KAAK,YAAY,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gDAA8B,GAAtC,UAAuC,cAAuB;QAC5D,IAAI,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ReqUser.js","sourceRoot":"","sources":["ReqUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
declare class OrganizationHierarchyRepo {
|
|
2
|
+
private client;
|
|
3
|
+
private isReconnecting;
|
|
4
|
+
connect(url?: string): Promise<unknown>;
|
|
5
|
+
close(): Promise<void>;
|
|
6
|
+
private get instance();
|
|
7
|
+
/** @returns Full organization hierarchy */
|
|
8
|
+
private fetchOrganizationHierarchy;
|
|
9
|
+
/**
|
|
10
|
+
* @param organizationId the organization to get the hierarchy for. Returns entire hierarchy if omitted.
|
|
11
|
+
*/
|
|
12
|
+
getOrganizationHierarchy(organizationId?: string): Promise<Record<string, string>>;
|
|
13
|
+
/** Only usable in api-interface's tests */
|
|
14
|
+
addOrganizationHierarchy(organizationHierarchy: Record<string, string>): Promise<import("@redis/client/dist/lib/RESP/types").ReplyUnion[]>;
|
|
15
|
+
/** Only usable in api-interface's tests */
|
|
16
|
+
clearDatabase(): Promise<string>;
|
|
17
|
+
}
|
|
18
|
+
declare let repo: OrganizationHierarchyRepo;
|
|
19
|
+
export default repo;
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
var redis_1 = require("redis");
|
|
40
|
+
var logger_1 = require("../utils/logger");
|
|
41
|
+
var config_1 = require("../config");
|
|
42
|
+
var constants_1 = require("../constants/constants");
|
|
43
|
+
var server_1 = require("../server/server");
|
|
44
|
+
var OrganizationHierarchyRepo = /** @class */ (function () {
|
|
45
|
+
function OrganizationHierarchyRepo() {
|
|
46
|
+
this.client = null;
|
|
47
|
+
this.isReconnecting = false;
|
|
48
|
+
}
|
|
49
|
+
OrganizationHierarchyRepo.prototype.connect = function () {
|
|
50
|
+
return __awaiter(this, arguments, void 0, function (url) {
|
|
51
|
+
var _this = this;
|
|
52
|
+
if (url === void 0) { url = config_1.REDIS_DB_URL; }
|
|
53
|
+
return __generator(this, function (_a) {
|
|
54
|
+
return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
55
|
+
var _this = this;
|
|
56
|
+
return __generator(this, function (_a) {
|
|
57
|
+
switch (_a.label) {
|
|
58
|
+
case 0:
|
|
59
|
+
this.client = (0, redis_1.createClient)({ url: url });
|
|
60
|
+
this.client.on("error", function (err) { return __awaiter(_this, void 0, void 0, function () {
|
|
61
|
+
var err_1;
|
|
62
|
+
return __generator(this, function (_a) {
|
|
63
|
+
switch (_a.label) {
|
|
64
|
+
case 0:
|
|
65
|
+
_a.trys.push([0, 2, , 3]);
|
|
66
|
+
(0, logger_1.getLogger)().error("Redis Client Error: ".concat(err.message), { error: err });
|
|
67
|
+
return [4 /*yield*/, (0, server_1.closeServer)()];
|
|
68
|
+
case 1:
|
|
69
|
+
_a.sent();
|
|
70
|
+
return [3 /*break*/, 3];
|
|
71
|
+
case 2:
|
|
72
|
+
err_1 = _a.sent();
|
|
73
|
+
(0, logger_1.getLogger)().error("Error while closing server after Redis error: ".concat(err_1.message), { error: err_1 });
|
|
74
|
+
return [3 /*break*/, 3];
|
|
75
|
+
case 3:
|
|
76
|
+
reject(err);
|
|
77
|
+
return [2 /*return*/];
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
}); });
|
|
81
|
+
this.client.on("reconnecting", function () {
|
|
82
|
+
(0, logger_1.getLogger)().info("Reconnecting to Redis...");
|
|
83
|
+
_this.isReconnecting = true;
|
|
84
|
+
});
|
|
85
|
+
this.client.on("connect", function () {
|
|
86
|
+
if (_this.isReconnecting) {
|
|
87
|
+
(0, logger_1.getLogger)().info("Reconnected to Redis");
|
|
88
|
+
_this.isReconnecting = false;
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
(0, logger_1.getLogger)().info("Connected to Redis");
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
return [4 /*yield*/, this.client.connect()];
|
|
95
|
+
case 1:
|
|
96
|
+
_a.sent();
|
|
97
|
+
resolve(true);
|
|
98
|
+
return [2 /*return*/];
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
}); })];
|
|
102
|
+
});
|
|
103
|
+
});
|
|
104
|
+
};
|
|
105
|
+
OrganizationHierarchyRepo.prototype.close = function () {
|
|
106
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
107
|
+
return __generator(this, function (_a) {
|
|
108
|
+
switch (_a.label) {
|
|
109
|
+
case 0:
|
|
110
|
+
if (!this.client) return [3 /*break*/, 2];
|
|
111
|
+
return [4 /*yield*/, this.client.quit()];
|
|
112
|
+
case 1:
|
|
113
|
+
_a.sent();
|
|
114
|
+
this.client = null;
|
|
115
|
+
_a.label = 2;
|
|
116
|
+
case 2: return [2 /*return*/];
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
};
|
|
121
|
+
Object.defineProperty(OrganizationHierarchyRepo.prototype, "instance", {
|
|
122
|
+
get: function () {
|
|
123
|
+
if (!this.client) {
|
|
124
|
+
throw new Error("Redis client not initialized");
|
|
125
|
+
}
|
|
126
|
+
return this.client;
|
|
127
|
+
},
|
|
128
|
+
enumerable: false,
|
|
129
|
+
configurable: true
|
|
130
|
+
});
|
|
131
|
+
/** @returns Full organization hierarchy */
|
|
132
|
+
OrganizationHierarchyRepo.prototype.fetchOrganizationHierarchy = function () {
|
|
133
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
134
|
+
var organizationHierarchy, cursor, _loop_1, this_1;
|
|
135
|
+
return __generator(this, function (_a) {
|
|
136
|
+
switch (_a.label) {
|
|
137
|
+
case 0:
|
|
138
|
+
if (!this.client || !this.client.isOpen) {
|
|
139
|
+
throw new Error("Redis client not initialized, use ...connect(url) first");
|
|
140
|
+
}
|
|
141
|
+
organizationHierarchy = {};
|
|
142
|
+
cursor = "0";
|
|
143
|
+
_loop_1 = function () {
|
|
144
|
+
var _b, nextCursor, keys, pipeline, values;
|
|
145
|
+
return __generator(this, function (_c) {
|
|
146
|
+
switch (_c.label) {
|
|
147
|
+
case 0: return [4 /*yield*/, this_1.instance.scan(cursor, { MATCH: "*", COUNT: 100 })];
|
|
148
|
+
case 1:
|
|
149
|
+
_b = _c.sent(), nextCursor = _b.cursor, keys = _b.keys;
|
|
150
|
+
cursor = nextCursor;
|
|
151
|
+
if (keys.length === 0)
|
|
152
|
+
return [2 /*return*/, "continue"];
|
|
153
|
+
pipeline = this_1.instance.multi();
|
|
154
|
+
keys.forEach(function (key) { return pipeline.get(key); });
|
|
155
|
+
return [4 /*yield*/, pipeline.exec()];
|
|
156
|
+
case 2:
|
|
157
|
+
values = _c.sent();
|
|
158
|
+
keys.forEach(function (key, i) {
|
|
159
|
+
var value = values[i];
|
|
160
|
+
if (typeof value === "string") {
|
|
161
|
+
organizationHierarchy[key] = value;
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
return [2 /*return*/];
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
};
|
|
168
|
+
this_1 = this;
|
|
169
|
+
_a.label = 1;
|
|
170
|
+
case 1: return [5 /*yield**/, _loop_1()];
|
|
171
|
+
case 2:
|
|
172
|
+
_a.sent();
|
|
173
|
+
_a.label = 3;
|
|
174
|
+
case 3:
|
|
175
|
+
if (cursor !== "0") return [3 /*break*/, 1];
|
|
176
|
+
_a.label = 4;
|
|
177
|
+
case 4: return [2 /*return*/, organizationHierarchy];
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
});
|
|
181
|
+
};
|
|
182
|
+
/**
|
|
183
|
+
* @param organizationId the organization to get the hierarchy for. Returns entire hierarchy if omitted.
|
|
184
|
+
*/
|
|
185
|
+
OrganizationHierarchyRepo.prototype.getOrganizationHierarchy = function (organizationId) {
|
|
186
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
187
|
+
var organizationHierarchyCache, stack, visited, result, currentOrgId, _i, _a, _b, childId, parentId;
|
|
188
|
+
return __generator(this, function (_c) {
|
|
189
|
+
switch (_c.label) {
|
|
190
|
+
case 0: return [4 /*yield*/, this.fetchOrganizationHierarchy()];
|
|
191
|
+
case 1:
|
|
192
|
+
organizationHierarchyCache = _c.sent();
|
|
193
|
+
if (!organizationId) {
|
|
194
|
+
return [2 /*return*/, organizationHierarchyCache];
|
|
195
|
+
}
|
|
196
|
+
stack = [organizationId];
|
|
197
|
+
visited = new Set();
|
|
198
|
+
result = {};
|
|
199
|
+
while (stack.length > 0) {
|
|
200
|
+
currentOrgId = stack.pop();
|
|
201
|
+
if (visited.has(currentOrgId)) {
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
visited.add(currentOrgId);
|
|
205
|
+
for (_i = 0, _a = Object.entries(organizationHierarchyCache); _i < _a.length; _i++) {
|
|
206
|
+
_b = _a[_i], childId = _b[0], parentId = _b[1];
|
|
207
|
+
if (parentId === currentOrgId && !visited.has(childId)) {
|
|
208
|
+
stack.push(childId);
|
|
209
|
+
result[childId] = parentId;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return [2 /*return*/, result];
|
|
214
|
+
}
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
};
|
|
218
|
+
/** Only usable in api-interface's tests */
|
|
219
|
+
OrganizationHierarchyRepo.prototype.addOrganizationHierarchy = function (organizationHierarchy) {
|
|
220
|
+
if (!constants_1.CI) {
|
|
221
|
+
throw new Error("addOrganizationHierarchy can only be used in CI environment");
|
|
222
|
+
}
|
|
223
|
+
var pipeline = this.instance.multi();
|
|
224
|
+
for (var _i = 0, _a = Object.entries(organizationHierarchy); _i < _a.length; _i++) {
|
|
225
|
+
var _b = _a[_i], childId = _b[0], parentId = _b[1];
|
|
226
|
+
pipeline.set(childId, parentId);
|
|
227
|
+
}
|
|
228
|
+
return pipeline.exec();
|
|
229
|
+
};
|
|
230
|
+
/** Only usable in api-interface's tests */
|
|
231
|
+
OrganizationHierarchyRepo.prototype.clearDatabase = function () {
|
|
232
|
+
if (!constants_1.CI) {
|
|
233
|
+
throw new Error("clearDatabase can only be used in CI environment");
|
|
234
|
+
}
|
|
235
|
+
return this.instance.flushDb();
|
|
236
|
+
};
|
|
237
|
+
return OrganizationHierarchyRepo;
|
|
238
|
+
}());
|
|
239
|
+
var repo = new OrganizationHierarchyRepo();
|
|
240
|
+
exports.default = repo;
|
|
241
|
+
//# sourceMappingURL=organizationHierarchyRepo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"organizationHierarchyRepo.js","sourceRoot":"","sources":["organizationHierarchyRepo.ts"],"names":[],"mappings":"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"}
|
package/lib/server/server.d.ts
CHANGED
|
@@ -7,6 +7,6 @@ interface ServerOptions {
|
|
|
7
7
|
maxParamLength?: number;
|
|
8
8
|
}
|
|
9
9
|
export declare const server: Server;
|
|
10
|
-
export declare const closeServer: () =>
|
|
10
|
+
export declare const closeServer: () => Promise<unknown>;
|
|
11
11
|
export declare function startServer({ port, onUncaughtException, maxParamLength }: ServerOptions): Promise<Server>;
|
|
12
12
|
export {};
|
package/lib/server/server.js
CHANGED
|
@@ -68,12 +68,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
68
68
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
72
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
73
|
+
};
|
|
71
74
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
72
75
|
exports.closeServer = exports.server = void 0;
|
|
73
76
|
exports.startServer = startServer;
|
|
74
77
|
var restify_1 = require("restify");
|
|
75
78
|
var restifyErrors = __importStar(require("restify-errors"));
|
|
76
79
|
var logger_1 = require("../utils/logger");
|
|
80
|
+
var organizationHierarchyRepo_1 = __importDefault(require("../repositories/organizationHierarchyRepo"));
|
|
77
81
|
var _server;
|
|
78
82
|
exports.server = new Proxy({}, {
|
|
79
83
|
get: function (_target, prop, _receiver) {
|
|
@@ -85,7 +89,18 @@ exports.server = new Proxy({}, {
|
|
|
85
89
|
}
|
|
86
90
|
},
|
|
87
91
|
});
|
|
88
|
-
var closeServer = function () { return
|
|
92
|
+
var closeServer = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
93
|
+
return __generator(this, function (_a) {
|
|
94
|
+
switch (_a.label) {
|
|
95
|
+
case 0: return [4 /*yield*/, organizationHierarchyRepo_1.default.close()];
|
|
96
|
+
case 1:
|
|
97
|
+
_a.sent();
|
|
98
|
+
return [2 /*return*/, new Promise(function (resolve) {
|
|
99
|
+
_server === null || _server === void 0 ? void 0 : _server.close(function () { return resolve(undefined); });
|
|
100
|
+
})];
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}); };
|
|
89
104
|
exports.closeServer = closeServer;
|
|
90
105
|
function startServer(_a) {
|
|
91
106
|
return __awaiter(this, arguments, void 0, function (_b) {
|
package/lib/server/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,10 @@ interface RequestStore {
|
|
|
13
13
|
* Will be automatically be added to any requests made with the clients extending FairtrailClient.
|
|
14
14
|
**/
|
|
15
15
|
reqId: string;
|
|
16
|
+
/**
|
|
17
|
+
* User agent of the current request
|
|
18
|
+
*/
|
|
19
|
+
userAgent?: string;
|
|
16
20
|
}
|
|
17
21
|
type RequestContext = Request | string;
|
|
18
22
|
/**
|
package/lib/utils/asyncHooks.js
CHANGED
|
@@ -39,6 +39,7 @@ var constants_1 = require("../../constants");
|
|
|
39
39
|
var async_hooks_1 = require("async_hooks");
|
|
40
40
|
var ReqUser_1 = require("../models/ReqUser");
|
|
41
41
|
var uuid = __importStar(require("uuid"));
|
|
42
|
+
var USER_AGENT_HEADER = "user-agent";
|
|
42
43
|
function isRequest(reqContext) {
|
|
43
44
|
return !!reqContext && typeof reqContext === "object";
|
|
44
45
|
}
|
|
@@ -51,18 +52,20 @@ var asyncLocalStorage = new async_hooks_1.AsyncLocalStorage();
|
|
|
51
52
|
* @throws Any error thrown by the inputted function
|
|
52
53
|
*/
|
|
53
54
|
function runWithRequestContext(reqContext, fn) {
|
|
54
|
-
var _a, _b, _c, _d;
|
|
55
|
+
var _a, _b, _c, _d, _e;
|
|
55
56
|
var reqId = "";
|
|
56
57
|
var user = undefined;
|
|
58
|
+
var userAgent = undefined;
|
|
57
59
|
if (isRequest(reqContext)) {
|
|
58
60
|
reqId = (_c = (_b = (_a = reqContext.header) === null || _a === void 0 ? void 0 : _a.call(reqContext, constants_1.REQUEST_ID_HEADER)) !== null && _b !== void 0 ? _b : reqContext.getId()) !== null && _c !== void 0 ? _c : uuid.v4();
|
|
59
61
|
user = (_d = reqContext.user) !== null && _d !== void 0 ? _d : getFallbackUser(reqContext);
|
|
62
|
+
userAgent = (_e = reqContext.header) === null || _e === void 0 ? void 0 : _e.call(reqContext, USER_AGENT_HEADER);
|
|
60
63
|
}
|
|
61
64
|
else {
|
|
62
65
|
reqId = reqContext !== null && reqContext !== void 0 ? reqContext : uuid.v4();
|
|
63
66
|
}
|
|
64
67
|
return new Promise(function (resolve, reject) {
|
|
65
|
-
asyncLocalStorage.run({ reqId: reqId, user: user }, function () {
|
|
68
|
+
asyncLocalStorage.run({ reqId: reqId, user: user, userAgent: userAgent }, function () {
|
|
66
69
|
try {
|
|
67
70
|
resolve(fn());
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncHooks.js","sourceRoot":"","sources":["asyncHooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"asyncHooks.js","sourceRoot":"","sources":["asyncHooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ function getSchemas(schemaNames) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
catch (err) {
|
|
52
|
-
if (constants_1.CI) {
|
|
52
|
+
if (constants_1.CI || constants_1.GLOBAL_CI) {
|
|
53
53
|
console.error(err);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -59,7 +59,7 @@ function getSchema(schemaName) {
|
|
|
59
59
|
return exports.schemaCache.get(schemaName);
|
|
60
60
|
}
|
|
61
61
|
else {
|
|
62
|
-
if (constants_1.CI) {
|
|
62
|
+
if (constants_1.CI || constants_1.GLOBAL_CI) {
|
|
63
63
|
console.error("error: schema ".concat(schemaName, " not found"));
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
@@ -98,7 +98,7 @@ function setupAjv() {
|
|
|
98
98
|
(0, ajv_formats_1.default)(ajv);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
if (constants_1.CI) {
|
|
101
|
+
if (constants_1.CI || constants_1.GLOBAL_CI) {
|
|
102
102
|
setupAjv();
|
|
103
103
|
}
|
|
104
104
|
function validateResponseBody(schemas, body) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonSchemaUtils.js","sourceRoot":"","sources":["jsonSchemaUtils.ts"],"names":[],"mappings":";;;;;;AAaA,gCA0CC;AAED,8BAUC;AAED,wDAqBC;AAgBD,oDA2BC;AA0CD,wEAsBC;AArMD,wBAAoE;AACpE,6BAA+B;AAC/B,iEAA2G;AAC3G,
|
|
1
|
+
{"version":3,"file":"jsonSchemaUtils.js","sourceRoot":"","sources":["jsonSchemaUtils.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/logger.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -2,14 +2,15 @@
|
|
|
2
2
|
"name": "@pgds/api-interface",
|
|
3
3
|
"description": "Api interface for pgds services",
|
|
4
4
|
"authors": "Florry",
|
|
5
|
-
"version": "1.
|
|
5
|
+
"version": "1.6.0",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"types": "types/",
|
|
8
8
|
"scripts": {
|
|
9
|
-
"prepublish": "
|
|
9
|
+
"prepublish": "yarn run build",
|
|
10
10
|
"build": "tsc",
|
|
11
|
-
"pretest": "
|
|
11
|
+
"pretest": "yarn run build",
|
|
12
12
|
"test": "nyc --require ts-node/register --reporter=html mocha --colors",
|
|
13
|
+
"test:docker": "docker-compose run hiot-api-interface yarn test",
|
|
13
14
|
"clean": "git clean -f -x -e node_modules/ -e coverage/"
|
|
14
15
|
},
|
|
15
16
|
"files": [
|
|
@@ -32,23 +33,25 @@
|
|
|
32
33
|
"client/**/*.d.ts"
|
|
33
34
|
],
|
|
34
35
|
"dependencies": {
|
|
36
|
+
"@pgds/utils": "1.1.4",
|
|
35
37
|
"@types/restify": "^8.5.12",
|
|
36
38
|
"@types/restify-errors": "^4.3.9",
|
|
37
|
-
"@
|
|
39
|
+
"@types/sinon": "^17.0.4",
|
|
38
40
|
"ajv": "8.17.1",
|
|
39
41
|
"ajv-formats": "3.0.1",
|
|
40
42
|
"axios": "1.7.9",
|
|
41
43
|
"mustbe": "0.4.0",
|
|
42
44
|
"nyc": "^17.1.0",
|
|
43
45
|
"prom-client": "^12.0.0",
|
|
46
|
+
"redis": "^5.9.0",
|
|
44
47
|
"restify": "^11.1.0",
|
|
45
48
|
"restify-errors": "8.0.2",
|
|
46
49
|
"semver": "^7.3.8",
|
|
47
50
|
"ts-node": "^10.9.2",
|
|
48
51
|
"ts-node-test-register": "^10.0.0",
|
|
49
|
-
"uuid": "9.0.1",
|
|
50
52
|
"typescript": "^5.7.2",
|
|
51
|
-
"typescript-json-schema": "0.65.1"
|
|
53
|
+
"typescript-json-schema": "0.65.1",
|
|
54
|
+
"uuid": "9.0.1"
|
|
52
55
|
},
|
|
53
56
|
"devDependencies": {
|
|
54
57
|
"@types/chai": "4.3.12",
|
|
@@ -62,8 +65,9 @@
|
|
|
62
65
|
"chai-subset": "^1.6.0",
|
|
63
66
|
"mocha": "10.2.0",
|
|
64
67
|
"mockery": "2.1.0",
|
|
65
|
-
"
|
|
66
|
-
"
|
|
68
|
+
"nock": "13.5.5",
|
|
69
|
+
"sinon": "^21.0.0",
|
|
70
|
+
"supertest": "6.3.4"
|
|
67
71
|
},
|
|
68
72
|
"directories": {
|
|
69
73
|
"example": "examples",
|
|
@@ -98,4 +102,4 @@
|
|
|
98
102
|
"**/*.js.map"
|
|
99
103
|
]
|
|
100
104
|
}
|
|
101
|
-
}
|
|
105
|
+
}
|
package/utils/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { ReqUser } from "../lib/models/ReqUser";
|
|
|
7
7
|
*/
|
|
8
8
|
export declare function hasActivity(reqUser: ReqUser, activity: string, wildcardCheck?: boolean): boolean;
|
|
9
9
|
export declare function isGlobal(reqUser: ReqUser): boolean;
|
|
10
|
+
export declare function isPlatformAdmin(reqUser: ReqUser): boolean;
|
|
10
11
|
/**
|
|
11
12
|
* Short hand function to check if a user has the `canManageOrganization`(`CAN_MANAGE_ORGANIZATION_ACTIVITY`) activity.
|
|
12
13
|
*/
|
package/utils/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.hasActivity = hasActivity;
|
|
4
4
|
exports.isGlobal = isGlobal;
|
|
5
|
+
exports.isPlatformAdmin = isPlatformAdmin;
|
|
5
6
|
exports.canManageOrganization = canManageOrganization;
|
|
6
7
|
exports.isOrganizationAccessibleToUser = isOrganizationAccessibleToUser;
|
|
7
8
|
var constants_1 = require("../constants");
|
|
@@ -24,6 +25,9 @@ function hasActivity(reqUser, activity, wildcardCheck) {
|
|
|
24
25
|
function isGlobal(reqUser) {
|
|
25
26
|
return !!reqUser.activities[constants_1.GLOBAL_ACTIVITY];
|
|
26
27
|
}
|
|
28
|
+
function isPlatformAdmin(reqUser) {
|
|
29
|
+
return hasActivity(reqUser, constants_1.CAN_MANAGE_PLATFORM_ACTIVITY);
|
|
30
|
+
}
|
|
27
31
|
/**
|
|
28
32
|
* Short hand function to check if a user has the `canManageOrganization`(`CAN_MANAGE_ORGANIZATION_ACTIVITY`) activity.
|
|
29
33
|
*/
|
|
@@ -36,7 +40,7 @@ function canManageOrganization(reqUser) {
|
|
|
36
40
|
* @param organizationId The organizationId to check for access to.
|
|
37
41
|
*/
|
|
38
42
|
function isOrganizationAccessibleToUser(reqUser, organizationId) {
|
|
39
|
-
if (isGlobal(reqUser)) {
|
|
43
|
+
if (isGlobal(reqUser) || isPlatformAdmin(reqUser)) {
|
|
40
44
|
return true;
|
|
41
45
|
}
|
|
42
46
|
return reqUser.getOrganizationTreeIds().includes(organizationId);
|
package/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAUA,kCAMC;AAED,4BAEC;AAKD,sDAEC;AAOD,wEAMC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAUA,kCAMC;AAED,4BAEC;AAED,0CAEC;AAKD,sDAEC;AAOD,wEAMC;AA5CD,0CAA+G;AAC/G,yDAA4D;AAG5D;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,OAAgB,EAAE,QAAgB,EAAE,aAA6B;IAA7B,8BAAA,EAAA,oBAA6B;IAC3F,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,IAAA,+BAAgB,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,SAAgB,QAAQ,CAAC,OAAgB;IACvC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,2BAAe,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,WAAW,CAAC,OAAO,EAAE,wCAA4B,CAAC,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,OAAO,WAAW,CAAC,OAAO,EAAE,4CAAgC,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,SAAgB,8BAA8B,CAAC,OAAgB,EAAE,cAAsB;IACrF,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,OAAO,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACnE,CAAC"}
|