ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-25 19:21:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2175 from balena-os/download-progress

Browse Source 
Fix /v2/applications/state endpoint
This commit is contained in:
flowzone-app[bot] 2023-06-19 21:53:58 +00:00 committed by GitHub
commit 934ff67ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/device-api/v2.ts
View File

@ -156,8 +156,8 @@ router.post(
router.get(
'/v2/applications/state',
async (req: AuthorizedRequest, res: Response, next: NextFunction) => {
// It's kinda hacky to access the services and db via the application manager
// maybe refactor this code
// It's very hacky to access the services and db via the application manager
// refactor this code to use applicationManager.getState() instead.
Bluebird.join(
serviceManager.getState(),
images.getState(),
@ -183,6 +183,7 @@ router.get(
} = {};
const appNameById: { [id: number]: string } = {};
const commits: string[] = [];
// only access scoped apps
apps
@ -198,11 +199,17 @@ router.get(
};
appNameById[appId] = app.name;
commits.push(app.commit);
});
// only access scoped images
imgs
.filter((img) => req.auth.isScoped({ apps: [img.appId] }))
.filter(
(img) =>
req.auth.isScoped({ apps: [img.appId] }) &&
// Ensure we are using the apps for the target release
commits.includes(img.commit),
)
.forEach((img) => {
const appName = appNameById[img.appId];
if (appName == null) {
@ -214,8 +221,10 @@ router.get(
return;
}
const svc = _.find(services, (service: Service) => {
return service.imageId === img.imageId;
const svc = _.find(services, (s: Service) => {
return (
s.serviceName === img.serviceName && s.commit === img.commit
);
});
let status: string | undefined;