firebase-tools 13.13.1 → 13.13.2

package/lib/auth.js

@@ -61,12 +61,10 @@ function getAllAccounts() {
     return res;
 }
 exports.getAllAccounts = getAllAccounts;
-function setActiveAccount(options, account) {
+async function setActiveAccount(options, account) {
     if (account.tokens.refresh_token) {
         setRefreshToken(account.tokens.refresh_token);
-    }
-    if (account.tokens.access_token) {
-        setAccessToken(account.tokens.access_token);
+        setAccessToken(await apiv2.getAccessToken());
     }
     options.user = account.user;
     options.tokens = account.tokens;

package/lib/command.js

@@ -173,7 +173,7 @@ class Command {
         const projectRoot = options.projectRoot;
         const activeAccount = (0, auth_1.selectAccount)(account, projectRoot);
         if (activeAccount) {
-            (0, auth_1.setActiveAccount)(options, activeAccount);
+            await (0, auth_1.setActiveAccount)(options, activeAccount);
         }
         this.applyRC(options);
         if (options.project) {

package/lib/commands/dataconnect-services-list.js

@@ -44,7 +44,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
         const instanceName = (_c = (_b = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance) !== null && _c !== void 0 ? _c : "";
         const instanceId = instanceName.split("/").pop();
         const dbId = (_e = (_d = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
-        const dbName = `CloudSQL Instance: ${instanceId}\nDatabase:${dbId}`;
+        const dbName = `CloudSQL Instance: ${instanceId}\nDatabase: ${dbId}`;
         table.push([
             serviceName.serviceId,
             serviceName.location,

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const operationPoller = require("../../operation-poller");
@@ -125,6 +125,11 @@ async function createDatabase(projectId, instanceId, databaseId) {
     return pollRes;
 }
 exports.createDatabase = createDatabase;
+async function deleteDatabase(projectId, instanceId, databaseId) {
+    const res = await client.delete(`projects/${projectId}/instances/${instanceId}/databases/${databaseId}`);
+    return res.body;
+}
+exports.deleteDatabase = deleteDatabase;
 async function createUser(projectId, instanceId, type, username, password) {
     const maxRetries = 3;
     let retries = 0;

package/lib/init/features/account.js

@@ -52,7 +52,7 @@ async function doSetup(setup, config, options) {
     if (!account) {
         throw new error_1.FirebaseError(`No account selected, have you run "firebase login"?`, { exit: 1 });
     }
-    (0, auth_1.setActiveAccount)(options, account);
+    await (0, auth_1.setActiveAccount)(options, account);
     if (config.projectDir) {
         (0, auth_1.setProjectAccount)(config.projectDir, account.user.email);
     }

package/lib/requireAuth.js

@@ -32,7 +32,10 @@ async function autoAuth(options, authScopes) {
         logger_1.logger.debug(`Error getting account credentials.`);
     }
     if (process.env.MONOSPACE_ENV && token && clientEmail) {
-        (0, auth_1.setActiveAccount)(options, { user: { email: clientEmail }, tokens: { access_token: token } });
+        await (0, auth_1.setActiveAccount)(options, {
+            user: { email: clientEmail },
+            tokens: { access_token: token },
+        });
         (0, auth_1.setGlobalDefaultAccount)({ user: { email: clientEmail }, tokens: { access_token: token } });
         options.projectId = await client.getProjectId();
     }
@@ -73,7 +76,7 @@ async function requireAuth(options) {
     if (!user || !tokens) {
         throw new error_1.FirebaseError(AUTH_ERROR_MESSAGE);
     }
-    (0, auth_1.setActiveAccount)(options, { user, tokens });
+    await (0, auth_1.setActiveAccount)(options, { user, tokens });
     return user.email;
 }
 exports.requireAuth = requireAuth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.13.1",
+  "version": "13.13.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {