firebase-admin 13.5.0 → 13.6.1

package/lib/remote-config/remote-config-api-client-internal.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config-api-client-internal.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config-api.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config-api.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config-namespace.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config-namespace.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/remote-config/remote-config.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/index.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/index.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-api-client-internal.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-api-client-internal.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-internal.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-internal.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-namespace.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules-namespace.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/security-rules/security-rules.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/index.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/index.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/storage-namespace.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/storage-namespace.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/storage.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/storage.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/storage/utils.d.ts

@@ -1,4 +1,4 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 import { File } from '@google-cloud/storage';
 export interface FirebaseMetadata {
     name: string;

package/lib/storage/utils.js

@@ -1,4 +1,4 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseMetadata = getFirebaseMetadata;

package/lib/utils/api-request.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/api-request.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -806,7 +806,9 @@ class AuthorizedHttpClient extends HttpClient {
             if (!requestCopy.httpAgent && this.app.options.httpAgent) {
                 requestCopy.httpAgent = this.app.options.httpAgent;
             }
-            requestCopy.headers['X-Goog-Api-Client'] = (0, index_1.getMetricsHeader)();
+            if (!requestCopy.headers['X-Goog-Api-Client']) {
+                requestCopy.headers['X-Goog-Api-Client'] = (0, index_1.getMetricsHeader)();
+            }
             return super.send(requestCopy);
         });
     }
@@ -835,7 +837,9 @@ class AuthorizedHttp2Client extends Http2Client {
             if (!requestCopy.headers['x-goog-user-project'] && validator.isNonEmptyString(quotaProjectId)) {
                 requestCopy.headers['x-goog-user-project'] = quotaProjectId;
             }
-            requestCopy.headers['X-Goog-Api-Client'] = (0, index_1.getMetricsHeader)();
+            if (!requestCopy.headers['X-Goog-Api-Client']) {
+                requestCopy.headers['X-Goog-Api-Client'] = (0, index_1.getMetricsHeader)();
+            }
             return super.send(requestCopy);
         });
     }

package/lib/utils/crypto-signer.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/crypto-signer.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/deep-copy.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/deep-copy.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/error.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/error.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/index.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/index.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/jwt.d.ts

@@ -1,6 +1,6 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/jwt.js

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
- * Copyright 2021 Google Inc.
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/validator.d.ts

@@ -1,7 +1,7 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/utils/validator.js

@@ -1,8 +1,8 @@
-/*! firebase-admin v13.5.0 */
+/*! firebase-admin v13.6.1 */
 "use strict";
 /*!
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ exports.isUTCDateString = isUTCDateString;
 exports.isURL = isURL;
 exports.isTopic = isTopic;
 exports.isTaskId = isTaskId;
-const url = require("url");
 /**
  * Validates that a value is a byte buffer.
  *
@@ -227,34 +226,39 @@ function isURL(urlStr) {
         return false;
     }
     try {
-        const uri = url.parse(urlStr);
+        const uri = new URL(urlStr);
         const scheme = uri.protocol;
-        const slashes = uri.slashes;
-        const hostname = uri.hostname;
-        const pathname = uri.pathname;
-        if ((scheme !== 'http:' && scheme !== 'https:') || !slashes) {
+        if (scheme !== 'http:' && scheme !== 'https:') {
             return false;
         }
-        // Validate hostname: Can contain letters, numbers, underscore and dashes separated by a dot.
-        // Each zone must not start with a hyphen or underscore.
-        if (!hostname || !/^[a-zA-Z0-9]+[\w-]*([.]?[a-zA-Z0-9]+[\w-]*)*$/.test(hostname)) {
-            return false;
+        const hostname = uri.hostname;
+        // Validate hostname strictly to match previous behavior and prevent weak/invalid domains.
+        // Must be alphanumeric with optional dashes/underscores, separated by dots.
+        // Cannot start/end with dot or dash (mostly).
+        // This regex is safe (no nested quantifiers with overlap).
+        if (!/^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*$/.test(hostname)) {
+            // Check for IPv6 literals which are valid but behave differently.
+            // Node 'new URL' keeps brackets for IPv6: [::1] -> [::1]
+            // Check for IPv6 address (simple check for brackets)
+            if (!/^\[[a-fA-F0-9:.]+\]$/.test(hostname)) {
+                return false;
+            }
         }
-        // Allow for pathnames: (/chars+)*/?
+        // Restore strict pathname validation: (/chars+)*/?
         // Where chars can be a combination of: a-z A-Z 0-9 - _ . ~ ! $ & ' ( ) * + , ; = : @ %
         const pathnameRe = /^(\/[\w\-.~!$'()*+,;=:@%]+)*\/?$/;
         // Validate pathname.
+        const pathname = uri.pathname;
         if (pathname &&
             pathname !== '/' &&
             !pathnameRe.test(pathname)) {
             return false;
         }
-        // Allow any query string and hash as long as no invalid character is used.
+        return true;
     }
     catch (e) {
         return false;
     }
-    return true;
 }
 /**
  * Validates that the provided topic is a valid FCM topic name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-admin",
-  "version": "13.5.0",
+  "version": "13.6.1",
   "description": "Firebase admin SDK for Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -19,7 +19,9 @@
     "test:integration": "mocha test/integration/*.ts --slow 5000 --timeout 20000 --require ts-node/register",
     "test:coverage": "nyc npm run test:unit",
     "lint:src": "eslint src/ --ext .ts",
+    "lint:src:fix": "eslint src/ --ext .ts --fix",
     "lint:test": "eslint test/ --ext .ts",
+    "lint:test:fix": "eslint test/ --ext .ts --fix",
     "apidocs": "run-s api-extractor:local api-documenter",
     "api-extractor": "node generate-reports.js",
     "api-extractor:local": "npm run build && node generate-reports.js --local",
@@ -221,12 +223,12 @@
     "@google-cloud/storage": "^7.14.0"
   },
   "devDependencies": {
-    "@firebase/api-documenter": "^0.4.0",
+    "@firebase/api-documenter": "^0.5.0",
     "@firebase/app-compat": "^0.2.1",
     "@firebase/auth-compat": "^0.6.0",
     "@firebase/auth-types": "^0.13.0",
     "@microsoft/api-extractor": "^7.11.2",
-    "@types/bcrypt": "^5.0.0",
+    "@types/bcrypt": "^6.0.0",
     "@types/chai": "^4.0.0",
     "@types/chai-as-promised": "^7.1.0",
     "@types/firebase-token-generator": "^2.0.28",
@@ -242,7 +244,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.16.1",
     "@typescript-eslint/parser": "^7.16.1",
-    "bcrypt": "^5.0.0",
+    "bcrypt": "^6.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.0.0",
     "chai-exclude": "^2.1.0",