fix(headers): don't send content-location on 4xx

awlayton · awlayton · commit 9e43d50be52b · 2022-10-07T11:07:15.000-04:00
diff --git a/oada/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/oada/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/oada/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/oada/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/oada/.yarn/releases/yarn-3.2.3.cjs b/oada/.yarn/releases/yarn-3.2.3.cjs
diff --git a/oada/.yarn/releases/yarn-3.2.4.cjs b/oada/.yarn/releases/yarn-3.2.4.cjs
diff --git a/oada/.yarnrc.yml b/oada/.yarnrc.yml
@@ -52,4 +52,4 @@ plugins:
   - path: .yarn/plugins/@ojkelly/plugin-build.cjs
     spec: "https://yarn.build/latest/build"
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-3.2.4.cjs
diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json
@@ -69,7 +69,7 @@
     "@types/deep-equal": "^1.0.1",
     "@types/flat": "^5.0.2",
     "@types/json-pointer": "^1.0.31",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "ava": "4.3.3",
     "type-fest": "^3.0.0"
   },
diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json
@@ -44,7 +44,7 @@
     "@ava/typescript": "^3.0.1",
     "@types/convict": "^6.1.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/uuid": "^8.3.4",
     "ava": "4.3.3"
   },
diff --git a/oada/libs/lib-prom/package.json b/oada/libs/lib-prom/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@ava/typescript": "^3.0.1",
     "@types/convict": "^6.1.1",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/ws": "^8.5.3",
     "ava": "4.3.3",
     "fastify-plugin": "^4.2.1"
diff --git a/oada/libs/pino-debug/package.json b/oada/libs/pino-debug/package.json
@@ -23,12 +23,12 @@
     "pino": "^8.6.1",
     "pino-caller": "^3.2.0",
     "pino-debug": "^2.0.0",
-    "pino-pretty": "^9.1.0",
+    "pino-pretty": "^9.1.1",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2"
+    "@types/node": "^18.8.3"
   },
   "peerDependencies": {
     "debug": "*"
diff --git a/oada/package.json b/oada/package.json
@@ -18,7 +18,7 @@
     "@tsconfig/node18": "^1.0.1",
     "@types/eslint": "^8.4.6",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
     "@typescript-eslint/parser": "^5.39.0",
     "@yarnpkg/sdks": "^3.0.0-rc.22",
@@ -46,12 +46,12 @@
     "eslint-plugin-regexp": "^1.9.0",
     "eslint-plugin-security": "^1.5.0",
     "eslint-plugin-sonarjs": "^0.15.0",
-    "eslint-plugin-unicorn": "^44.0.1",
+    "eslint-plugin-unicorn": "^44.0.2",
     "prettier": "^2.7.1",
     "typescript": "4.8.2"
   },
   "dependencies": {
-    "pino-pretty": "^9.1.0"
+    "pino-pretty": "^9.1.1"
   },
   "resolutions": {
     "fastify-plugin": "4.0.0"
@@ -62,5 +62,5 @@
   "volta": {
     "node": "18.5.0"
   },
-  "packageManager": "yarn@3.2.3"
+  "packageManager": "yarn@3.2.4"
 }
diff --git a/oada/services/auth/package.json b/oada/services/auth/package.json
@@ -52,7 +52,7 @@
     "@oada/well-known-json": "^4.0.0",
     "arangojs": "^7.8.0",
     "bcryptjs": "^2.4.3",
-    "body-parser": "^1.20.0",
+    "body-parser": "^1.20.1",
     "chalk": "^5.1.0",
     "clone-deep": "^4.0.1",
     "connect-arango": "^0.2.0",
diff --git a/oada/services/http-handler/package.json b/oada/services/http-handler/package.json
@@ -38,7 +38,7 @@
     "@fastify/helmet": "^10.0.1",
     "@fastify/request-context": "^4.0.0",
     "@fastify/sensible": "^5.1.1",
