@balena/open-balena-api 34.9.6-build-bluebird-to-native-05f5f3f1b772ba98f00c739d94d3aa869eba0e89-1 → 34.9.6-build-request-log-remove-date-5f7d9a04bbfb8d573813d1614aa1f95506201d51-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/features/contracts/index.js +2 -2
- package/dist/features/contracts/index.js.map +1 -1
- package/dist/features/request-logging/index.js +1 -2
- package/dist/features/request-logging/index.js.map +1 -1
- package/dist/infra/auth/permissions.d.ts +3 -5
- package/dist/infra/auth/permissions.js +4 -6
- package/dist/infra/auth/permissions.js.map +1 -1
- package/package.json +2 -5
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
|
-
import
|
|
2
|
+
import Bluebird from 'bluebird';
|
|
3
3
|
import { fetchContractsLocally, getContracts } from './contracts-directory.js';
|
|
4
4
|
import { sbvrUtils, permissions } from '@balena/pinejs';
|
|
5
5
|
import { CONTRACTS_PRIVATE_REPO_BRANCH, CONTRACTS_PRIVATE_REPO_NAME, CONTRACTS_PRIVATE_REPO_OWNER, CONTRACTS_PRIVATE_REPO_TOKEN, CONTRACTS_PUBLIC_REPO_BRANCH, CONTRACTS_PUBLIC_REPO_NAME, CONTRACTS_PUBLIC_REPO_OWNER, } from '../../lib/config.js';
|
|
@@ -61,7 +61,7 @@ const mapModel = async (contractEntry, { includeRawContract, map }, rootApi) =>
|
|
|
61
61
|
};
|
|
62
62
|
const getReversePropMapEntries = (map) => Object.entries(map).filter((entry) => entry[1].isReferencedBy != null);
|
|
63
63
|
const upsertEntries = async (rootApi, { resource, uniqueKey, map }, reversePropMapEntries, existingData, newData) => {
|
|
64
|
-
await
|
|
64
|
+
await Bluebird.map(newData, async (fullEntry) => {
|
|
65
65
|
// Has only the fields that the DB's resource has (primitives & FK),
|
|
66
66
|
// by removing the ReverseNavigationResource properties.
|
|
67
67
|
const entryFieldData = Object.fromEntries(Object.entries(fullEntry).filter(([key]) => map[key]?.isReferencedBy == null));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/contracts/index.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/contracts/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,14 +50,13 @@ export const setupRequestLogging = (app, getUrl) => {
|
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
app.use(morgan((tokens, req, res) => {
|
|
53
|
-
const date = new Date().toISOString();
|
|
54
53
|
const url = $getUrl(req);
|
|
55
54
|
const statusCode = tokens.status(req, res) ?? '-';
|
|
56
55
|
const responseTime = tokens['response-time'](req, res) ?? '-';
|
|
57
56
|
const balenaClient = req.headers['x-balena-client'] ?? '-';
|
|
58
57
|
const callerId = getCallerId(req);
|
|
59
58
|
const traceId = trace.getActiveSpan()?.spanContext().traceId ?? '-';
|
|
60
|
-
return `${
|
|
59
|
+
return `${getIP(req)} ${traceId} ${callerId} ${req.method} ${url} ${statusCode} ${responseTime}ms ${balenaClient}`;
|
|
61
60
|
}, {
|
|
62
61
|
skip: (req) => req.skipLogging,
|
|
63
62
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/request-logging/index.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,MAAM,CAAC,MAAM,WAAW,GAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAC9D,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,CAAC;AACR,CAAC,CAAC;AAEF,2DAA2D;AAC3D,uEAAuE;AACvE,0CAA0C;AAC1C,oBAAoB;AACpB,oGAAoG;AACpG,4GAA4G;AAC5G,sFAAsF;AACtF,MAAM,WAAW,GAAG,CAAC,GAAY,EAAE,EAAE;IACpC,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,KAAK,OAAO,EAAE,CAAC;QACvB,CAAC;QACD,IACC,CAAC,SAAS,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;YAC7C,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,EACzC,CAAC;YACF,OAAO,WAAW,CAAC;QACpB,CAAC;QACD,IAAI,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAC7C,OAAO,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACvC,OAAO,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5B,CAAC;IACF,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAClC,GAAgB,EAChB,MAAsB,EACrB,EAAE;IACH,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,aAAa,EAAE,CAAC;QACtC,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE;YACjB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC;gBACJ,0DAA0D;gBAC1D,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAAC,MAAM,CAAC;gBACR,OAAO,GAAG,CAAC;YACZ,CAAC;QACF,CAAC,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAG,CACN,MAAM,CACL,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/request-logging/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,10 +45,8 @@ export interface UserRoleMap {
|
|
|
45
45
|
[roleName: string]: EmailSet;
|
|
46
46
|
}
|
|
47
47
|
export declare function createAllPermissions(tx: Tx, permissionNames: PermissionSet, roleMap: RolePermissionsMap, apiKeyMap: ApiKeyPermissionsMap, userMap: UserRoleMap): Promise<{
|
|
48
|
-
roles: {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
};
|
|
52
|
-
};
|
|
48
|
+
roles: Dictionary<{
|
|
49
|
+
id: number;
|
|
50
|
+
}>;
|
|
53
51
|
apiKeys: (string | undefined)[];
|
|
54
52
|
}>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import Bluebird from 'bluebird';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import randomstring from 'randomstring';
|
|
4
4
|
import memoize from 'memoizee';
|
|
@@ -142,7 +142,7 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
|
142
142
|
.then(({ id }) => id);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
-
return await
|
|
145
|
+
return await Bluebird.props(result);
|
|
146
146
|
});
|
|
147
147
|
const createRolePermissions = async (rolePermissionNames, roleName) => {
|
|
148
148
|
try {
|
|
@@ -189,8 +189,7 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
|
189
189
|
throw err;
|
|
190
190
|
}
|
|
191
191
|
};
|
|
192
|
-
const rolesPromise = (async () => {
|
|
193
|
-
const resolvedRoleMap = await pProps(_.mapValues(roleMap, createRolePermissions));
|
|
192
|
+
const rolesPromise = Bluebird.props(_.mapValues(roleMap, createRolePermissions)).tap(async (resolvedRoleMap) => {
|
|
194
193
|
// Assign user roles
|
|
195
194
|
await Promise.all(_.map(userMap, async (userEmails, roleName) => {
|
|
196
195
|
for (const email of userEmails) {
|
|
@@ -250,8 +249,7 @@ export async function createAllPermissions(tx, permissionNames, roleMap, apiKeyM
|
|
|
250
249
|
captureException(err, 'Error on clearing stale permissions');
|
|
251
250
|
throw err;
|
|
252
251
|
}
|
|
253
|
-
|
|
254
|
-
})();
|
|
252
|
+
});
|
|
255
253
|
const apiKeysPromise = Promise.all(_.toPairs(apiKeyMap).map(async ([roleName, { permissions: apiKeyPermissions, key }]) => {
|
|
256
254
|
try {
|
|
257
255
|
const role = await createRolePermissions(apiKeyPermissions, roleName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/infra/auth/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/infra/auth/permissions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "34.9.6-build-
|
|
4
|
+
"version": "34.9.6-build-request-log-remove-date-5f7d9a04bbfb8d573813d1614aa1f95506201d51-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -118,8 +118,6 @@
|
|
|
118
118
|
"ndjson": "^2.0.0",
|
|
119
119
|
"node-schedule": "^2.1.1",
|
|
120
120
|
"on-finished": "^2.4.1",
|
|
121
|
-
"p-map": "^7.0.3",
|
|
122
|
-
"p-props": "^6.0.0",
|
|
123
121
|
"passport": "^0.7.0",
|
|
124
122
|
"passport-jwt": "^4.0.1",
|
|
125
123
|
"pinejs-client-core": "^8.1.2",
|
|
@@ -157,7 +155,6 @@
|
|
|
157
155
|
"lint-staged": "^15.3.0",
|
|
158
156
|
"mocha": "^11.1.0",
|
|
159
157
|
"nock": "^13.5.6",
|
|
160
|
-
"p-timeout": "^6.1.4",
|
|
161
158
|
"pinejs-client-supertest": "^3.0.1",
|
|
162
159
|
"rimraf": "^6.0.1",
|
|
163
160
|
"sinon": "^19.0.2",
|
|
@@ -177,6 +174,6 @@
|
|
|
177
174
|
"import": "@swc-node/register/esm-register"
|
|
178
175
|
},
|
|
179
176
|
"versionist": {
|
|
180
|
-
"publishedAt": "2025-03-
|
|
177
|
+
"publishedAt": "2025-03-12T14:38:23.802Z"
|
|
181
178
|
}
|
|
182
179
|
}
|