Merge branch 'main' into dependabot/npm_and_yarn/mongodb-7.0.0

Author: madhavilosetty-intel

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.22.5](https://github.com/device-management-toolkit/mps/compare/v2.22.4...v2.22.5) (2025-11-07)
+
+
+### Bug Fixes
+
+* loosens UUID check for API ([#2194](https://github.com/device-management-toolkit/mps/issues/2194)) ([f741380](https://github.com/device-management-toolkit/mps/commit/f741380937cfc8f69a26d2ca4ef13fccbafcff2e))
+
 ## [2.22.4](https://github.com/device-management-toolkit/mps/compare/v2.22.3...v2.22.4) (2025-11-06)
 
 ## [2.22.3](https://github.com/device-management-toolkit/mps/compare/v2.22.2...v2.22.3) (2025-10-14)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-amt-cloud-toolkit/mps",
-  "version": "2.22.4",
+  "version": "2.22.5",
   "description": "Containerized MPS service for executing Intel® AMT features",
   "homepage": "https://github.com/device-management-toolkit/mps",
   "contributors": [
@@ -46,7 +46,7 @@
     "exponential-backoff": "^3.1.3",
     "express": "^4.21.2",
     "express-validator": "^7.3.0",
-    "got": "^14.6.2",
+    "got": "^14.6.3",
     "http-z": "^7.0.0",
     "jws": "^4.0.0",
     "mongodb": "^7.0.0",
@@ -80,7 +80,7 @@
     "ts-jest": "^29.4.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "typescript-eslint": "8.46.3"
+    "typescript-eslint": "8.46.4"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.3"

package.json

@@ -55,8 +55,23 @@ export class MongoDeviceTable implements IDeviceTable {
   }
 
   async update(item: Device): Promise<WithId<Device>> {
+    if (!(item as any)._id) {
+      throw new Error('Device must have an _id for update operation')
+    }
+
+    const itemId = (item as any)._id
+    let objectId: ObjectId
+
+    if (ObjectId.isValid(itemId)) {
+      objectId = new ObjectId(itemId)
+    } else if (typeof itemId === 'number') {
+      objectId = new ObjectId(itemId.toString().padStart(24, '0'))
+    } else {
+      throw new Error(`Invalid _id format: ${itemId}`)
+    }
+
     const result = await this.collection.findOneAndUpdate(
-      { _id: new ObjectId((item as any)._id as number), tenantId: item.tenantId },
+      { _id: objectId, tenantId: item.tenantId },
       { $set: item },
       { returnDocument: 'after', includeResultMetadata: false }
     )

src/data/mongo/collections/device.ts

@@ -13,6 +13,6 @@ import { authorizeDevice } from './authorizeDevice.js'
 const authRouter: Router = Router()
 
 authRouter.post('/', authValidator(), login)
-authRouter.get('/redirection/:guid', param('guid').isUUID(), validateMiddleware, authorizeDevice)
+authRouter.get('/redirection/:guid', param('guid').isUUID('loose'), validateMiddleware, authorizeDevice)
 
 export default authRouter

src/routes/auth/index.ts

@@ -6,7 +6,7 @@
 import { check, query } from 'express-validator'
 
 export const validator = (): any => [
-  check('guid').isUUID().isString(),
+  check('guid').isUUID('loose').isString(),
   check('friendlyName').optional({ nullable: true }).isString(),
   check('hostname')
     .optional({ nullable: true })