-    "@fastify/websocket": "^7.0.1",
+    "@fastify/websocket": "^7.1.0",
     "@oada/error": "^2.0.1",
     "@oada/formats-server": "^3.3.0",
     "@oada/lib-arangodb": "^3.5.1",
@@ -67,12 +67,12 @@
     "@oada/write-handler": "^3.5.1",
     "@types/cacache": "^15.0.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/type-is": "^1.6.3",
     "@types/uuid": "^8.3.4",
     "@types/ws": "^8.5.3",
     "connect": "^3.7.0",
-    "find-my-way": "^7.2.1",
+    "find-my-way": "^7.3.0",
     "light-my-request": "^5.6.1"
   },
   "volta": {
diff --git a/oada/services/http-handler/src/resources.ts b/oada/services/http-handler/src/resources.ts
@@ -161,7 +161,7 @@ const plugin: FastifyPluginAsync<Options> = async (fastify, options) => {
   /**
    * Perform the OADA "graph lookup"
    */
-  fastify.addHook('preHandler', async (request, reply) => {
+  fastify.addHook('preHandler', async (request) => {
     /**
      * The whole path from the request (e.g., /resources/123/link/abc)
      */
@@ -179,9 +179,6 @@ const plugin: FastifyPluginAsync<Options> = async (fastify, options) => {
       request.log.info('Graph lookup: %s => %s', fullpath, url);
       // Remove `/resources`? IDK
       request.oadaPath = url;
-      void reply.header('Content-Location', `/${url}`);
-    } else {
-      void reply.header('Content-Location', `/${fullpath}`);
     }
 
     request.oadaGraph = result;
@@ -259,11 +256,12 @@ const plugin: FastifyPluginAsync<Options> = async (fastify, options) => {
   });
 
   /**
-   * Return "path leftover" in a header if token/scope passes
+   * Return certain headers if token/scope passes
    */
-  fastify.addHook('preHandler', async ({ oadaGraph }, reply) => {
+  fastify.addHook('preHandler', async ({ oadaGraph, oadaPath }, reply) => {
     // ? Better header name?
     void reply.header('X-OADA-Path-Leftover', oadaGraph.path_leftover);
+    void reply.header('Content-Location', `/${oadaPath}`);
   });
 
   fastify.route({
@@ -401,6 +399,7 @@ const plugin: FastifyPluginAsync<Options> = async (fastify, options) => {
         );
 
         // Stream file to client
+        // deepcode ignore ContentLengthInCode: this is server-side
         void reply.header('Content-Length', size);
         return cacache.get.stream.byDigest(CACHE_PATH, integrity);
       }
diff --git a/oada/services/permissions-handler/package.json b/oada/services/permissions-handler/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/type-is": "^1.6.3"
   },
   "volta": {
diff --git a/oada/services/rev-graph-update/package.json b/oada/services/rev-graph-update/package.json
@@ -47,7 +47,7 @@
     "@oada/client": "^4.3.2",
     "@oada/write-handler": "^3.5.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/randomstring": "^1.1.8",
     "ava": "4.3.3",
     "type-fest": "^3.0.0"
diff --git a/oada/services/startup/package.json b/oada/services/startup/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2"
+    "@types/node": "^18.8.3"
   },
   "volta": {
     "node": "18.5.0"
diff --git a/oada/services/sync-handler/package.json b/oada/services/sync-handler/package.json
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@oada/write-handler": "^3.5.1",
     "@types/debug": "^4.1.7",
-    "@types/node": "^18.8.2"
+    "@types/node": "^18.8.3"
   },
   "volta": {
     "node": "18.5.0"
diff --git a/oada/services/write-handler/package.json b/oada/services/write-handler/package.json
@@ -56,7 +56,7 @@
     "@oada/types": "^3.3.0",
     "@types/debug": "^4.1.7",
     "@types/json-pointer": "^1.0.31",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.8.3",
     "@types/object-assign-deep": "^0.4.0",
     "ava": "4.3.3"
   },
diff --git a/oada/yarn.lock b/oada/yarn.lock
