fix: default tenantId is now blank

get device should return on authenticated matching tenant
open-amt-cloud-toolkit · Jun 21, 2023 · 61a7a5d · 61a7a5d
1 parent 1682d47
commit 61a7a5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/middleware/custom/example.ts b/src/middleware/custom/example.ts
@@ -15,7 +15,8 @@ exports = module.exports = function (req, res, next) {
   // req.db.customProperty = req.headers['x-db-info']
 
   // For setting the tenantId use req.tenantId
-  // req.tenantId = req.headers['x-tenant-id-token']
+  // req.tenantId = req.headers['x-tenant-id-token'] // pull tenant id from header
+  req.tenantId = '' // default blank tenant
   // Be sure to reject requests that do not have access to the tenant
   //   if (req.tenantId === <resource's>.tenantId) {
   //     next()

diff --git a/src/routes/devices/get.ts b/src/routes/devices/get.ts
@@ -10,7 +10,7 @@ export async function getDevice (req: Request, res: Response): Promise<void> {
   try {
     let tenantId = req.tenantId
     const tentantIdInQuery = req.query?.tenantId
-    if ((tenantId == null || tenantId === '') && (tentantIdInQuery != null || tentantIdInQuery !== '')) {
+    if ((tenantId == null || tenantId === '') && (tentantIdInQuery != null && tentantIdInQuery !== '')) {
       tenantId = tentantIdInQuery as string
     }
     const result = await req.db.devices.getById(req.params.guid)