Merge branch 'master' into auth-emulator-modify-secuirity

Author: ssbushi

.github/workflows/node-test.yml

@@ -55,24 +55,6 @@ jobs:
       - run: npm ci
       - run: npm test
 
-      - name: Coveralls (in parallel)
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.github_token }}
-          flag-name: run-${{ matrix.node-version }}
-          path-to-lcov: "./.coverage/lcov.info"
-          parallel: true
-
-  finish-coverage:
-    needs: unit
-    runs-on: ubuntu-latest
-    steps:
-      - name: Coveralls finalization
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.github_token }}
-          parallel-finished: true
-
   integration:
     needs: unit
     if: github.event_name == 'push'

CHANGELOG.md

@@ -3,3 +3,4 @@
 - Fixes issue where emulated HTTP functions would crash when the URL contained query parameters (#3032)
 - Fixes issue with routing to emulated HTTP functions in regions outside of `us-central1` (#3031)
 - Fixes issue where authorized domains were not being correctly updated when deploying to Hosting channels. (#3002)
+- Fixes issue where the User-Agent was being overridden when proxying through the Hosting emulator. (#2970)

package-lock.json

@@ -178,7 +178,6 @@
     "@typescript-eslint/parser": "^4.12.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "coveralls": "^3.1.0",
     "eslint": "^7.17.0",
     "eslint-config-google": "^0.14.0",
     "eslint-config-prettier": "^7.1.0",

package.json

@@ -229,7 +229,9 @@ export class Client {
       reqOptions.headers = new Headers();
     }
     reqOptions.headers.set("Connection", "keep-alive");
-    reqOptions.headers.set("User-Agent", `FirebaseCLI/${CLI_VERSION}`);
+    if (!reqOptions.headers.has("User-Agent")) {
+      reqOptions.headers.set("User-Agent", `FirebaseCLI/${CLI_VERSION}`);
+    }
     reqOptions.headers.set("X-Client-Version", `FirebaseCLI/${CLI_VERSION}`);
     if (reqOptions.responseType === "json") {
       reqOptions.headers.set("Content-Type", "application/json");

src/apiv2.ts

@@ -34,6 +34,9 @@ export function initMiddleware(init: TemplateServerResponse): RequestHandler {
           if (sdkRes.status === 404) {
             return next();
           }
+          for (const [key, value] of Object.entries(sdkRes.response.headers.raw())) {
+            res.setHeader(key, value);
+          }
           sdkRes.body.pipe(res);
         })
         .catch((e) => {

src/hosting/initMiddleware.ts

@@ -223,6 +223,22 @@ describe("apiv2", () => {
       expect(nock.isDone()).to.be.true;
     });
 
+    it("should make a basic GET request and not override the user-agent", async () => {
+      nock("https://example.com")
+        .get("/path/to/foo")
+        .matchHeader("user-agent", "unit tests, silly")
+        .reply(200, { success: true });
+
+      const c = new Client({ urlPrefix: "https://example.com" });
+      const r = await c.request({
+        method: "GET",
+        path: "/path/to/foo",
+        headers: { "user-agent": "unit tests, silly" },
+      });
+      expect(r.body).to.deep.equal({ success: true });
+      expect(nock.isDone()).to.be.true;
+    });
+
     it("should handle a 204 response with no data", async () => {
       nock("https://example.com").get("/path/to/foo").reply(204);