@magda/typescript-common 2.3.3 → 3.0.0-alpha.1
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/dist/AspectBuilder.d.ts +1 -1
- package/dist/AspectBuilder.js +1 -2
- package/dist/AspectCreationFailure.js +3 -4
- package/dist/AspectCreationFailure.js.map +1 -1
- package/dist/AsyncPage.js +59 -79
- package/dist/AsyncPage.js.map +1 -1
- package/dist/BaseApiClient.d.ts +3 -3
- package/dist/BaseApiClient.js +20 -13
- package/dist/BaseApiClient.js.map +1 -1
- package/dist/ConnectionResult.d.ts +2 -2
- package/dist/ConnectionResult.js +17 -22
- package/dist/ConnectionResult.js.map +1 -1
- package/dist/ConnectorRecordId.d.ts +1 -1
- package/dist/ConnectorRecordId.js +9 -13
- package/dist/ConnectorRecordId.js.map +1 -1
- package/dist/IndexerApiClient.d.ts +1 -1
- package/dist/IndexerApiClient.js +13 -32
- package/dist/IndexerApiClient.js.map +1 -1
- package/dist/JsonConnector.d.ts +9 -9
- package/dist/JsonConnector.js +163 -206
- package/dist/JsonConnector.js.map +1 -1
- package/dist/JsonTransformer.d.ts +3 -3
- package/dist/JsonTransformer.js +71 -75
- package/dist/JsonTransformer.js.map +1 -1
- package/dist/OpaCompileResponseParser.d.ts +4 -4
- package/dist/OpaCompileResponseParser.js +279 -212
- package/dist/OpaCompileResponseParser.js.map +1 -1
- package/dist/RecordCreationFailure.d.ts +1 -1
- package/dist/RecordCreationFailure.js +4 -4
- package/dist/RecordCreationFailure.js.map +1 -1
- package/dist/SQLUtils.d.ts +3 -3
- package/dist/SQLUtils.js +139 -195
- package/dist/SQLUtils.js.map +1 -1
- package/dist/ServerError.js +2 -4
- package/dist/ServerError.js.map +1 -1
- package/dist/Try.js +20 -35
- package/dist/Try.js.map +1 -1
- package/dist/addTrailingSlash.js +1 -4
- package/dist/addTrailingSlash.js.map +1 -1
- package/dist/appendUrlSegments.js +3 -8
- package/dist/appendUrlSegments.js.map +1 -1
- package/dist/authorization-api/AccessControlError.d.ts +1 -1
- package/dist/authorization-api/AccessControlError.js +2 -8
- package/dist/authorization-api/AccessControlError.js.map +1 -1
- package/dist/authorization-api/ApiClient.d.ts +3 -3
- package/dist/authorization-api/ApiClient.js +211 -272
- package/dist/authorization-api/ApiClient.js.map +1 -1
- package/dist/authorization-api/AuthError.d.ts +1 -1
- package/dist/authorization-api/AuthError.js +2 -8
- package/dist/authorization-api/AuthError.js.map +1 -1
- package/dist/authorization-api/GenericError.js +2 -4
- package/dist/authorization-api/GenericError.js.map +1 -1
- package/dist/authorization-api/authMiddleware.d.ts +3 -3
- package/dist/authorization-api/authMiddleware.js +19 -40
- package/dist/authorization-api/authMiddleware.js.map +1 -1
- package/dist/authorization-api/constants.js +9 -12
- package/dist/authorization-api/constants.js.map +1 -1
- package/dist/authorization-api/model.d.ts +8 -8
- package/dist/authorization-api/model.js +1 -2
- package/dist/coerceJson.js +1 -3
- package/dist/coerceJson.js.map +1 -1
- package/dist/createNoCacheFetchOptions.d.ts +1 -1
- package/dist/createNoCacheFetchOptions.js +4 -7
- package/dist/createNoCacheFetchOptions.js.map +1 -1
- package/dist/createServiceError.d.ts +1 -1
- package/dist/createServiceError.js +7 -11
- package/dist/createServiceError.js.map +1 -1
- package/dist/delay.js +1 -3
- package/dist/delay.js.map +1 -1
- package/dist/express/getNoCacheHeaders.js +1 -3
- package/dist/express/getNoCacheHeaders.js.map +1 -1
- package/dist/express/setResponseNoCache.d.ts +1 -1
- package/dist/express/setResponseNoCache.js +3 -8
- package/dist/express/setResponseNoCache.js.map +1 -1
- package/dist/express/status.d.ts +14 -15
- package/dist/express/status.js +145 -148
- package/dist/express/status.js.map +1 -1
- package/dist/fetchRequest.d.ts +6 -6
- package/dist/fetchRequest.js +36 -51
- package/dist/fetchRequest.js.map +1 -1
- package/dist/formatServiceError.js +4 -6
- package/dist/formatServiceError.js.map +1 -1
- package/dist/generated/registry/api.d.ts +67 -55
- package/dist/generated/registry/api.js +557 -765
- package/dist/generated/registry/api.js.map +1 -1
- package/dist/getAbsoluteUrl.js +8 -11
- package/dist/getAbsoluteUrl.js.map +1 -1
- package/dist/getBasePathFromUrl.js +3 -9
- package/dist/getBasePathFromUrl.js.map +1 -1
- package/dist/getBoolValWithDefault.js +1 -3
- package/dist/getBoolValWithDefault.js.map +1 -1
- package/dist/getRequest.js +9 -26
- package/dist/getRequest.js.map +1 -1
- package/dist/getRequestNoCache.js +4 -21
- package/dist/getRequestNoCache.js.map +1 -1
- package/dist/getStorageUrl.js +13 -23
- package/dist/getStorageUrl.js.map +1 -1
- package/dist/getUserAgent.d.ts +2 -0
- package/dist/getUserAgent.js +10 -0
- package/dist/getUserAgent.js.map +1 -0
- package/dist/handleServerError.js +3 -9
- package/dist/handleServerError.js.map +1 -1
- package/dist/markdownToHtml.js +5 -11
- package/dist/markdownToHtml.js.map +1 -1
- package/dist/opa/AspectQuery.js +55 -79
- package/dist/opa/AspectQuery.js.map +1 -1
- package/dist/opa/AuthDecision.d.ts +2 -2
- package/dist/opa/AuthDecision.js +52 -69
- package/dist/opa/AuthDecision.js.map +1 -1
- package/dist/opa/AuthDecisionQueryClient.d.ts +2 -2
- package/dist/opa/AuthDecisionQueryClient.js +72 -102
- package/dist/opa/AuthDecisionQueryClient.js.map +1 -1
- package/dist/pgTypes.js +4 -9
- package/dist/pgTypes.js.map +1 -1
- package/dist/registry/AuthorizedRegistryClient.d.ts +4 -4
- package/dist/registry/AuthorizedRegistryClient.js +55 -95
- package/dist/registry/AuthorizedRegistryClient.js.map +1 -1
- package/dist/registry/RegistryClient.d.ts +2 -3
- package/dist/registry/RegistryClient.js +61 -78
- package/dist/registry/RegistryClient.js.map +1 -1
- package/dist/registry/TenantConsts.js +3 -6
- package/dist/registry/TenantConsts.js.map +1 -1
- package/dist/registry/model.js +1 -2
- package/dist/registry-manual/api.d.ts +1 -1
- package/dist/registry-manual/api.js +18 -7
- package/dist/registry-manual/api.js.map +1 -1
- package/dist/retry.d.ts +1 -1
- package/dist/retry.js +3 -9
- package/dist/retry.js.map +1 -1
- package/dist/retryBackoff.js +3 -9
- package/dist/retryBackoff.js.map +1 -1
- package/dist/runLater.js +1 -4
- package/dist/runLater.js.map +1 -1
- package/dist/session/GetUserId.d.ts +2 -2
- package/dist/session/GetUserId.js +10 -16
- package/dist/session/GetUserId.js.map +1 -1
- package/dist/session/GetUserSession.d.ts +1 -1
- package/dist/session/GetUserSession.js +6 -10
- package/dist/session/GetUserSession.js.map +1 -1
- package/dist/session/addJwtSecretFromEnvVar.js +1 -4
- package/dist/session/addJwtSecretFromEnvVar.js.map +1 -1
- package/dist/session/buildJwt.d.ts +1 -1
- package/dist/session/buildJwt.js +2 -5
- package/dist/session/buildJwt.js.map +1 -1
- package/dist/session/buildJwtFromReq.d.ts +1 -1
- package/dist/session/buildJwtFromReq.js +3 -8
- package/dist/session/buildJwtFromReq.js.map +1 -1
- package/dist/session/cookieUtils.d.ts +2 -13
- package/dist/session/cookieUtils.js +8 -9
- package/dist/session/cookieUtils.js.map +1 -1
- package/dist/session/destroySession.js +18 -33
- package/dist/session/destroySession.js.map +1 -1
- package/dist/session/getSessionId.js +5 -11
- package/dist/session/getSessionId.js.map +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.d.ts +1 -1
- package/dist/tenant-api/AuthorizedTenantClient.js +22 -36
- package/dist/tenant-api/AuthorizedTenantClient.js.map +1 -1
- package/dist/tenant-api/Tenant.js +13 -5
- package/dist/tenant-api/Tenant.js.map +1 -1
- package/dist/test/JsonConnector.spec.js +56 -61
- package/dist/test/JsonConnector.spec.js.map +1 -1
- package/dist/test/JsonTransformer.spec.js +15 -19
- package/dist/test/JsonTransformer.spec.js.map +1 -1
- package/dist/test/arbitraries.d.ts +21 -21
- package/dist/test/arbitraries.js +85 -99
- package/dist/test/arbitraries.js.map +1 -1
- package/dist/test/aspect-templates/organization-details.d.ts +1 -4
- package/dist/test/aspect-templates/organization-details.js +1 -1
- package/dist/test/aspect-templates/organization-details.js.map +1 -1
- package/dist/test/buildApiClient.spec.js +81 -107
- package/dist/test/buildApiClient.spec.js.map +1 -1
- package/dist/test/buildAuthorizedTenantClient.spec.js +25 -40
- package/dist/test/buildAuthorizedTenantClient.spec.js.map +1 -1
- package/dist/test/connectors/MockExpressServer.js +9 -23
- package/dist/test/connectors/MockExpressServer.js.map +1 -1
- package/dist/test/connectors/MockRegistry.d.ts +1 -1
- package/dist/test/connectors/MockRegistry.js +11 -18
- package/dist/test/connectors/MockRegistry.js.map +1 -1
- package/dist/test/connectors/runConnectorTest.js +33 -55
- package/dist/test/connectors/runConnectorTest.js.map +1 -1
- package/dist/test/createMockAuthDecisionQueryClient.d.ts +4 -4
- package/dist/test/createMockAuthDecisionQueryClient.js +4 -9
- package/dist/test/createMockAuthDecisionQueryClient.js.map +1 -1
- package/dist/test/db/getTestDBConfig.js +1 -3
- package/dist/test/db/getTestDBConfig.js.map +1 -1
- package/dist/test/db/runMigrationSql.js +37 -58
- package/dist/test/db/runMigrationSql.js.map +1 -1
- package/dist/test/express/status.spec.js +81 -72
- package/dist/test/express/status.spec.js.map +1 -1
- package/dist/test/fakeArgv.js +6 -5
- package/dist/test/fakeArgv.js.map +1 -1
- package/dist/test/getBasePathFromUrl.spec.js +5 -10
- package/dist/test/getBasePathFromUrl.spec.js.map +1 -1
- package/dist/test/getStorageUrl.spec.js +22 -46
- package/dist/test/getStorageUrl.spec.js.map +1 -1
- package/dist/test/mockAuthApiHost.js +26 -28
- package/dist/test/mockAuthApiHost.js.map +1 -1
- package/dist/test/mockAuthorization.js +4 -10
- package/dist/test/mockAuthorization.js.map +1 -1
- package/dist/test/mockTenantDataStore.d.ts +1 -1
- package/dist/test/mockTenantDataStore.js +3 -5
- package/dist/test/mockTenantDataStore.js.map +1 -1
- package/dist/test/mockUserDataStore.d.ts +1 -1
- package/dist/test/mockUserDataStore.js +4 -6
- package/dist/test/mockUserDataStore.js.map +1 -1
- package/dist/test/registry/buildAuthorizedClient.spec.js +65 -87
- package/dist/test/registry/buildAuthorizedClient.spec.js.map +1 -1
- package/dist/test/session/buildJwt.spec.js +15 -19
- package/dist/test/session/buildJwt.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsAndOwnerTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaGroupsTest.spec.js.map +1 -1
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js +6 -11
- package/dist/test/session/buildJwtForRegistryEsriOpaOwnerTest.spec.js.map +1 -1
- package/dist/test/testAsyncPage.spec.js +84 -105
- package/dist/test/testAsyncPage.spec.js.map +1 -1
- package/dist/test/testOpaCompileResponseParser.spec.js +192 -196
- package/dist/test/testOpaCompileResponseParser.spec.js.map +1 -1
- package/dist/test/util.js +1 -5
- package/dist/test/util.js.map +1 -1
- package/dist/unknown2Error.d.ts +2 -0
- package/dist/unknown2Error.js +3 -0
- package/dist/unknown2Error.js.map +1 -0
- package/dist/util/arrayToMaybe.d.ts +1 -1
- package/dist/util/arrayToMaybe.js +3 -6
- package/dist/util/arrayToMaybe.js.map +1 -1
- package/dist/util/cleanOrgTitle.js +1 -4
- package/dist/util/cleanOrgTitle.js.map +1 -1
- package/dist/util/escapeRegExp.js +1 -3
- package/dist/util/escapeRegExp.js.map +1 -1
- package/dist/util/getMinikubeIP.js +3 -9
- package/dist/util/getMinikubeIP.js.map +1 -1
- package/dist/util/isArray.js +1 -3
- package/dist/util/isArray.js.map +1 -1
- package/dist/util/isUuid.js +1 -3
- package/dist/util/isUuid.js.map +1 -1
- package/dist/util/unionToThrowable.d.ts +1 -1
- package/dist/util/unionToThrowable.js +3 -9
- package/dist/util/unionToThrowable.js.map +1 -1
- package/dist/utilityTypes.d.ts +1 -1
- package/dist/utilityTypes.js +1 -2
- package/package.json +45 -29
- package/dist/request.d.ts +0 -3
- package/dist/request.js +0 -19
- package/dist/request.js.map +0 -1
- package/dist/test/jsverify.d.ts +0 -2
- package/dist/test/jsverify.js +0 -8
- package/dist/test/jsverify.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthDecision.js","sourceRoot":"","sources":["../../src/opa/AuthDecision.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AuthDecision.js","sourceRoot":"","sources":["../../src/opa/AuthDecision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,43 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
-
}) : (function(o, m, k, k2) {
|
|
6
|
-
if (k2 === undefined) k2 = k;
|
|
7
|
-
o[k2] = m[k];
|
|
8
|
-
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
-
});
|
|
29
|
-
};
|
|
30
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
-
};
|
|
33
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
-
const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
|
|
35
|
-
const urijs_1 = __importDefault(require("urijs"));
|
|
36
|
-
const AuthDecision_1 = __importStar(require("./AuthDecision"));
|
|
1
|
+
import fetch from "cross-fetch";
|
|
2
|
+
import urijs from "urijs";
|
|
3
|
+
import AuthDecision, { UnconditionalTrueDecision } from "./AuthDecision.js";
|
|
37
4
|
class AuthDecisionQueryClient {
|
|
5
|
+
authApiBaseUrl = "";
|
|
6
|
+
skipQuery;
|
|
7
|
+
static fetchOptions = {};
|
|
8
|
+
fetchOptions = {};
|
|
38
9
|
constructor(authApiBaseUrl, skipQuery = false) {
|
|
39
|
-
this.authApiBaseUrl = "";
|
|
40
|
-
this.fetchOptions = {};
|
|
41
10
|
this.authApiBaseUrl = authApiBaseUrl;
|
|
42
11
|
this.skipQuery = skipQuery;
|
|
43
12
|
if (this.skipQuery) {
|
|
@@ -47,70 +16,71 @@ class AuthDecisionQueryClient {
|
|
|
47
16
|
throw new Error("Auth API base URL is required");
|
|
48
17
|
}
|
|
49
18
|
}
|
|
50
|
-
getAuthDecision(config, jwtToken) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
19
|
+
async getAuthDecision(config, jwtToken) {
|
|
20
|
+
if (this.skipQuery) {
|
|
21
|
+
console.warn("WARNING: return unconditional true as Skip OPA (policy engine) querying option is turned on!");
|
|
22
|
+
return UnconditionalTrueDecision;
|
|
23
|
+
}
|
|
24
|
+
const queryParams = {};
|
|
25
|
+
if (config?.rawAst) {
|
|
26
|
+
queryParams.rawAst = config.rawAst;
|
|
27
|
+
}
|
|
28
|
+
if (config?.concise) {
|
|
29
|
+
queryParams.concise = config.concise;
|
|
30
|
+
}
|
|
31
|
+
if (config?.explain) {
|
|
32
|
+
queryParams.explain = config.explain;
|
|
33
|
+
}
|
|
34
|
+
if (config?.pretty) {
|
|
35
|
+
queryParams.pretty = config.pretty;
|
|
36
|
+
}
|
|
37
|
+
if (config?.humanReadable) {
|
|
38
|
+
queryParams.humanReadable = config.humanReadable;
|
|
39
|
+
}
|
|
40
|
+
if (config?.unknowns && !config.unknowns.length) {
|
|
41
|
+
queryParams.unknowns = "";
|
|
42
|
+
}
|
|
43
|
+
const usePost = config?.input || config?.unknowns?.length || config?.resourceUri;
|
|
44
|
+
const baseUri = urijs(this.authApiBaseUrl);
|
|
45
|
+
const urlSegments = baseUri
|
|
46
|
+
.segmentCoded()
|
|
47
|
+
.concat(["opa", "decision"])
|
|
48
|
+
.concat(urijs(config.operationUri).segmentCoded());
|
|
49
|
+
const reqUri = baseUri.segmentCoded(urlSegments).search(queryParams);
|
|
50
|
+
const fetchConfig = {
|
|
51
|
+
headers: {},
|
|
52
|
+
...AuthDecisionQueryClient.fetchOptions,
|
|
53
|
+
...this.fetchOptions,
|
|
54
|
+
method: usePost ? "POST" : "GET"
|
|
55
|
+
};
|
|
56
|
+
if (jwtToken) {
|
|
57
|
+
fetchConfig.headers["X-Magda-Session"] = jwtToken;
|
|
58
|
+
}
|
|
59
|
+
const requestData = {};
|
|
60
|
+
if (config?.input) {
|
|
61
|
+
requestData.input = config.input;
|
|
62
|
+
}
|
|
63
|
+
if (config?.unknowns?.length) {
|
|
64
|
+
requestData.unknowns = config.unknowns;
|
|
65
|
+
}
|
|
66
|
+
if (config?.resourceUri) {
|
|
67
|
+
requestData.resourceUri = config.resourceUri;
|
|
68
|
+
}
|
|
69
|
+
if (usePost) {
|
|
70
|
+
fetchConfig.body = JSON.stringify(requestData);
|
|
71
|
+
fetchConfig.headers["Content-Type"] =
|
|
72
|
+
"application/json";
|
|
73
|
+
}
|
|
74
|
+
const res = await fetch(reqUri.toString(), fetchConfig);
|
|
75
|
+
if (res.status != 200) {
|
|
76
|
+
const bodyText = await res.text();
|
|
77
|
+
const errorMsg = `Failed to retrieve auth decision for operation \`${config.operationUri}\` from policy engine: ${bodyText}`;
|
|
78
|
+
console.error(errorMsg);
|
|
79
|
+
throw new Error(errorMsg);
|
|
80
|
+
}
|
|
81
|
+
const data = await res.json();
|
|
82
|
+
return AuthDecision.fromJson(data);
|
|
112
83
|
}
|
|
113
84
|
}
|
|
114
|
-
|
|
115
|
-
exports.default = AuthDecisionQueryClient;
|
|
85
|
+
export default AuthDecisionQueryClient;
|
|
116
86
|
//# sourceMappingURL=AuthDecisionQueryClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/opa/AuthDecisionQueryClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AuthDecisionQueryClient.js","sourceRoot":"","sources":["../../src/opa/AuthDecisionQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,YAAY,EAAE,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAiB5E,MAAM,uBAAuB;IACR,cAAc,GAAW,EAAE,CAAC;IAC7B,SAAS,CAAU;IAE5B,MAAM,CAAC,YAAY,GAAgB,EAAE,CAAC;IACtC,YAAY,GAAgB,EAAE,CAAC;IAEtC,YAAY,cAAsB,EAAE,YAAqB,KAAK;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CACR,8JAA8J,CACjK,CAAC;QACN,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACrD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAA6B,EAC7B,QAAiB;QAEjB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CACR,8FAA8F,CACjG,CAAC;YACF,OAAO,yBAAyB,CAAC;QACrC,CAAC;QAED,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QACvC,CAAC;QACD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YAClB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QACzC,CAAC;QACD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YAClB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QACzC,CAAC;QACD,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QACvC,CAAC;QACD,IAAI,MAAM,EAAE,aAAa,EAAE,CAAC;YACxB,WAAW,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QACrD,CAAC;QACD,IAAI,MAAM,EAAE,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC9C,WAAW,CAAC,QAAQ,GAAG,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,OAAO,GACT,MAAM,EAAE,KAAK,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,MAAM,EAAE,WAAW,CAAC;QAErE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,OAAO;aACtB,YAAY,EAAE;aACd,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;aAC3B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QAEvD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAErE,MAAM,WAAW,GAAgB;YAC7B,OAAO,EAAE,EAA4B;YACrC,GAAG,uBAAuB,CAAC,YAAY;YACvC,GAAG,IAAI,CAAC,YAAY;YACpB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;SACnC,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACV,WAAW,CAAC,OAAkC,CAC3C,iBAAiB,CACpB,GAAG,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,IAAI,MAAM,EAAE,KAAK,EAAE,CAAC;YAChB,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACrC,CAAC;QAED,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC3B,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAC3C,CAAC;QAED,IAAI,MAAM,EAAE,WAAW,EAAE,CAAC;YACtB,WAAW,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACjD,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACV,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC9C,WAAW,CAAC,OAAkC,CAAC,cAAc,CAAC;gBAC3D,kBAAkB,CAAC;QAC3B,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;QACxD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,oDAAoD,MAAM,CAAC,YAAY,0BAA0B,QAAQ,EAAE,CAAC;YAC7H,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAE9B,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;;AAGL,eAAe,uBAAuB,CAAC"}
|
package/dist/pgTypes.js
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const pg_1 = __importDefault(require("pg"));
|
|
1
|
+
import pg from "pg";
|
|
7
2
|
// int8ToNumber
|
|
8
|
-
|
|
3
|
+
pg.types.setTypeParser(20, (v) => parseInt(v, 10));
|
|
9
4
|
// 1016 = Type Id for arrays of BigInt values
|
|
10
|
-
const parseBigIntArray =
|
|
11
|
-
|
|
5
|
+
const parseBigIntArray = pg.types.getTypeParser(1016, "text");
|
|
6
|
+
pg.types.setTypeParser(1016, (v) => {
|
|
12
7
|
const defaultParsedVal = parseBigIntArray(v);
|
|
13
8
|
if (!defaultParsedVal) {
|
|
14
9
|
return defaultParsedVal;
|
package/dist/pgTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgTypes.js","sourceRoot":"","sources":["../src/pgTypes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pgTypes.js","sourceRoot":"","sources":["../src/pgTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,eAAe;AACf,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAEnD,6CAA6C;AAC7C,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAW,EAAE,MAAM,CAAC,CAAC;AACrE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAW,EAAE,CAAC,CAAC,EAAE,EAAE;IACtC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpB,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IACD,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { AspectDefinition, Record, WebHook, Operation, WebHookAcknowledgementResponse, MultipleDeleteResult, EventsPage, DeleteResult } from "../generated/registry/api";
|
|
2
|
-
import RegistryClient, { RegistryOptions } from "./RegistryClient";
|
|
3
|
-
import { Maybe } from "tsmonad";
|
|
4
|
-
import ServerError from "../ServerError";
|
|
1
|
+
import { AspectDefinition, Record, WebHook, Operation, WebHookAcknowledgementResponse, MultipleDeleteResult, EventsPage, DeleteResult } from "../generated/registry/api.js";
|
|
2
|
+
import RegistryClient, { RegistryOptions } from "./RegistryClient.js";
|
|
3
|
+
import { Maybe } from "@magda/tsmonad";
|
|
4
|
+
import ServerError from "../ServerError.js";
|
|
5
5
|
export interface AuthorizedRegistryOptions extends RegistryOptions {
|
|
6
6
|
jwt?: string;
|
|
7
7
|
userId?: string;
|
|
@@ -1,196 +1,156 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
-
});
|
|
29
|
-
};
|
|
30
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
-
};
|
|
33
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
-
const RegistryClient_1 = __importStar(require("./RegistryClient"));
|
|
35
|
-
const retry_1 = __importDefault(require("../retry"));
|
|
36
|
-
const formatServiceError_1 = __importDefault(require("../formatServiceError"));
|
|
37
|
-
const buildJwt_1 = __importDefault(require("../session/buildJwt"));
|
|
38
|
-
const tsmonad_1 = require("tsmonad");
|
|
39
|
-
const ServerError_1 = __importDefault(require("../ServerError"));
|
|
40
|
-
class AuthorizedRegistryClient extends RegistryClient_1.default {
|
|
1
|
+
import RegistryClient, { toServerError } from "./RegistryClient.js";
|
|
2
|
+
import retry from "../retry.js";
|
|
3
|
+
import formatServiceError from "../formatServiceError.js";
|
|
4
|
+
import buildJwt from "../session/buildJwt.js";
|
|
5
|
+
import { Maybe } from "@magda/tsmonad";
|
|
6
|
+
import ServerError from "../ServerError.js";
|
|
7
|
+
export default class AuthorizedRegistryClient extends RegistryClient {
|
|
8
|
+
jwt = undefined;
|
|
41
9
|
constructor(options) {
|
|
42
10
|
super(options);
|
|
43
|
-
this.jwt = undefined;
|
|
44
11
|
if (options.tenantId === undefined || options.tenantId === null) {
|
|
45
12
|
throw Error("A tenant id must be defined.");
|
|
46
13
|
}
|
|
47
|
-
if (
|
|
14
|
+
if (options?.userId && !options.jwtSecret) {
|
|
48
15
|
throw Error("jwtSecret must be supplied when userId is supplied.");
|
|
49
16
|
}
|
|
50
|
-
if (!
|
|
17
|
+
if (!options?.userId && options.jwtSecret) {
|
|
51
18
|
throw Error("userId must be supplied when jwtSecret is supplied.");
|
|
52
19
|
}
|
|
53
|
-
if (
|
|
54
|
-
this.jwt =
|
|
20
|
+
if (options?.userId && options.jwtSecret) {
|
|
21
|
+
this.jwt = buildJwt(options.jwtSecret, options.userId);
|
|
55
22
|
}
|
|
56
|
-
else if (options
|
|
23
|
+
else if (options?.jwt) {
|
|
57
24
|
this.jwt = options.jwt;
|
|
58
25
|
}
|
|
59
26
|
}
|
|
60
|
-
getAspectDefinition(aspectId) {
|
|
61
|
-
|
|
62
|
-
getAspectDefinition: { get: () => super.getAspectDefinition }
|
|
63
|
-
});
|
|
64
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
-
return yield _super.getAspectDefinition.call(this, aspectId, this.jwt);
|
|
66
|
-
});
|
|
27
|
+
async getAspectDefinition(aspectId) {
|
|
28
|
+
return await super.getAspectDefinition(aspectId, this.jwt);
|
|
67
29
|
}
|
|
68
30
|
putAspectDefinition(aspectDefinition, tenantId = this.tenantId) {
|
|
69
31
|
const operation = () => this.aspectDefinitionsApi.putById(tenantId, encodeURIComponent(aspectDefinition.id), aspectDefinition, this.jwt);
|
|
70
|
-
return
|
|
32
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to create aspect definition "${aspectDefinition.id}".`, e, retriesLeft)))
|
|
71
33
|
.then((result) => result.body)
|
|
72
|
-
.catch(
|
|
34
|
+
.catch(toServerError("putAspectDefinition"));
|
|
73
35
|
}
|
|
74
36
|
postHook(hook) {
|
|
75
37
|
const operation = () => this.webHooksApi.create(hook, this.jwt);
|
|
76
|
-
return
|
|
38
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT hook record.`, e, retriesLeft)))
|
|
77
39
|
.then((result) => result.body)
|
|
78
|
-
.catch(
|
|
40
|
+
.catch(toServerError("postHook"));
|
|
79
41
|
}
|
|
80
42
|
putHook(hook) {
|
|
81
43
|
const operation = () => this.webHooksApi.putById(encodeURIComponent(hook.id), hook, this.jwt);
|
|
82
|
-
return
|
|
44
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT hook record.`, e, retriesLeft)))
|
|
83
45
|
.then((result) => result.body)
|
|
84
|
-
.catch(
|
|
46
|
+
.catch(toServerError("putHook"));
|
|
85
47
|
}
|
|
86
48
|
getHook(hookId) {
|
|
87
49
|
const operation = () => this.webHooksApi
|
|
88
50
|
.getById(encodeURIComponent(hookId), this.jwt)
|
|
89
|
-
.then((result) =>
|
|
51
|
+
.then((result) => Maybe.just(result.body))
|
|
90
52
|
.catch((e) => {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
return tsmonad_1.Maybe.nothing();
|
|
53
|
+
if (e.response && e.response.status === 404) {
|
|
54
|
+
return Maybe.nothing();
|
|
94
55
|
}
|
|
95
56
|
else {
|
|
96
|
-
throw new
|
|
57
|
+
throw new ServerError("Failed to get hook: " + e.body, e?.response?.status);
|
|
97
58
|
}
|
|
98
59
|
});
|
|
99
|
-
return (
|
|
60
|
+
return (retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to GET hook ${hookId}`, e, retriesLeft))).catch(toServerError("getHook")));
|
|
100
61
|
}
|
|
101
62
|
getHooks() {
|
|
102
63
|
const operation = () => () => this.webHooksApi.getAll(this.jwt);
|
|
103
|
-
return
|
|
64
|
+
return retry(operation(), this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError("Failed to GET hooks.", e, retriesLeft)))
|
|
104
65
|
.then((result) => result.body)
|
|
105
|
-
.catch(
|
|
66
|
+
.catch(toServerError("getHooks"));
|
|
106
67
|
}
|
|
107
68
|
resumeHook(webhookId, succeeded = false, lastEventIdReceived = null, active) {
|
|
108
69
|
const operation = () => this.webHooksApi.ack(encodeURIComponent(webhookId), { succeeded, lastEventIdReceived, active }, this.jwt);
|
|
109
|
-
return
|
|
70
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to resume webhook ${webhookId}`, e, retriesLeft)))
|
|
110
71
|
.then((result) => result.body)
|
|
111
|
-
.catch(
|
|
72
|
+
.catch(toServerError("resumeHook"));
|
|
112
73
|
}
|
|
113
74
|
creatRecord(record, tenantId = this.tenantId) {
|
|
114
75
|
const operation = () => this.recordsApi.create(tenantId, record, this.jwt);
|
|
115
|
-
return
|
|
76
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to create registry record with ID "${record.id}".`, e, retriesLeft)))
|
|
116
77
|
.then((result) => result.body)
|
|
117
|
-
.catch(
|
|
78
|
+
.catch(toServerError("createRecord"));
|
|
118
79
|
}
|
|
119
80
|
putRecord(record, tenantId = this.tenantId) {
|
|
120
81
|
const operation = () => this.recordsApi.putById(tenantId, encodeURIComponent(record.id), record, this.jwt);
|
|
121
|
-
return
|
|
82
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT data registry record with ID "${record.id}".`, e, retriesLeft)))
|
|
122
83
|
.then((result) => result.body)
|
|
123
|
-
.catch(
|
|
84
|
+
.catch(toServerError("putRecord"));
|
|
124
85
|
}
|
|
125
86
|
patchRecord(recordId, recordPatch, tenantId = this.tenantId) {
|
|
126
87
|
const operation = () => this.recordsApi.patchById(tenantId, encodeURIComponent(recordId), recordPatch, this.jwt);
|
|
127
|
-
return
|
|
88
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PATCH data registry record with ID "${recordId}".`, e, retriesLeft)))
|
|
128
89
|
.then((result) => result.body)
|
|
129
|
-
.catch(
|
|
90
|
+
.catch(toServerError("patchRecord"));
|
|
130
91
|
}
|
|
131
92
|
patchRecords(recordIds, recordPatch, tenantId = this.tenantId) {
|
|
132
93
|
const operation = () => this.recordsApi.patchRecords(tenantId, { recordIds, jsonPath: recordPatch }, this.jwt);
|
|
133
|
-
return
|
|
94
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PATCH registry records with ID "${recordIds.join(", ")}".`, e, retriesLeft)))
|
|
134
95
|
.then((result) => result.body)
|
|
135
|
-
.catch(
|
|
96
|
+
.catch(toServerError("patchRecords"));
|
|
136
97
|
}
|
|
137
98
|
putRecordAspect(recordId, aspectId, aspect, merge = false, tenantId = this.tenantId) {
|
|
138
99
|
const operation = () => this.recordAspectsApi.putById(encodeURIComponent(recordId), aspectId, aspect, this.jwt, tenantId, merge);
|
|
139
|
-
return
|
|
100
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT data registry aspect ${aspectId} for record with ID "${recordId}".`, e, retriesLeft)))
|
|
140
101
|
.then((result) => result.body)
|
|
141
|
-
.catch(
|
|
102
|
+
.catch(toServerError("putRecordAspect"));
|
|
142
103
|
}
|
|
143
104
|
putRecordsAspect(recordIds, aspectId, aspectData, merge = false, tenantId = this.tenantId) {
|
|
144
105
|
const operation = () => this.recordsApi.putRecordsAspect(tenantId, aspectId, { recordIds, data: aspectData }, this.jwt, merge);
|
|
145
|
-
return
|
|
106
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT aspect ${aspectId} for records with ID: "${recordIds.join(",")}".`, e, retriesLeft)))
|
|
146
107
|
.then((result) => result.body)
|
|
147
|
-
.catch(
|
|
108
|
+
.catch(toServerError("putRecordsAspect"));
|
|
148
109
|
}
|
|
149
110
|
deleteRecordsAspectArrayItems(recordIds, aspectId, jsonPath, items, tenantId = this.tenantId) {
|
|
150
111
|
const operation = () => this.recordsApi.deleteRecordsAspectArrayItems(tenantId, aspectId, { recordIds, jsonPath, items }, this.jwt);
|
|
151
|
-
return
|
|
112
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to deleteRecordsAspectArrayItems at jsonPath "${jsonPath}" aspect ${aspectId} for records with ID: "${recordIds.join(",")}".`, e, retriesLeft)))
|
|
152
113
|
.then((result) => result.body)
|
|
153
|
-
.catch(
|
|
114
|
+
.catch(toServerError("deleteRecordsAspectArrayItems"));
|
|
154
115
|
}
|
|
155
116
|
deleteRecordAspect(recordId, aspectId, tenantId = this.tenantId) {
|
|
156
117
|
const operation = () => this.recordAspectsApi.deleteById(encodeURIComponent(recordId), aspectId, this.jwt, tenantId);
|
|
157
|
-
return
|
|
118
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT data registry aspect ${aspectId} for record with ID "${recordId}".`, e, retriesLeft)))
|
|
158
119
|
.then((result) => result.body)
|
|
159
|
-
.catch(
|
|
120
|
+
.catch(toServerError("putRecordAspect"));
|
|
160
121
|
}
|
|
161
122
|
patchRecordAspect(recordId, aspectId, aspectPatch, tenantId = this.tenantId) {
|
|
162
123
|
const operation = () => this.recordAspectsApi.patchById(encodeURIComponent(recordId), aspectId, aspectPatch, this.jwt, tenantId);
|
|
163
|
-
return
|
|
124
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to PUT data registry aspect ${aspectId} for record with ID "${recordId}".`, e, retriesLeft)))
|
|
164
125
|
.then((result) => result.body)
|
|
165
|
-
.catch(
|
|
126
|
+
.catch(toServerError("patchRecordAspect"));
|
|
166
127
|
}
|
|
167
128
|
deleteBySource(sourceTagToPreserve, sourceId, tenantId = this.tenantId) {
|
|
168
129
|
const operation = () => this.recordsApi
|
|
169
130
|
.trimBySourceTag(tenantId, sourceTagToPreserve, sourceId, this.jwt)
|
|
170
131
|
.then((result) => {
|
|
171
|
-
if (result.response.
|
|
132
|
+
if (result.response.status === 202) {
|
|
172
133
|
return "Processing";
|
|
173
134
|
}
|
|
174
135
|
else {
|
|
175
136
|
return result.body;
|
|
176
137
|
}
|
|
177
138
|
});
|
|
178
|
-
return
|
|
139
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to DELETE with sourceTagToPreserve ${sourceTagToPreserve} and sourceId ${sourceId}`, e, retriesLeft))).catch(toServerError("deleteBySource"));
|
|
179
140
|
}
|
|
180
141
|
deleteRecord(id, tenantId = this.tenantId) {
|
|
181
142
|
const operation = () => this.recordsApi.deleteById(tenantId, id, this.jwt);
|
|
182
|
-
return
|
|
143
|
+
return retry(operation, this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError(`Failed to DELETE registry record with ID "${id}".`, e, retriesLeft)))
|
|
183
144
|
.then((result) => result.body)
|
|
184
|
-
.catch(
|
|
145
|
+
.catch(toServerError("deletetRecord"));
|
|
185
146
|
}
|
|
186
147
|
getRecordHistory(id, pageToken, start, limit) {
|
|
187
148
|
const operation = (id) => () => this.recordHistoryApi.history(this.tenantId, encodeURIComponent(id), this.jwt, pageToken, start, limit);
|
|
188
|
-
return
|
|
189
|
-
return !e.response || e.response.
|
|
149
|
+
return retry(operation(id), this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError("Failed to GET history.", e, retriesLeft)), (e) => {
|
|
150
|
+
return !e.response || e.response.status !== 404;
|
|
190
151
|
})
|
|
191
152
|
.then((result) => result.body)
|
|
192
|
-
.catch(
|
|
153
|
+
.catch(toServerError("getRecordHistory"));
|
|
193
154
|
}
|
|
194
155
|
}
|
|
195
|
-
exports.default = AuthorizedRegistryClient;
|
|
196
156
|
//# sourceMappingURL=AuthorizedRegistryClient.js.map
|