firebase-tools 11.0.0 → 11.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (223) hide show
  1. package/lib/accountExporter.js +11 -4
  2. package/lib/accountImporter.js +93 -95
  3. package/lib/api.js +77 -218
  4. package/lib/apiv2.js +5 -4
  5. package/lib/appdistribution/client.js +23 -34
  6. package/lib/auth.js +72 -52
  7. package/lib/bin/firebase.js +42 -47
  8. package/lib/checkValidTargetFilters.js +36 -25
  9. package/lib/commands/appdistribution-distribute.js +2 -1
  10. package/lib/commands/appdistribution-testers-add.js +2 -1
  11. package/lib/commands/appdistribution-testers-remove.js +2 -1
  12. package/lib/commands/apps-android-sha-create.js +2 -1
  13. package/lib/commands/apps-android-sha-delete.js +2 -1
  14. package/lib/commands/apps-android-sha-list.js +2 -1
  15. package/lib/commands/apps-create.js +2 -1
  16. package/lib/commands/apps-list.js +2 -1
  17. package/lib/commands/apps-sdkconfig.js +2 -1
  18. package/lib/commands/auth-export.js +2 -1
  19. package/lib/commands/auth-import.js +7 -10
  20. package/lib/commands/crashlytics-symbols-upload.js +2 -1
  21. package/lib/commands/database-get.js +4 -3
  22. package/lib/commands/database-instances-create.js +2 -1
  23. package/lib/commands/database-instances-list.js +3 -3
  24. package/lib/commands/database-profile.js +4 -4
  25. package/lib/commands/database-push.js +4 -4
  26. package/lib/commands/database-remove.js +3 -3
  27. package/lib/commands/database-rules-canary.js +2 -1
  28. package/lib/commands/database-rules-get.js +2 -1
  29. package/lib/commands/database-rules-list.js +2 -1
  30. package/lib/commands/database-rules-release.js +2 -1
  31. package/lib/commands/database-rules-stage.js +2 -1
  32. package/lib/commands/database-set.js +3 -3
  33. package/lib/commands/database-settings-get.js +2 -1
  34. package/lib/commands/database-settings-set.js +2 -1
  35. package/lib/commands/database-update.js +2 -1
  36. package/lib/commands/deploy.js +26 -25
  37. package/lib/commands/emulators-exec.js +2 -1
  38. package/lib/commands/emulators-export.js +2 -1
  39. package/lib/commands/emulators-start.js +2 -1
  40. package/lib/commands/experimental-functions-shell.js +10 -8
  41. package/lib/commands/ext-configure.js +6 -1
  42. package/lib/commands/ext-dev-deprecate.js +2 -1
  43. package/lib/commands/ext-dev-emulators-exec.js +3 -2
  44. package/lib/commands/ext-dev-emulators-start.js +3 -2
  45. package/lib/commands/ext-dev-extension-delete.js +2 -1
  46. package/lib/commands/ext-dev-init.js +2 -1
  47. package/lib/commands/ext-dev-list.js +8 -8
  48. package/lib/commands/ext-dev-publish.js +2 -1
  49. package/lib/commands/ext-dev-register.js +2 -1
  50. package/lib/commands/ext-dev-undeprecate.js +2 -1
  51. package/lib/commands/ext-dev-unpublish.js +2 -1
  52. package/lib/commands/ext-dev-usage.js +2 -1
  53. package/lib/commands/ext-export.js +2 -1
  54. package/lib/commands/ext-info.js +14 -14
  55. package/lib/commands/ext-install.js +6 -1
  56. package/lib/commands/ext-list.js +2 -1
  57. package/lib/commands/ext-sources-create.js +2 -1
  58. package/lib/commands/ext-uninstall.js +7 -1
  59. package/lib/commands/ext-update.js +6 -1
  60. package/lib/commands/ext.js +4 -4
  61. package/lib/commands/firestore-delete.js +2 -1
  62. package/lib/commands/firestore-indexes-list.js +2 -1
  63. package/lib/commands/functions-config-clone.js +4 -3
  64. package/lib/commands/functions-config-export.js +2 -1
  65. package/lib/commands/functions-config-get.js +2 -1
  66. package/lib/commands/functions-config-set.js +2 -1
  67. package/lib/commands/functions-config-unset.js +2 -1
  68. package/lib/commands/functions-delete.js +3 -8
  69. package/lib/commands/functions-deletegcfartifacts.js +2 -1
  70. package/lib/commands/functions-list.js +2 -1
  71. package/lib/commands/functions-log.js +2 -1
  72. package/lib/commands/functions-secrets-access.js +2 -1
  73. package/lib/commands/functions-secrets-destroy.js +2 -1
  74. package/lib/commands/functions-secrets-get.js +2 -1
  75. package/lib/commands/functions-secrets-prune.js +2 -1
  76. package/lib/commands/functions-secrets-set.js +2 -1
  77. package/lib/commands/functions-shell.js +12 -10
  78. package/lib/commands/help.js +2 -1
  79. package/lib/commands/hosting-channel-create.js +2 -1
  80. package/lib/commands/hosting-channel-delete.js +2 -1
  81. package/lib/commands/hosting-channel-deploy.js +2 -1
  82. package/lib/commands/hosting-channel-list.js +2 -1
  83. package/lib/commands/hosting-channel-open.js +2 -1
  84. package/lib/commands/hosting-clone.js +2 -1
  85. package/lib/commands/hosting-disable.js +2 -1
  86. package/lib/commands/hosting-sites-create.js +2 -1
  87. package/lib/commands/hosting-sites-delete.js +2 -1
  88. package/lib/commands/hosting-sites-get.js +2 -1
  89. package/lib/commands/hosting-sites-list.js +2 -1
  90. package/lib/commands/index.js +23 -13
  91. package/lib/commands/init.js +47 -43
  92. package/lib/commands/login-add.js +2 -1
  93. package/lib/commands/login-ci.js +2 -1
  94. package/lib/commands/login-list.js +2 -1
  95. package/lib/commands/login-use.js +2 -1
  96. package/lib/commands/login.js +2 -1
  97. package/lib/commands/logout.js +2 -1
  98. package/lib/commands/open.js +7 -7
  99. package/lib/commands/projects-addfirebase.js +2 -1
  100. package/lib/commands/projects-create.js +2 -1
  101. package/lib/commands/projects-list.js +2 -1
  102. package/lib/commands/remoteconfig-get.js +2 -1
  103. package/lib/commands/remoteconfig-rollback.js +2 -1
  104. package/lib/commands/remoteconfig-versions-list.js +2 -1
  105. package/lib/commands/serve.js +30 -30
  106. package/lib/commands/setup-emulators-database.js +2 -1
  107. package/lib/commands/setup-emulators-firestore.js +2 -1
  108. package/lib/commands/setup-emulators-pubsub.js +2 -1
  109. package/lib/commands/setup-emulators-storage.js +2 -1
  110. package/lib/commands/setup-emulators-ui.js +2 -1
  111. package/lib/commands/target-apply.js +2 -1
  112. package/lib/commands/target-clear.js +2 -1
  113. package/lib/commands/target-remove.js +2 -1
  114. package/lib/commands/target.js +2 -1
  115. package/lib/commands/use.js +54 -53
  116. package/lib/config.js +7 -6
  117. package/lib/deploy/database/deploy.js +3 -2
  118. package/lib/deploy/database/index.js +8 -5
  119. package/lib/deploy/database/prepare.js +22 -20
  120. package/lib/deploy/database/release.js +12 -9
  121. package/lib/deploy/extensions/secrets.js +3 -3
  122. package/lib/deploy/firestore/prepare.js +2 -2
  123. package/lib/deploy/functions/build.js +33 -20
  124. package/lib/deploy/functions/ensure.js +1 -11
  125. package/lib/deploy/functions/prepare.js +3 -13
  126. package/lib/deploy/functions/prepareFunctionsUpload.js +2 -3
  127. package/lib/deploy/functions/release/fabricator.js +0 -1
  128. package/lib/deploy/functions/release/index.js +1 -5
  129. package/lib/deploy/functions/runtimes/discovery/index.js +18 -3
  130. package/lib/deploy/functions/runtimes/discovery/v1alpha1.js +188 -54
  131. package/lib/deploy/functions/runtimes/golang/index.js +2 -22
  132. package/lib/deploy/functions/runtimes/node/index.js +3 -7
  133. package/lib/deploy/functions/runtimes/node/parseTriggers.js +15 -3
  134. package/lib/deploy/functions/services/database.js +14 -0
  135. package/lib/deploy/functions/services/index.js +14 -0
  136. package/lib/deploy/index.js +3 -3
  137. package/lib/deploy/lifecycleHooks.js +27 -27
  138. package/lib/deploy/remoteconfig/functions.js +18 -14
  139. package/lib/deploy/remoteconfig/prepare.js +2 -2
  140. package/lib/deploy/storage/prepare.js +1 -1
  141. package/lib/emulator/auth/apiSpec.js +14 -46
  142. package/lib/emulator/auth/index.js +1 -1
  143. package/lib/emulator/auth/operations.js +342 -93
  144. package/lib/emulator/auth/server.js +2 -2
  145. package/lib/emulator/auth/state.js +34 -32
  146. package/lib/emulator/commandUtils.js +1 -1
  147. package/lib/emulator/constants.js +1 -1
  148. package/lib/emulator/controller.js +7 -6
  149. package/lib/emulator/databaseEmulator.js +11 -9
  150. package/lib/emulator/download.js +1 -1
  151. package/lib/emulator/events/types.js +2 -3
  152. package/lib/emulator/firestoreEmulator.js +12 -14
  153. package/lib/emulator/functionsEmulator.js +65 -77
  154. package/lib/emulator/functionsEmulatorRuntime.js +7 -7
  155. package/lib/emulator/hostingEmulator.js +1 -1
  156. package/lib/emulator/hub.js +1 -1
  157. package/lib/emulator/hubClient.js +11 -22
  158. package/lib/emulator/hubExport.js +26 -16
  159. package/lib/emulator/loggingEmulator.js +1 -1
  160. package/lib/emulator/pubsubEmulator.js +1 -1
  161. package/lib/emulator/storage/crc.js +4 -4
  162. package/lib/emulator/storage/index.js +1 -1
  163. package/lib/emulator/types.js +1 -1
  164. package/lib/errorOut.js +2 -2
  165. package/lib/extensions/askUserForConsent.js +1 -2
  166. package/lib/extensions/askUserForParam.js +15 -18
  167. package/lib/extensions/emulator/optionsHelper.js +4 -4
  168. package/lib/extensions/extensionsApi.js +1 -22
  169. package/lib/extensions/extensionsHelper.js +6 -6
  170. package/lib/extensions/listExtensions.js +9 -10
  171. package/lib/extensions/manifest.js +2 -2
  172. package/lib/extensions/resolveSource.js +11 -7
  173. package/lib/extensions/secretsUtils.js +3 -3
  174. package/lib/extensions/types.js +24 -0
  175. package/lib/extensions/updateHelper.js +1 -1
  176. package/lib/extensions/utils.js +1 -2
  177. package/lib/extensions/warnings.js +3 -3
  178. package/lib/firestore/checkDatabaseType.js +4 -5
  179. package/lib/firestore/encodeFirestoreValue.js +11 -8
  180. package/lib/firestore/indexes.js +17 -34
  181. package/lib/fsAsync.js +3 -3
  182. package/lib/functions/events/v2.js +7 -1
  183. package/lib/functionsConfig.js +17 -14
  184. package/lib/functionsConfigClone.js +46 -46
  185. package/lib/gcp/cloudfunctions.js +2 -15
  186. package/lib/gcp/cloudfunctionsv2.js +17 -2
  187. package/lib/gcp/iam.js +1 -1
  188. package/lib/gcp/index.js +10 -10
  189. package/lib/gcp/rules.js +1 -1
  190. package/lib/gcp/runtimeconfig.js +45 -47
  191. package/lib/gcp/storage.js +2 -4
  192. package/lib/hosting/cloudRunProxy.js +19 -15
  193. package/lib/hosting/proxy.js +1 -1
  194. package/lib/index.js +29 -28
  195. package/lib/init/features/database.js +11 -5
  196. package/lib/init/features/functions/index.js +1 -1
  197. package/lib/init/features/functions/javascript.js +23 -20
  198. package/lib/init/features/functions/npm-dependencies.js +17 -14
  199. package/lib/init/features/functions/typescript.js +27 -24
  200. package/lib/init/features/hosting/github.js +6 -5
  201. package/lib/init/features/hosting/index.js +2 -2
  202. package/lib/loadCJSON.js +9 -6
  203. package/lib/localFunction.js +4 -4
  204. package/lib/logError.js +15 -12
  205. package/lib/management/apps.js +47 -43
  206. package/lib/management/database.js +33 -31
  207. package/lib/management/projects.js +13 -7
  208. package/lib/parseBoltRules.js +15 -14
  209. package/lib/previews.js +1 -1
  210. package/lib/profileReport.js +504 -512
  211. package/lib/profiler.js +4 -4
  212. package/lib/prompt.js +1 -2
  213. package/lib/rc.js +1 -1
  214. package/lib/requireAuth.js +0 -1
  215. package/lib/responseToError.js +8 -5
  216. package/lib/rtdb.js +31 -29
  217. package/lib/rulesDeploy.js +2 -2
  218. package/lib/scopes.js +9 -9
  219. package/lib/serve/index.js +4 -5
  220. package/lib/utils.js +30 -6
  221. package/npm-shrinkwrap.json +877 -279
  222. package/package.json +19 -16
  223. package/standalone/package.json +1 -1
