@balena/open-balena-api 26.4.5 → 26.4.6
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/features/api-keys/lib.js +22 -25
- package/dist/features/api-keys/lib.js.map +1 -1
- package/dist/features/device-heartbeat/index.js +52 -56
- package/dist/features/device-heartbeat/index.js.map +1 -1
- package/dist/features/device-provisioning/gracefully-deny-conflicting-registrations.js +10 -13
- package/dist/features/device-provisioning/gracefully-deny-conflicting-registrations.js.map +1 -1
- package/dist/features/device-state/middleware.js +10 -13
- package/dist/features/device-state/middleware.js.map +1 -1
- package/dist/features/device-state/routes/fleet-state-get-v3.js +17 -23
- package/dist/features/device-state/routes/fleet-state-get-v3.js.map +1 -1
- package/dist/features/device-state/routes/state-get-v2.js +39 -42
- package/dist/features/device-state/routes/state-get-v2.js.map +1 -1
- package/dist/features/device-state/routes/state-get-v3.js +8 -11
- package/dist/features/device-state/routes/state-get-v3.js.map +1 -1
- package/dist/features/device-state/routes/state-patch-v2.js +27 -29
- package/dist/features/device-state/routes/state-patch-v2.js.map +1 -1
- package/dist/infra/auth/auth.js +19 -22
- package/dist/infra/auth/auth.js.map +1 -1
- package/package.json +16 -16
|
@@ -157,28 +157,26 @@ export const createGenericApiKey = async (req, { actorType, actorTypeId, roles,
|
|
|
157
157
|
});
|
|
158
158
|
};
|
|
159
159
|
export const isApiKeyWithRole = (() => {
|
|
160
|
-
const authQuery = _.once(() => {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
$
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
$
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
key: { '@': 'key' },
|
|
181
|
-
},
|
|
160
|
+
const authQuery = _.once(() => api.Auth.prepare({
|
|
161
|
+
resource: 'role',
|
|
162
|
+
passthrough: { req: permissions.root },
|
|
163
|
+
id: {
|
|
164
|
+
name: { '@': 'roleName' },
|
|
165
|
+
},
|
|
166
|
+
options: {
|
|
167
|
+
$select: 'id',
|
|
168
|
+
$filter: {
|
|
169
|
+
is_of__api_key: {
|
|
170
|
+
$any: {
|
|
171
|
+
$alias: 'khr',
|
|
172
|
+
$expr: {
|
|
173
|
+
khr: {
|
|
174
|
+
api_key: {
|
|
175
|
+
$any: {
|
|
176
|
+
$alias: 'k',
|
|
177
|
+
$expr: {
|
|
178
|
+
k: {
|
|
179
|
+
key: { '@': 'key' },
|
|
182
180
|
},
|
|
183
181
|
},
|
|
184
182
|
},
|
|
@@ -188,9 +186,8 @@ export const isApiKeyWithRole = (() => {
|
|
|
188
186
|
},
|
|
189
187
|
},
|
|
190
188
|
},
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
});
|
|
189
|
+
},
|
|
190
|
+
}, { key: ['string'], roleName: ['string'] }));
|
|
194
191
|
return multiCacheMemoizee(async (key, roleName, tx) => {
|
|
195
192
|
const role = await authQuery()({ key, roleName }, undefined, {
|
|
196
193
|
tx,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/features/api-keys/lib.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,CAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../src/features/api-keys/lib.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAC1B,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;AAiBnC,MAAM,aAAa,GAAG,KAAK,EAC1B,SAAsB,EACtB,QAAgB,EAChB,GAAY,EACZ,WAAmB,EACnB,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAyB,EAClD,EAAE;IACpB,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;QACrC,QAAQ,EAAE,SAAS;QACnB,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,OAAO,EAAE;YACR,OAAO,EAAE,OAAO;SAChB;KACD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC;IACtC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,MAAM,SAAS,sCAAsC,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QAChC,GAAG,EAAE,GAAG,SAAS,IAAI,WAAW,aAAa;QAC7C,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,IAAI,EAAE;YACL,MAAM,EAAE,UAAU,QAAQ,EAAE;SAC5B;KACD,CAAC,CAAC;IAEH,MAAM,KAAK,GAAuB,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAClD,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;QAC3B,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,SAAS,KAAK,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,MAAM,CAAC,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;QAChC,WAAW,EAAE;YACZ,EAAE;YACF,GAAG,EAAE,WAAW,CAAC,IAAI;SACrB;KACD,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,SAAS,CAAC,IAAI,CAAC;YACd,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE;gBACL,YAAY,EAAE,OAAO;gBACrB,GAAG,EAAE,MAAM;gBACX,IAAI;gBACJ,WAAW;gBACX,WAAW,EAAE,UAAU;aACvB;YACD,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SAClC,CAAC;QACF,SAAS,CAAC,GAAG,CAAC;YACb,QAAQ,EAAE,MAAM;YAChB,EAAE,EAAE;gBACH,IAAI,EAAE,QAAQ;aACd;YACD,OAAO,EAAE;gBACR,OAAO,EAAE,IAAI;aACb;SACD,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,QAAQ,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,SAAS,CAAC,IAAI,CAAC;QACpB,QAAQ,EAAE,oBAAoB;QAC9B,IAAI,EAAE;YACL,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,IAAI,CAAC,EAAE;SACb;QACD,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;KAClC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAIvB,EAAE,EAAE;IACJ,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAElD,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,WAAW,IAAI,IAAI,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC5D,MAAM,IAAI,MAAM,CAAC,eAAe,CAC/B,0CAA0C,CAC1C,CAAC;IACH,CAAC;IAED,IACC,UAAU,IAAI,IAAI;QAClB,CAAC,OAAO,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EACxE,CAAC;QACF,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,wCAAwC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO;QACN,IAAI;QACJ,WAAW;QACX,GAAG,CAAC,UAAU,IAAI;YACjB,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC;SAChC,CAAC;KACF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAChC,SAAsB,EACtB,QAAgB,EAChB,GAAY,EACZ,WAAmB,EACnB,UAAyB,EAAE,EACT,EAAE;IACpB,OAAO,CAAC,MAAM,KAAK,YAAY,CAAC,QAAQ,EAAE,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC1B,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,MAAM,aAAa,CACzB,SAAS,EACT,QAAQ,EACR,GAAG,EACH,WAAW,EACX,OAAgC,CAChC,CAAC;IACH,CAAC;SAAM,CAAC;QACP,OAAO,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAClD,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;YAChB,OAAO,MAAM,aAAa,CACzB,SAAS,EACT,QAAQ,EACR,GAAG,EACH,WAAW,EACX,OAAgC,CAChC,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC;AAQF,MAAM,CAAC,MAAM,wBAAwB,GAAqB,CAAC,CAAC,OAAO,CAClE,YAAY,EACZ,aAAa,EACb,sBAAsB,CACtB,CAAC;AACF,MAAM,CAAC,MAAM,kBAAkB,GAAqB,CAAC,CAAC,OAAO,CAC5D,YAAY,EACZ,QAAQ,EACR,gBAAgB,CAChB,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAqB,CAAC,CAAC,OAAO,CAC/D,YAAY,EACZ,MAAM,EACN,oBAAoB,CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAqB,CAAC,CAAC,OAAO,CAC1D,YAAY,EACZ,MAAM,EACN,cAAc,CACd,CAAC;AAQF,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAEvE,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACvC,GAAY,EACZ,EACC,SAAS,EACT,WAAW,EACX,KAAK,EACL,IAAI,EACJ,WAAW,EACX,UAAU,EACV,MAAM,GACY,EAClB,EAAE;IACH,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,eAAe,CAAC,wBAAwB,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,eAAe,CAAC,gCAAgC,CAAC,CAAC;IAC7D,CAAC;IAED,IACC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EACzD,CAAC;QACF,MAAM,IAAI,eAAe,CAAC,wCAAwC,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CAAC,+CAA+C,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE5D,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,eAAe,CACxB,sBAAsB,SAAS,uBAAuB,CACtD,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE1B,OAAO,YAAY,CAClB,SAAS,EACT,QAAQ,EACR,GAAG,EACH,WAAW;IACX,sDAAsD;IACtD;QACC,IAAI;QACJ,WAAW;QACX,UAAU;QACV,MAAM;KACN,CACD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;IACrC,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CACf;QACC,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE;QACtC,EAAE,EAAE;YACH,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE;SACzB;QACD,OAAO,EAAE;YACR,OAAO,EAAE,IAAI;YACb,OAAO,EAAE;gBACR,cAAc,EAAE;oBACf,IAAI,EAAE;wBACL,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE;4BACN,GAAG,EAAE;gCACJ,OAAO,EAAE;oCACR,IAAI,EAAE;wCACL,MAAM,EAAE,GAAG;wCACX,KAAK,EAAE;4CACN,CAAC,EAAE;gDACF,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;6CACnB;yCACD;qCACD;iCACD;6BACD;yBACD;qBACD;iBACD;aACD;SACD;KACQ,EACV,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,CACzC,CACD,CAAC;IACF,OAAO,kBAAkB,CACxB,KAAK,EAAE,GAAW,EAAE,QAAgB,EAAE,EAAO,EAAoB,EAAE;QAClE,MAAM,IAAI,GAAG,MAAM,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE;YAC5D,EAAE;SACF,CAAC,CAAC;QACH,OAAO,IAAI,IAAI,IAAI,CAAC;IACrB,CAAC,EACD;QACC,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,0BAA0B;QAClC,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,IAAI,GAAG,EAAE;KACrD,CACD,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAG1C,GAAM,EACN,gBAA0B;AAC1B;;;;;GAKG;AACH,mBAAmB,GAAG,KAAK,EACvB,EAAE;IACN,IAAI,YAAY,GAAG,GAAG,CAAC;IAEvB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1B,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;SAAM,IAAI,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAC7C,2DAA2D;QAC3D,0DAA0D;QAC1D,4DAA4D;QAC5D,YAAY,CAAC,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxE,CAAC;IAED,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC5D,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -9,51 +9,46 @@ import { API_HEARTBEAT_STATE_ENABLED, API_HEARTBEAT_STATE_TIMEOUT_SECONDS, API_H
|
|
|
9
9
|
import { redis, redisRO } from '../../infra/redis/index.js';
|
|
10
10
|
import { setTimeout } from 'timers/promises';
|
|
11
11
|
const { api } = sbvrUtils;
|
|
12
|
-
const getPollIntervalForDevice = _.once(() => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
],
|
|
26
|
-
},
|
|
27
|
-
},
|
|
28
|
-
$orderby: {
|
|
29
|
-
// we want the last value that would have been passed
|
|
30
|
-
// to the supervisor, as that is the one it would have used.
|
|
31
|
-
name: 'desc',
|
|
12
|
+
const getPollIntervalForDevice = _.once(() => api.resin.prepare({
|
|
13
|
+
resource: 'device_config_variable',
|
|
14
|
+
passthrough: { req: permissions.root },
|
|
15
|
+
options: {
|
|
16
|
+
$select: ['value'],
|
|
17
|
+
$top: 1,
|
|
18
|
+
$filter: {
|
|
19
|
+
device: { '@': 'deviceId' },
|
|
20
|
+
name: {
|
|
21
|
+
$in: [
|
|
22
|
+
'BALENA_SUPERVISOR_POLL_INTERVAL',
|
|
23
|
+
'RESIN_SUPERVISOR_POLL_INTERVAL',
|
|
24
|
+
],
|
|
32
25
|
},
|
|
33
26
|
},
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
27
|
+
$orderby: {
|
|
28
|
+
// we want the last value that would have been passed
|
|
29
|
+
// to the supervisor, as that is the one it would have used.
|
|
30
|
+
name: 'desc',
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
}, { deviceId: ['number'] }));
|
|
34
|
+
const getPollIntervalForParentApplication = _.once(() => api.resin.prepare({
|
|
35
|
+
resource: 'application_config_variable',
|
|
36
|
+
passthrough: { req: permissions.root },
|
|
37
|
+
options: {
|
|
38
|
+
$select: ['value'],
|
|
39
|
+
$top: 1,
|
|
40
|
+
$filter: {
|
|
41
|
+
application: {
|
|
42
|
+
$any: {
|
|
43
|
+
$alias: 'a',
|
|
44
|
+
$expr: {
|
|
45
|
+
a: {
|
|
46
|
+
owns__device: {
|
|
47
|
+
$any: {
|
|
48
|
+
$alias: 'd',
|
|
49
|
+
$expr: {
|
|
50
|
+
d: {
|
|
51
|
+
id: { '@': 'deviceId' },
|
|
57
52
|
},
|
|
58
53
|
},
|
|
59
54
|
},
|
|
@@ -61,22 +56,23 @@ const getPollIntervalForParentApplication = _.once(() => {
|
|
|
61
56
|
},
|
|
62
57
|
},
|
|
63
58
|
},
|
|
64
|
-
name: {
|
|
65
|
-
$in: [
|
|
66
|
-
'BALENA_SUPERVISOR_POLL_INTERVAL',
|
|
67
|
-
'RESIN_SUPERVISOR_POLL_INTERVAL',
|
|
68
|
-
],
|
|
69
|
-
},
|
|
70
59
|
},
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
60
|
+
name: {
|
|
61
|
+
$in: [
|
|
62
|
+
'BALENA_SUPERVISOR_POLL_INTERVAL',
|
|
63
|
+
'RESIN_SUPERVISOR_POLL_INTERVAL',
|
|
64
|
+
],
|
|
75
65
|
},
|
|
76
66
|
},
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
67
|
+
$orderby: {
|
|
68
|
+
// we want the last value that would have been passed
|
|
69
|
+
// to the supervisor, as that is the one it would have used.
|
|
70
|
+
name: 'desc',
|
|
71
|
+
},
|
|
72
|
+
},
|
|
73
|
+
}, {
|
|
74
|
+
deviceId: ['number'],
|
|
75
|
+
}));
|
|
80
76
|
export const getPollInterval = async (deviceId, config) => {
|
|
81
77
|
let pollIntervalString;
|
|
82
78
|
if (config != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/device-heartbeat/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,QAAQ,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/device-heartbeat/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,19 +6,16 @@ import { createMultiLevelStore } from '../../infra/cache/index.js';
|
|
|
6
6
|
import { checkDeviceExistsIsFrozen } from '../device-state/middleware.js';
|
|
7
7
|
const { ConflictError } = errors;
|
|
8
8
|
const { api } = sbvrUtils;
|
|
9
|
-
const checkApiKeyExistsQuery = _.once(() => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
};
|
|
20
|
-
return api.resin.prepare(pineQuery);
|
|
21
|
-
});
|
|
9
|
+
const checkApiKeyExistsQuery = _.once(() => api.resin.prepare({
|
|
10
|
+
resource: 'api_key',
|
|
11
|
+
passthrough: { req: permissions.root },
|
|
12
|
+
id: {
|
|
13
|
+
key: { '@': 'key' },
|
|
14
|
+
},
|
|
15
|
+
options: {
|
|
16
|
+
$select: 'id',
|
|
17
|
+
},
|
|
18
|
+
}, { key: ['string'] }));
|
|
22
19
|
export const checkApiKeyExistsStore = createMultiLevelStore('checkApiKeyExists', {
|
|
23
20
|
default: {
|
|
24
21
|
// We only care to cache the api keys that already exist,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gracefully-deny-conflicting-registrations.js","sourceRoot":"","sources":["../../../src/features/device-provisioning/gracefully-deny-conflicting-registrations.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"gracefully-deny-conflicting-registrations.js","sourceRoot":"","sources":["../../../src/features/device-provisioning/gracefully-deny-conflicting-registrations.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;AACjC,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAE1B,MAAM,sBAAsB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAC1C,GAAG,CAAC,KAAK,CAAC,OAAO,CAChB;IACC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,EAAE;IACtC,EAAE,EAAE;QACH,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;KACnB;IACD,OAAO,EAAE;QACR,OAAO,EAAE,IAAI;KACb;CACQ,EACV,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CACnB,CACD,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAC1D,mBAAmB,EACnB;IACC,OAAO,EAAE;QACR,yDAAyD;QACzD,6CAA6C;QAC7C,gBAAgB,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI;QAChD,iGAAiG;QACjG,+BAA+B;QAC/B,GAAG,EAAE,4BAA4B,GAAG,OAAO;KAC3C;IACD,KAAK,EAAE,KAAK;CACZ,EACD,KAAK,CACL,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IAC/C,OAAO,MAAM,sBAAsB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,sBAAsB,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,IAAI,CAAC;IACvB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sCAAsC,CAC3D,IAAY,EACZ,MAA0B;IAE1B,wGAAwG;IACxG,uGAAuG;IACvG,wDAAwD;IACxD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACpB,8DAA8D;QAC9D,2CAA2C;QAC3C,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3E,IAAI,cAAc,EAAE,CAAC;QACpB,8DAA8D;QAC9D,2CAA2C;QAC3C,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAAC,CAAC;IAClD,CAAC;AACF,CAAC"}
|
|
@@ -3,19 +3,16 @@ import { multiCacheMemoizee } from '../../infra/cache/index.js';
|
|
|
3
3
|
import { sbvrUtils, permissions } from '@balena/pinejs';
|
|
4
4
|
import { DEVICE_EXISTS_CACHE_TIMEOUT } from '../../lib/config.js';
|
|
5
5
|
const { api } = sbvrUtils;
|
|
6
|
-
const checkDeviceExistsIsFrozenQuery = _.once(() => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
};
|
|
17
|
-
return api.resin.prepare(pineQuery);
|
|
18
|
-
});
|
|
6
|
+
const checkDeviceExistsIsFrozenQuery = _.once(() => api.resin.prepare({
|
|
7
|
+
resource: 'device',
|
|
8
|
+
passthrough: { req: permissions.root },
|
|
9
|
+
id: {
|
|
10
|
+
uuid: { '@': 'uuid' },
|
|
11
|
+
},
|
|
12
|
+
options: {
|
|
13
|
+
$select: ['id', 'is_frozen'],
|
|
14
|
+
},
|
|
15
|
+
}, { uuid: ['string'] }));
|
|
19
16
|
export const checkDeviceExistsIsFrozen = multiCacheMemoizee(async (uuid) => {
|
|
20
17
|
return await checkDeviceExistsIsFrozenQuery()({ uuid });
|
|
21
18
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/features/device-state/middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/features/device-state/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,30 +28,24 @@ const fleetExpand = {
|
|
|
28
28
|
},
|
|
29
29
|
},
|
|
30
30
|
};
|
|
31
|
-
const stateQuery = _.once(() => {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
$filter: {
|
|
46
|
-
commit: { '@': 'commit' },
|
|
47
|
-
belongs_to__application: { '@': 'fleetId' },
|
|
48
|
-
status: 'success',
|
|
49
|
-
},
|
|
50
|
-
...releaseExpand,
|
|
31
|
+
const stateQuery = _.once(() => api.resin.prepare({
|
|
32
|
+
resource: 'application',
|
|
33
|
+
id: { uuid: { '@': 'uuid' } },
|
|
34
|
+
options: {
|
|
35
|
+
$expand: fleetExpand,
|
|
36
|
+
},
|
|
37
|
+
}, { uuid: ['string'] }));
|
|
38
|
+
const releaseQuery = _.once(() => api.resin.prepare({
|
|
39
|
+
resource: 'release',
|
|
40
|
+
options: {
|
|
41
|
+
$filter: {
|
|
42
|
+
commit: { '@': 'commit' },
|
|
43
|
+
belongs_to__application: { '@': 'fleetId' },
|
|
44
|
+
status: 'success',
|
|
51
45
|
},
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
});
|
|
46
|
+
...releaseExpand,
|
|
47
|
+
},
|
|
48
|
+
}, { commit: ['string'], fleetId: ['number'] }));
|
|
55
49
|
const getFleet = async (req, uuid) => {
|
|
56
50
|
const fleet = await readTransaction((tx) => stateQuery()({ uuid }, undefined, { req, tx }));
|
|
57
51
|
if (fleet == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/fleet-state-get-v3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fleet-state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/fleet-state-get-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,56 +108,53 @@ const releaseExpand = {
|
|
|
108
108
|
},
|
|
109
109
|
},
|
|
110
110
|
};
|
|
111
|
-
const stateQuery = _.once(() => {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
$select: ['label_name', 'value'],
|
|
136
|
-
},
|
|
111
|
+
const stateQuery = _.once(() => api.resin.prepare({
|
|
112
|
+
resource: 'device',
|
|
113
|
+
id: { uuid: { '@': 'uuid' } },
|
|
114
|
+
options: {
|
|
115
|
+
$select: ['device_name', ...getStateEventAdditionalFields],
|
|
116
|
+
$expand: {
|
|
117
|
+
device_config_variable: {
|
|
118
|
+
$select: ['name', 'value'],
|
|
119
|
+
},
|
|
120
|
+
device_environment_variable: {
|
|
121
|
+
$select: ['name', 'value'],
|
|
122
|
+
},
|
|
123
|
+
is_pinned_on__release: releaseExpand,
|
|
124
|
+
service_install: {
|
|
125
|
+
$select: ['id'],
|
|
126
|
+
$expand: {
|
|
127
|
+
service: {
|
|
128
|
+
$select: ['id', 'service_name'],
|
|
129
|
+
$expand: {
|
|
130
|
+
service_environment_variable: {
|
|
131
|
+
$select: ['name', 'value'],
|
|
132
|
+
},
|
|
133
|
+
service_label: {
|
|
134
|
+
$select: ['label_name', 'value'],
|
|
137
135
|
},
|
|
138
136
|
},
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
137
|
+
},
|
|
138
|
+
device_service_environment_variable: {
|
|
139
|
+
$select: ['name', 'value'],
|
|
142
140
|
},
|
|
143
141
|
},
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
should_be_running__release: releaseExpand,
|
|
142
|
+
},
|
|
143
|
+
belongs_to__application: {
|
|
144
|
+
$select: ['id', 'app_name'],
|
|
145
|
+
$expand: {
|
|
146
|
+
application_config_variable: {
|
|
147
|
+
$select: ['name', 'value'],
|
|
148
|
+
},
|
|
149
|
+
application_environment_variable: {
|
|
150
|
+
$select: ['name', 'value'],
|
|
154
151
|
},
|
|
152
|
+
should_be_running__release: releaseExpand,
|
|
155
153
|
},
|
|
156
154
|
},
|
|
157
155
|
},
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
});
|
|
156
|
+
},
|
|
157
|
+
}, { uuid: ['string'] }));
|
|
161
158
|
const getStateV2 = async (req, uuid) => {
|
|
162
159
|
const [deviceId] = req.custom
|
|
163
160
|
.resolvedDeviceIds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-get-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -174,17 +174,14 @@ const deviceExpand = {
|
|
|
174
174
|
},
|
|
175
175
|
},
|
|
176
176
|
};
|
|
177
|
-
const stateQuery = _.once(() => {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
};
|
|
186
|
-
return api.resin.prepare(pineQuery);
|
|
187
|
-
});
|
|
177
|
+
const stateQuery = _.once(() => api.resin.prepare({
|
|
178
|
+
resource: 'device',
|
|
179
|
+
id: { uuid: { '@': 'uuid' } },
|
|
180
|
+
options: {
|
|
181
|
+
$select: ['device_name', ...getStateEventAdditionalFields],
|
|
182
|
+
$expand: deviceExpand,
|
|
183
|
+
},
|
|
184
|
+
}, { uuid: ['string'] }));
|
|
188
185
|
const getStateV3 = async (req, uuid) => {
|
|
189
186
|
const [deviceId] = req.custom
|
|
190
187
|
.resolvedDeviceIds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-get-v3.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,41 +5,39 @@ import { getIP } from '../../../lib/utils.js';
|
|
|
5
5
|
import { shouldUpdateMetrics, metricsPatchFields, v2ValidPatchFields, upsertImageInstall, deleteOldImageInstalls, truncateShortTextFields, limitMetricNumbers, } from '../state-patch-utils.js';
|
|
6
6
|
const { BadRequestError, UnauthorizedError } = errors;
|
|
7
7
|
const { api } = sbvrUtils;
|
|
8
|
-
const appAndReleaseOfDeviceQuery = _.once(() =>
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
},
|
|
8
|
+
const appAndReleaseOfDeviceQuery = _.once(() =>
|
|
9
|
+
// This is a performance optimization impactful when using device API key permissions,
|
|
10
|
+
// in which case emitting the OR checks for the public device access
|
|
11
|
+
// in a nested subquery didn't perform as well.
|
|
12
|
+
// TODO: Should be converted back to a simple GET to the release resource once
|
|
13
|
+
// the performance of that query improves.
|
|
14
|
+
api.resin.prepare({
|
|
15
|
+
resource: 'application',
|
|
16
|
+
options: {
|
|
17
|
+
$top: 1,
|
|
18
|
+
$select: 'id',
|
|
19
|
+
$expand: {
|
|
20
|
+
owns__release: {
|
|
21
|
+
$top: 1,
|
|
22
|
+
$select: 'id',
|
|
23
|
+
$filter: {
|
|
24
|
+
commit: { '@': 'commit' },
|
|
25
|
+
status: 'success',
|
|
27
26
|
},
|
|
28
27
|
},
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
},
|
|
28
|
+
},
|
|
29
|
+
$filter: {
|
|
30
|
+
owns__device: {
|
|
31
|
+
$any: {
|
|
32
|
+
$alias: 'd',
|
|
33
|
+
$expr: {
|
|
34
|
+
d: { id: { '@': 'deviceId' } },
|
|
36
35
|
},
|
|
37
36
|
},
|
|
38
37
|
},
|
|
39
38
|
},
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
});
|
|
39
|
+
},
|
|
40
|
+
}, { deviceId: ['number'], commit: ['string'] }));
|
|
43
41
|
const resolveReleaseId = async (...args) => {
|
|
44
42
|
const [app] = await appAndReleaseOfDeviceQuery()(...args);
|
|
45
43
|
return app?.owns__release[0]?.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-patch-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-patch-v2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state-patch-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-patch-v2.ts"],"names":[],"mappings":"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"}
|
package/dist/infra/auth/auth.js
CHANGED
|
@@ -96,24 +96,22 @@ export const reqHasPermission = (req, permission) => userHasPermission(req.apiKe
|
|
|
96
96
|
// If adding/removing fields, please also update `User`
|
|
97
97
|
// in "typings/common.d.ts".
|
|
98
98
|
export const userFields = ['id', 'actor', 'jwt_secret'];
|
|
99
|
-
const getUserQuery = _.once(() => {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
$
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
$
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
k: { key: { '@': 'key' } },
|
|
116
|
-
},
|
|
99
|
+
const getUserQuery = _.once(() => api.resin.prepare({
|
|
100
|
+
resource: 'user',
|
|
101
|
+
passthrough: { req: permissions.root },
|
|
102
|
+
options: {
|
|
103
|
+
$select: userFields,
|
|
104
|
+
$filter: {
|
|
105
|
+
actor: {
|
|
106
|
+
$any: {
|
|
107
|
+
$alias: 'a',
|
|
108
|
+
$expr: {
|
|
109
|
+
a: {
|
|
110
|
+
api_key: {
|
|
111
|
+
$any: {
|
|
112
|
+
$alias: 'k',
|
|
113
|
+
$expr: {
|
|
114
|
+
k: { key: { '@': 'key' } },
|
|
117
115
|
},
|
|
118
116
|
},
|
|
119
117
|
},
|
|
@@ -121,11 +119,10 @@ const getUserQuery = _.once(() => {
|
|
|
121
119
|
},
|
|
122
120
|
},
|
|
123
121
|
},
|
|
124
|
-
$top: 1,
|
|
125
122
|
},
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
});
|
|
123
|
+
$top: 1,
|
|
124
|
+
},
|
|
125
|
+
}, { key: ['string'] }));
|
|
129
126
|
export async function getUser(req,
|
|
130
127
|
/** You should always be passing a Tx, unless you are using this in a middleware. */
|
|
131
128
|
txParam, required = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/infra/auth/auth.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/infra/auth/auth.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": "26.4.
|
|
4
|
+
"version": "26.4.6",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@balena/node-metrics-gatherer": "^6.0.3",
|
|
52
52
|
"@balena/pinejs": "^18.2.1",
|
|
53
53
|
"@balena/pinejs-webresource-cloudfront": "^0.2.0",
|
|
54
|
-
"@sentry/node": "^8.
|
|
54
|
+
"@sentry/node": "^8.27.0",
|
|
55
55
|
"@types/basic-auth": "^1.1.8",
|
|
56
56
|
"@types/bluebird": "^3.5.42",
|
|
57
57
|
"@types/cache-manager": "^4.0.6",
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"@types/memoizee": "^0.4.11",
|
|
70
70
|
"@types/morgan": "^1.9.9",
|
|
71
71
|
"@types/ndjson": "^2.0.4",
|
|
72
|
-
"@types/node": "^20.
|
|
72
|
+
"@types/node": "^20.16.3",
|
|
73
73
|
"@types/node-schedule": "^2.1.7",
|
|
74
74
|
"@types/on-finished": "^2.3.4",
|
|
75
75
|
"@types/passport-jwt": "^4.0.1",
|
|
@@ -80,9 +80,9 @@
|
|
|
80
80
|
"@types/semver": "^7.5.8",
|
|
81
81
|
"@types/statuses": "^2.0.5",
|
|
82
82
|
"@types/uuid": "^10.0.0",
|
|
83
|
-
"@types/validator": "^13.12.
|
|
83
|
+
"@types/validator": "^13.12.1",
|
|
84
84
|
"avsc": "^5.7.7",
|
|
85
|
-
"aws-sdk": "^2.
|
|
85
|
+
"aws-sdk": "^2.1687.0",
|
|
86
86
|
"balena-device-config": "^6.3.0",
|
|
87
87
|
"balena-semver": "^2.3.5",
|
|
88
88
|
"basic-auth": "^2.0.1",
|
|
@@ -113,11 +113,11 @@
|
|
|
113
113
|
"on-finished": "^2.4.1",
|
|
114
114
|
"passport": "^0.7.0",
|
|
115
115
|
"passport-jwt": "^4.0.1",
|
|
116
|
-
"pinejs-client-core": "^7.
|
|
116
|
+
"pinejs-client-core": "^7.1.0",
|
|
117
117
|
"proxy-addr": "^2.0.7",
|
|
118
118
|
"randomstring": "^1.3.0",
|
|
119
119
|
"rate-limiter-flexible": "^5.0.3",
|
|
120
|
-
"redis": "^4.
|
|
120
|
+
"redis": "^4.7.0",
|
|
121
121
|
"redlock": "^4.2.0",
|
|
122
122
|
"request": "^2.88.2",
|
|
123
123
|
"rsmq": "^0.12.4",
|
|
@@ -126,17 +126,17 @@
|
|
|
126
126
|
"statuses": "^2.0.1",
|
|
127
127
|
"strict-event-emitter-types": "^2.0.0",
|
|
128
128
|
"supervisor": "^0.12.0",
|
|
129
|
-
"tar": "^7.4.
|
|
129
|
+
"tar": "^7.4.3",
|
|
130
130
|
"thirty-two": "^1.0.2",
|
|
131
131
|
"ts-node": "^10.9.2",
|
|
132
132
|
"typed-error": "^3.2.2",
|
|
133
|
-
"typescript": "^5.5.
|
|
133
|
+
"typescript": "^5.5.4",
|
|
134
134
|
"uuid": "^10.0.0",
|
|
135
135
|
"validator": "^13.12.0"
|
|
136
136
|
},
|
|
137
137
|
"devDependencies": {
|
|
138
138
|
"@balena/lint": "^8.2.7",
|
|
139
|
-
"@types/chai": "^4.3.
|
|
139
|
+
"@types/chai": "^4.3.19",
|
|
140
140
|
"@types/mocha": "^10.0.7",
|
|
141
141
|
"@types/mockery": "^1.4.33",
|
|
142
142
|
"@types/sinon": "^17.0.3",
|
|
@@ -144,12 +144,12 @@
|
|
|
144
144
|
"@types/temp": "^0.9.4",
|
|
145
145
|
"chai": "^5.1.1",
|
|
146
146
|
"copyfiles": "^2.4.1",
|
|
147
|
-
"husky": "^9.1.
|
|
148
|
-
"lint-staged": "^15.2.
|
|
149
|
-
"mocha": "^10.
|
|
147
|
+
"husky": "^9.1.5",
|
|
148
|
+
"lint-staged": "^15.2.10",
|
|
149
|
+
"mocha": "^10.7.3",
|
|
150
150
|
"mockery": "^2.1.0",
|
|
151
|
-
"nock": "^13.5.
|
|
152
|
-
"pinejs-client-supertest": "^2.1.
|
|
151
|
+
"nock": "^13.5.5",
|
|
152
|
+
"pinejs-client-supertest": "^2.1.2",
|
|
153
153
|
"rimraf": "^6.0.1",
|
|
154
154
|
"sinon": "^18.0.0",
|
|
155
155
|
"supertest": "^7.0.0"
|
|
@@ -168,6 +168,6 @@
|
|
|
168
168
|
"loader": "ts-node/esm/transpile-only"
|
|
169
169
|
},
|
|
170
170
|
"versionist": {
|
|
171
|
-
"publishedAt": "2024-09-
|
|
171
|
+
"publishedAt": "2024-09-03T10:14:11.397Z"
|
|
172
172
|
}
|
|
173
173
|
}
|