@@ -7,7 +7,7 @@ const yaml = require("js-yaml");
7
7
  const js_yaml_1 = require("js-yaml");
8
8
  const ora = require("ora");
9
9
  const path = require("path");
10
- const sodium = require("tweetsodium");
10
+ const libsodium = require("libsodium-wrappers");
11
11
  const auth_1 = require("../../../auth");
12
12
  const fsutils_1 = require("../../../fsutils");
13
13
  const iam_1 = require("../../../gcp/iam");
@@ -27,7 +27,7 @@ const YML_MERGE_FILENAME = "firebase-hosting-merge.yml";
27
27
  const CHECKOUT_GITHUB_ACTION_NAME = "actions/checkout@v2";
28
28
  const HOSTING_GITHUB_ACTION_NAME = "FirebaseExtended/action-hosting-deploy@v0";
29
29
  const githubApiClient = new apiv2_1.Client({ urlPrefix: api_1.githubApiOrigin, auth: false });
30
- async function initGitHub(setup, config, options) {
30
+ async function initGitHub(setup) {
31
31
  if (!setup.projectId) {
32
32
  return (0, utils_1.reject)("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
33
33
  }
@@ -60,7 +60,7 @@ async function initGitHub(setup, config, options) {
60
60
  const spinnerSecrets = ora(`Uploading service account secrets to repository: ${repo}`);
61
61
  spinnerSecrets.start();
62
62
  const encryptedServiceAccountJSON = encryptServiceAccountJSON(serviceAccountJSON, key);
63
- await uploadSecretToGitHub(repo, ghAccessToken, encryptedServiceAccountJSON, keyId, githubSecretName);
63
+ await uploadSecretToGitHub(repo, ghAccessToken, await encryptedServiceAccountJSON, keyId, githubSecretName);
64
64
  spinnerSecrets.stop();
65
65
  (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, cli_color_1.bold)(githubSecretName)}.`);
66
66
  (0, utils_1.logBullet)(`You can manage your secrets at https://github.com/${repo}/settings/secrets.`);
@@ -374,9 +374,10 @@ async function createServiceAccountAndKey(options, repo, accountId) {
374
374
  const serviceAccountJSON = buf.toString();
375
375
  return serviceAccountJSON;
376
376
  }
377
- function encryptServiceAccountJSON(serviceAccountJSON, key) {
377
+ async function encryptServiceAccountJSON(serviceAccountJSON, key) {
378
378
  const messageBytes = Buffer.from(serviceAccountJSON);
379
379
  const keyBytes = Buffer.from(key, "base64");
380
- const encryptedBytes = sodium.seal(messageBytes, keyBytes);
380
+ await libsodium.ready;
381
+ const encryptedBytes = libsodium.crypto_box_seal(messageBytes, keyBytes);
381
382
  return Buffer.from(encryptedBytes).toString("base64");
382
383
  }
@@ -10,7 +10,7 @@ const logger_1 = require("../../../logger");
10
10
  const INDEX_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/index.html", "utf8");
11
11
  const MISSING_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/404.html", "utf8");
12
12
  const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
13
- async function doSetup(setup, config, options) {
13
+ async function doSetup(setup, config) {
14
14
  setup.hosting = {};
15
15
  logger_1.logger.info();
16
16
  logger_1.logger.info(`Your ${clc.bold("public")} directory is the folder (relative to your project directory) that`);
@@ -51,7 +51,7 @@ async function doSetup(setup, config, options) {
51
51
  const response = await c.get("/firebasejs/releases.json");
52
52
  await config.askWriteProjectFile(`${setup.hosting.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
53
53
  if (setup.hosting.github) {
54
- return (0, github_1.initGitHub)(setup, config, options);
54
+ return (0, github_1.initGitHub)(setup);
55
55
  }
56
56
  }
57
57
  exports.doSetup = doSetup;
package/lib/loadCJSON.js CHANGED
@@ -1,14 +1,17 @@
1
1
  "use strict";
2
- var { FirebaseError } = require("./error");
3
- var cjson = require("cjson");
4
- module.exports = function (path) {
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.loadCJSON = void 0;
4
+ const error_1 = require("./error");
5
+ const cjson = require("cjson");
6
+ function loadCJSON(path) {
5
7
  try {
6
8
  return cjson.load(path);
7
9
  }
8
10
  catch (e) {
9
11
  if (e.code === "ENOENT") {
10
- throw new FirebaseError("File " + path + " does not exist", { exit: 1 });
12
+ throw new error_1.FirebaseError(`File ${path} does not exist`);
11
13
  }
12
- throw new FirebaseError("Parse Error in " + path + ":\n\n" + e.message);
14
+ throw new error_1.FirebaseError(`Parse Error in ${path}:\n\n${e.message}`);
13
15
  }
14
- };
16
+ }
17
+ exports.loadCJSON = loadCJSON;
@@ -38,13 +38,13 @@ LocalFunction.prototype._substituteParams = function (resource, params) {
38
38
  return resource.replace(wildcardRegex, function (wildcard) {
39
39
  var wildcardNoBraces = wildcard.slice(1, -1);
40
40
  var sub = _.get(params, wildcardNoBraces);
41
- return sub || wildcardNoBraces + _.random(1, 9);
41
+ return sub || wildcardNoBraces + utils.randomInt(1, 9);
42
42
  });
43
43
  };
44
44
  LocalFunction.prototype._constructCallableFunc = function (data, opts) {
45
45
  opts = opts || {};
46
46
  var headers = {};
47
- if (_.has(opts, "instanceIdToken")) {
47
+ if (opts.instanceIdToken) {
48
48
  headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
49
49
  }
50
50
  return request.post({
@@ -134,7 +134,7 @@ LocalFunction.prototype._call = function (data, opts) {
134
134
  }
135
135
  else if (this.eventTrigger) {
136
136
  if (this._isDatabaseFunc(this.eventTrigger)) {
137
- operationType = _.last(this.eventTrigger.eventType.split("."));
137
+ operationType = utils.last(this.eventTrigger.eventType.split("."));
138
138
  switch (operationType) {
139
139
  case "create":
140
140
  dataPayload = {
@@ -159,7 +159,7 @@ LocalFunction.prototype._call = function (data, opts) {
159
159
  this.controller.call(this.name, dataPayload, opts);
160
160
  }
161
161
  else if (this._isFirestoreFunc(this.eventTrigger)) {
162
- operationType = _.last(this.eventTrigger.eventType.split("."));
162
+ operationType = utils.last(this.eventTrigger.eventType.split("."));
163
163
  switch (operationType) {
164
164
  case "create":
165
165
  dataPayload = {
package/lib/logError.js CHANGED
@@ -1,26 +1,29 @@
1
1
  "use strict";
2
- const { logger } = require("./logger");
3
- var clc = require("cli-color");
4
- module.exports = function (error) {
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.logError = void 0;
4
+ const logger_1 = require("./logger");
5
+ const clc = require("cli-color");
6
+ function logError(error) {
5
7
  if (error.children && error.children.length) {
6
- logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
7
- error.children.forEach(function (child) {
8
- var out = "- ";
8
+ logger_1.logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
9
+ error.children.forEach((child) => {
10
+ let out = "- ";
9
11
  if (child.name) {
10
12
  out += clc.bold(child.name) + " ";
11
13
  }
12
14
  out += child.message;
13
- logger.error(out);
15
+ logger_1.logger.error(out);
14
16
  });
15
17
  }
16
18
  else {
17
19
  if (error.original) {
18
- logger.debug(error.original.stack);
20
+ logger_1.logger.debug(error.original.stack);
19
21
  }
20
- logger.error();
21
- logger.error(clc.bold.red("Error:"), error.message);
22
+ logger_1.logger.error();
23
+ logger_1.logger.error(clc.bold.red("Error:"), error.message);
22
24
  }
23
25
  if (error.context) {
24
- logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));
26
+ logger_1.logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));
25
27
  }
26
- };
28
+ }
29
+ exports.logError = logError;
@@ -1,13 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.deleteAppAndroidSha = exports.createAppAndroidSha = exports.listAppAndroidSha = exports.getAppConfig = exports.getAppConfigFile = exports.listFirebaseApps = exports.createWebApp = exports.createAndroidApp = exports.createIosApp = exports.getAppPlatform = exports.ShaCertificateType = exports.AppPlatform = void 0;
3
+ exports.deleteAppAndroidSha = exports.createAppAndroidSha = exports.listAppAndroidSha = exports.getAppConfig = exports.getAppConfigFile = exports.listFirebaseApps = exports.createWebApp = exports.createAndroidApp = exports.createIosApp = exports.getAppPlatform = exports.ShaCertificateType = exports.AppPlatform = exports.APP_LIST_PAGE_SIZE = void 0;
4
4
  const fs = require("fs");
5
- const api = require("../api");
5
+ const apiv2_1 = require("../apiv2");
6
+ const api_1 = require("../api");
6
7
  const error_1 = require("../error");
7
8
  const logger_1 = require("../logger");
8
9
  const operation_poller_1 = require("../operation-poller");
9
10
  const TIMEOUT_MILLIS = 30000;
10
- const APP_LIST_PAGE_SIZE = 100;
11
+ exports.APP_LIST_PAGE_SIZE = 100;
11
12
  const CREATE_APP_API_REQUEST_TIMEOUT_MILLIS = 15000;
12
13
  const WEB_CONFIG_FILE_NAME = "google-config.js";
13
14
  var AppPlatform;
@@ -39,17 +40,18 @@ function getAppPlatform(platform) {
39
40
  }
40
41
  }
41
42
  exports.getAppPlatform = getAppPlatform;
43
+ const apiClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseApiOrigin, apiVersion: "v1beta1" });
42
44
  async function createIosApp(projectId, options) {
43
45
  try {
44
- const response = await api.request("POST", `/v1beta1/projects/${projectId}/iosApps`, {
45
- auth: true,
46
- origin: api.firebaseApiOrigin,
46
+ const response = await apiClient.request({
47
+ method: "POST",
48
+ path: `/projects/${projectId}/iosApps`,
47
49
  timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
48
- data: options,
50
+ body: options,
49
51
  });
50
52
  const appData = await (0, operation_poller_1.pollOperation)({
51
53
  pollerName: "Create iOS app Poller",
52
- apiOrigin: api.firebaseApiOrigin,
54
+ apiOrigin: api_1.firebaseApiOrigin,
53
55
  apiVersion: "v1beta1",
54
56
  operationResourceName: response.body.name,
55
57
  });
@@ -63,15 +65,15 @@ async function createIosApp(projectId, options) {
63
65
  exports.createIosApp = createIosApp;
64
66
  async function createAndroidApp(projectId, options) {
65
67
  try {
66
- const response = await api.request("POST", `/v1beta1/projects/${projectId}/androidApps`, {
67
- auth: true,
68
- origin: api.firebaseApiOrigin,
68
+ const response = await apiClient.request({
69
+ method: "POST",
70
+ path: `/projects/${projectId}/androidApps`,
69
71
  timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
70
- data: options,
72
+ body: options,
71
73
  });
72
74
  const appData = await (0, operation_poller_1.pollOperation)({
73
75
  pollerName: "Create Android app Poller",
74
- apiOrigin: api.firebaseApiOrigin,
76
+ apiOrigin: api_1.firebaseApiOrigin,
75
77
  apiVersion: "v1beta1",
76
78
  operationResourceName: response.body.name,
77
79
  });
@@ -88,15 +90,15 @@ async function createAndroidApp(projectId, options) {
88
90
  exports.createAndroidApp = createAndroidApp;
89
91
  async function createWebApp(projectId, options) {
90
92
  try {
91
- const response = await api.request("POST", `/v1beta1/projects/${projectId}/webApps`, {
92
- auth: true,
93
- origin: api.firebaseApiOrigin,
93
+ const response = await apiClient.request({
94
+ method: "POST",
95
+ path: `/projects/${projectId}/webApps`,
94
96
  timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
95
- data: options,
97
+ body: options,
96
98
  });
97
99
  const appData = await (0, operation_poller_1.pollOperation)({
98
100
  pollerName: "Create Web app Poller",
99
- apiOrigin: api.firebaseApiOrigin,
101
+ apiOrigin: api_1.firebaseApiOrigin,
100
102
  apiVersion: "v1beta1",
101
103
  operationResourceName: response.body.name,
102
104
  });
@@ -126,18 +128,21 @@ function getListAppsResourceString(projectId, platform) {
126
128
  default:
127
129
  throw new error_1.FirebaseError("Unexpected platform. Only support iOS, Android and Web apps");
128
130
  }
129
- return `/v1beta1/projects/${projectId}${resourceSuffix}`;
131
+ return `/projects/${projectId}${resourceSuffix}`;
130
132
  }
131
- async function listFirebaseApps(projectId, platform, pageSize = APP_LIST_PAGE_SIZE) {
133
+ async function listFirebaseApps(projectId, platform, pageSize = exports.APP_LIST_PAGE_SIZE) {
132
134
  const apps = [];
133
135
  try {
134
- let nextPageToken = "";
136
+ let nextPageToken;
135
137
  do {
136
- const pageTokenQueryString = nextPageToken ? `&pageToken=${nextPageToken}` : "";
137
- const response = await api.request("GET", getListAppsResourceString(projectId, platform) +
138
- `?pageSize=${pageSize}${pageTokenQueryString}`, {
139
- auth: true,
140
- origin: api.firebaseApiOrigin,
138
+ const queryParams = { pageSize };
139
+ if (nextPageToken) {
140
+ queryParams.pageToken = nextPageToken;
141
+ }
142
+ const response = await apiClient.request({
143
+ method: "GET",
144
+ path: getListAppsResourceString(projectId, platform),
145
+ queryParams,
141
146
  timeout: TIMEOUT_MILLIS,
142
147
  });
143
148
  if (response.body.apps) {
@@ -173,7 +178,7 @@ function getAppConfigResourceString(appId, platform) {
173
178
  default:
174
179
  throw new error_1.FirebaseError("Unexpected app platform");
175
180
  }
176
- return `/v1beta1/projects/-/${platformResource}/${appId}/config`;
181
+ return `/projects/-/${platformResource}/${appId}/config`;
177
182
  }
178
183
  function parseConfigFromResponse(responseBody, platform) {
179
184
  if (platform === AppPlatform.WEB) {
@@ -196,13 +201,13 @@ function getAppConfigFile(config, platform) {
196
201
  }
197
202
  exports.getAppConfigFile = getAppConfigFile;
198
203
  async function getAppConfig(appId, platform) {
199
- let response;
200
204
  try {
201
- response = await api.request("GET", getAppConfigResourceString(appId, platform), {
202
- auth: true,
203
- origin: api.firebaseApiOrigin,
205
+ const response = await apiClient.request({
206
+ method: "GET",
207
+ path: getAppConfigResourceString(appId, platform),
204
208
  timeout: TIMEOUT_MILLIS,
205
209
  });
210
+ return response.body;
206
211
  }
207
212
  catch (err) {
208
213
  logger_1.logger.debug(err.message);
@@ -211,15 +216,15 @@ async function getAppConfig(appId, platform) {
211
216
  original: err,
212
217
  });
213
218
  }
214
- return response.body;
215
219
  }
216
220
  exports.getAppConfig = getAppConfig;
217
221
  async function listAppAndroidSha(projectId, appId) {
218
222
  const shaCertificates = [];
219
223
  try {
220
- const response = await api.request("GET", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha`, {
221
- auth: true,
222
- origin: api.firebaseApiOrigin,
224
+ const response = await apiClient.request({
225
+ method: "GET",
226
+ path: `/projects/${projectId}/androidApps/${appId}/sha`,
227
+ timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
223
228
  });
224
229
  if (response.body.certificates) {
225
230
  shaCertificates.push(...response.body.certificates);
@@ -238,11 +243,11 @@ async function listAppAndroidSha(projectId, appId) {
238
243
  exports.listAppAndroidSha = listAppAndroidSha;
239
244
  async function createAppAndroidSha(projectId, appId, options) {
240
245
  try {
241
- const response = await api.request("POST", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha`, {
242
- auth: true,
243
- origin: api.firebaseApiOrigin,
246
+ const response = await apiClient.request({
247
+ method: "POST",
248
+ path: `/projects/${projectId}/androidApps/${appId}/sha`,
249
+ body: options,
244
250
  timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
245
- data: options,
246
251
  });
247
252
  const shaCertificate = response.body;
248
253
  return shaCertificate;
@@ -258,11 +263,10 @@ async function createAppAndroidSha(projectId, appId, options) {
258
263
  exports.createAppAndroidSha = createAppAndroidSha;
259
264
  async function deleteAppAndroidSha(projectId, appId, shaId) {
260
265
  try {
261
- await api.request("DELETE", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha/${shaId}`, {
262
- auth: true,
263
- origin: api.firebaseApiOrigin,
266
+ await apiClient.request({
267
+ method: "DELETE",
268
+ path: `/projects/${projectId}/androidApps/${appId}/sha/${shaId}`,
264
269
  timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
265
- data: null,
266
270
  });
267
271
  }
268
272
  catch (err) {
@@ -1,14 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.listDatabaseInstances = exports.parseDatabaseLocation = exports.checkInstanceNameAvailable = exports.createInstance = exports.getDatabaseInstanceDetails = exports.populateInstanceDetails = exports.DatabaseLocation = exports.DatabaseInstanceState = exports.DatabaseInstanceType = void 0;
4
- const api = require("../api");
3
+ exports.listDatabaseInstances = exports.parseDatabaseLocation = exports.checkInstanceNameAvailable = exports.createInstance = exports.getDatabaseInstanceDetails = exports.populateInstanceDetails = exports.DatabaseLocation = exports.DatabaseInstanceState = exports.DatabaseInstanceType = exports.APP_LIST_PAGE_SIZE = exports.MGMT_API_VERSION = void 0;
4
+ const apiv2_1 = require("../apiv2");
5
+ const constants_1 = require("../emulator/constants");
6
+ const error_1 = require("../error");
5
7
  const logger_1 = require("../logger");
8
+ const api_1 = require("../api");
6
9
  const utils = require("../utils");
7
- const error_1 = require("../error");
8
- const constants_1 = require("../emulator/constants");
9
- const MGMT_API_VERSION = "v1beta";
10
+ exports.MGMT_API_VERSION = "v1beta";
11
+ exports.APP_LIST_PAGE_SIZE = 100;
10
12
  const TIMEOUT_MILLIS = 10000;
11
- const APP_LIST_PAGE_SIZE = 100;
12
13
  const INSTANCE_RESOURCE_NAME_REGEX = /projects\/([^/]+?)\/locations\/([^/]+?)\/instances\/([^/]*)/;
13
14
  var DatabaseInstanceType;
14
15
  (function (DatabaseInstanceType) {
@@ -30,6 +31,7 @@ var DatabaseLocation;
30
31
  DatabaseLocation["ASIA_SOUTHEAST1"] = "asia-southeast1";
31
32
  DatabaseLocation["ANY"] = "-";
32
33
  })(DatabaseLocation = exports.DatabaseLocation || (exports.DatabaseLocation = {}));
34
+ const apiClient = new apiv2_1.Client({ urlPrefix: api_1.rtdbManagementOrigin, apiVersion: exports.MGMT_API_VERSION });
33
35
  async function populateInstanceDetails(options) {
34
36
  options.instanceDetails = await getDatabaseInstanceDetails(options.project, options.instance);
35
37
  return Promise.resolve();
@@ -37,9 +39,9 @@ async function populateInstanceDetails(options) {
37
39
  exports.populateInstanceDetails = populateInstanceDetails;
38
40
  async function getDatabaseInstanceDetails(projectId, instanceName) {
39
41
  try {
40
- const response = await api.request("GET", `/${MGMT_API_VERSION}/projects/${projectId}/locations/-/instances/${instanceName}`, {
41
- auth: true,
42
- origin: api.rtdbManagementOrigin,
42
+ const response = await apiClient.request({
43
+ method: "GET",
44
+ path: `/projects/${projectId}/locations/-/instances/${instanceName}`,
43
45
  timeout: TIMEOUT_MILLIS,
44
46
  });
45
47
  return convertDatabaseInstance(response.body);
@@ -57,8 +59,8 @@ async function getDatabaseInstanceDetails(projectId, instanceName) {
57
59
  state: DatabaseInstanceState.ACTIVE,
58
60
  });
59
61
  }
60
- return utils.reject(`Failed to get instance details for instance: ${instanceName}. See firebase-debug.log for more details.`, {
61
- code: 2,
62
+ throw new error_1.FirebaseError(`Failed to get instance details for instance: ${instanceName}. See firebase-debug.log for more details.`, {
63
+ exit: 2,
62
64
  original: err,
63
65
  });
64
66
  }
@@ -66,13 +68,12 @@ async function getDatabaseInstanceDetails(projectId, instanceName) {
66
68
  exports.getDatabaseInstanceDetails = getDatabaseInstanceDetails;
67
69
  async function createInstance(projectId, instanceName, location, databaseType) {
68
70
  try {
69
- const response = await api.request("POST", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?databaseId=${instanceName}`, {
70
- auth: true,
71
- origin: api.rtdbManagementOrigin,
71
+ const response = await apiClient.request({
72
+ method: "POST",
73
+ path: `/projects/${projectId}/locations/${location}/instances`,
74
+ queryParams: { databaseId: instanceName },
75
+ body: { type: databaseType },
72
76
  timeout: TIMEOUT_MILLIS,
73
- data: {
74
- type: databaseType,
75
- },
76
77
  });
77
78
  return convertDatabaseInstance(response.body);
78
79
  }
@@ -91,17 +92,14 @@ async function checkInstanceNameAvailable(projectId, instanceName, databaseType,
91
92
  location = DatabaseLocation.US_CENTRAL1;
92
93
  }
93
94
  try {
94
- await api.request("POST", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?databaseId=${instanceName}&validateOnly=true`, {
95
- auth: true,
96
- origin: api.rtdbManagementOrigin,
95
+ await apiClient.request({
96
+ method: "POST",
97
+ path: `/projects/${projectId}/locations/${location}/instances`,
98
+ queryParams: { databaseId: instanceName, validateOnly: "true" },
99
+ body: { type: databaseType },
97
100
  timeout: TIMEOUT_MILLIS,
98
- data: {
99
- type: databaseType,
100
- },
101
101
  });
102
- return {
103
- available: true,
104
- };
102
+ return { available: true };
105
103
  }
106
104
  catch (err) {
107
105
  logger_1.logger.debug(`Invalid Realtime Database instance name: ${instanceName}.${err.message ? " " + err.message : ""}`);
@@ -136,15 +134,19 @@ function parseDatabaseLocation(location, defaultLocation) {
136
134
  }
137
135
  }
138
136
  exports.parseDatabaseLocation = parseDatabaseLocation;
139
- async function listDatabaseInstances(projectId, location, pageSize = APP_LIST_PAGE_SIZE) {
137
+ async function listDatabaseInstances(projectId, location, pageSize = exports.APP_LIST_PAGE_SIZE) {
140
138
  const instances = [];
141
139
  try {
142
140
  let nextPageToken = "";
143
141
  do {
144
- const pageTokenQueryString = nextPageToken ? `&pageToken=${nextPageToken}` : "";
145
- const response = await api.request("GET", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?pageSize=${pageSize}${pageTokenQueryString}`, {
146
- auth: true,
147
- origin: api.rtdbManagementOrigin,
142
+ const queryParams = { pageSize };
143
+ if (nextPageToken) {
144
+ queryParams.pageToken = nextPageToken;
145
+ }
146
+ const response = await apiClient.request({
147
+ method: "GET",
148
+ path: `/projects/${projectId}/locations/${location}/instances`,
149
+ queryParams,
148
150
  timeout: TIMEOUT_MILLIS,
149
151
  });
150
152
  if (response.body.instances) {
@@ -172,11 +172,17 @@ async function promptAvailableProjectId() {
172
172
  exports.promptAvailableProjectId = promptAvailableProjectId;
173
173
  async function createCloudProject(projectId, options) {
174
174
  try {
175
- const response = await api.request("POST", "/v1/projects", {
176
- auth: true,
177
- origin: api.resourceManagerOrigin,
175
+ const client = new apiv2_1.Client({ urlPrefix: api.resourceManagerOrigin, apiVersion: "v1" });
176
+ const data = {
177
+ projectId,
178
+ name: options.displayName || projectId,
179
+ parent: options.parentResource,
180
+ };
181
+ const response = await client.request({
182
+ method: "POST",
183
+ path: "/projects",
184
+ body: data,
178
185
  timeout: CREATE_PROJECT_API_REQUEST_TIMEOUT_MILLIS,
179
- data: { projectId, name: options.displayName || projectId, parent: options.parentResource },
180
186
  });
181
187
  const projectInfo = await (0, operation_poller_1.pollOperation)({
182
188
  pollerName: "Project Creation Poller",
@@ -204,9 +210,9 @@ async function createCloudProject(projectId, options) {
204
210
  exports.createCloudProject = createCloudProject;
205
211
  async function addFirebaseToCloudProject(projectId) {
206
212
  try {
207
- const response = await api.request("POST", `/v1beta1/projects/${projectId}:addFirebase`, {
208
- auth: true,
209
- origin: api.firebaseApiOrigin,
213
+ const response = await firebaseAPIClient.request({
214
+ method: "POST",
215
+ path: `/projects/${projectId}:addFirebase`,
210
216
  timeout: CREATE_PROJECT_API_REQUEST_TIMEOUT_MILLIS,
211
217
  });
212
218
  const projectInfo = await (0, operation_poller_1.pollOperation)({
@@ -1,28 +1,29 @@
1
1
  "use strict";
2
- var fs = require("fs");
3
- var spawn = require("cross-spawn");
4
- var { FirebaseError } = require("./error");
5
- var clc = require("cli-color");
6
- var _ = require("lodash");
7
- module.exports = function (filename) {
8
- var ruleSrc = fs.readFileSync(filename, "utf8");
9
- var result = spawn.sync("npx", ["--no-install", "firebase-bolt"], {
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.parseBoltRules = void 0;
4
+ const fs = require("fs");
5
+ const spawn = require("cross-spawn");
6
+ const clc = require("cli-color");
7
+ const _ = require("lodash");
8
+ const error_1 = require("./error");
9
+ function parseBoltRules(filename) {
10
+ const ruleSrc = fs.readFileSync(filename, "utf8");
11
+ const result = spawn.sync("npx", ["--no-install", "firebase-bolt"], {
10
12
  input: ruleSrc,
11
13
  timeout: 10000,
12
14
  encoding: "utf-8",
13
15
  });
14
16
  if (result.error && _.get(result.error, "code") === "ENOENT") {
15
- throw new FirebaseError("Bolt not installed, run " + clc.bold("npm install -g firebase-bolt"), {
16
- exit: 1,
17
- });
17
+ throw new error_1.FirebaseError("Bolt not installed, run " + clc.bold("npm install -g firebase-bolt"));
18
18
  }
19
19
  else if (result.error) {
20
- throw new FirebaseError("Unexpected error parsing Bolt rules file", {
20
+ throw new error_1.FirebaseError("Unexpected error parsing Bolt rules file", {
21
21
  exit: 2,
22
22
  });
23
23
  }
24
24
  else if (result.status != null && result.status > 0) {
25
- throw new FirebaseError(result.stderr.toString(), { exit: 1 });
25
+ throw new error_1.FirebaseError(result.stderr.toString(), { exit: 1 });
26
26
  }
27
27
  return result.stdout;
28
- };
28
+ }
29
+ exports.parseBoltRules = parseBoltRules;
package/lib/previews.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.previews = void 0;
4
4
  const lodash_1 = require("lodash");
5
5
  const configstore_1 = require("./configstore");
6
- exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
6
+ exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
7
7
  if (process.env.FIREBASE_CLI_PREVIEWS) {
8
8
  process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
9
9
  if ((0, lodash_1.has)(exports.previews, feature)) {