firebase-tools 13.13.2 → 13.13.3
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.
- package/lib/auth.js +2 -7
- package/lib/command.js +1 -1
- package/lib/commands/login.js +1 -2
- package/lib/init/features/account.js +1 -1
- package/lib/requireAuth.js +2 -2
- package/package.json +1 -1
package/lib/auth.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.
|
|
3
|
+
exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
|
|
4
4
|
const clc = require("colorette");
|
|
5
5
|
const FormData = require("form-data");
|
|
6
6
|
const http = require("http");
|
|
@@ -61,10 +61,9 @@ function getAllAccounts() {
|
|
|
61
61
|
return res;
|
|
62
62
|
}
|
|
63
63
|
exports.getAllAccounts = getAllAccounts;
|
|
64
|
-
|
|
64
|
+
function setActiveAccount(options, account) {
|
|
65
65
|
if (account.tokens.refresh_token) {
|
|
66
66
|
setRefreshToken(account.tokens.refresh_token);
|
|
67
|
-
setAccessToken(await apiv2.getAccessToken());
|
|
68
67
|
}
|
|
69
68
|
options.user = account.user;
|
|
70
69
|
options.tokens = account.tokens;
|
|
@@ -74,10 +73,6 @@ function setRefreshToken(token) {
|
|
|
74
73
|
apiv2.setRefreshToken(token);
|
|
75
74
|
}
|
|
76
75
|
exports.setRefreshToken = setRefreshToken;
|
|
77
|
-
function setAccessToken(token) {
|
|
78
|
-
apiv2.setAccessToken(token);
|
|
79
|
-
}
|
|
80
|
-
exports.setAccessToken = setAccessToken;
|
|
81
76
|
function selectAccount(account, projectRoot) {
|
|
82
77
|
const defaultUser = getProjectDefaultAccount(projectRoot);
|
|
83
78
|
if (!account) {
|
package/lib/command.js
CHANGED
|
@@ -173,7 +173,7 @@ class Command {
|
|
|
173
173
|
const projectRoot = options.projectRoot;
|
|
174
174
|
const activeAccount = (0, auth_1.selectAccount)(account, projectRoot);
|
|
175
175
|
if (activeAccount) {
|
|
176
|
-
|
|
176
|
+
(0, auth_1.setActiveAccount)(options, activeAccount);
|
|
177
177
|
}
|
|
178
178
|
this.applyRC(options);
|
|
179
179
|
if (options.project) {
|
package/lib/commands/login.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.command = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
const clc = require("colorette");
|
|
6
5
|
const command_1 = require("../command");
|
|
7
6
|
const logger_1 = require("../logger");
|
|
@@ -40,7 +39,7 @@ exports.command = new command_1.Command("login")
|
|
|
40
39
|
}
|
|
41
40
|
}
|
|
42
41
|
const useLocalhost = (0, utils_1.isCloudEnvironment)() ? false : options.localhost;
|
|
43
|
-
const result = await auth.loginGoogle(useLocalhost,
|
|
42
|
+
const result = await auth.loginGoogle(useLocalhost, user === null || user === void 0 ? void 0 : user.email);
|
|
44
43
|
configstore_1.configstore.set("user", result.user);
|
|
45
44
|
configstore_1.configstore.set("tokens", result.tokens);
|
|
46
45
|
configstore_1.configstore.set("loginScopes", result.scopes);
|
|
@@ -52,7 +52,7 @@ async function doSetup(setup, config, options) {
|
|
|
52
52
|
if (!account) {
|
|
53
53
|
throw new error_1.FirebaseError(`No account selected, have you run "firebase login"?`, { exit: 1 });
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
(0, auth_1.setActiveAccount)(options, account);
|
|
56
56
|
if (config.projectDir) {
|
|
57
57
|
(0, auth_1.setProjectAccount)(config.projectDir, account.user.email);
|
|
58
58
|
}
|
package/lib/requireAuth.js
CHANGED
|
@@ -32,7 +32,7 @@ async function autoAuth(options, authScopes) {
|
|
|
32
32
|
logger_1.logger.debug(`Error getting account credentials.`);
|
|
33
33
|
}
|
|
34
34
|
if (process.env.MONOSPACE_ENV && token && clientEmail) {
|
|
35
|
-
|
|
35
|
+
(0, auth_1.setActiveAccount)(options, {
|
|
36
36
|
user: { email: clientEmail },
|
|
37
37
|
tokens: { access_token: token },
|
|
38
38
|
});
|
|
@@ -76,7 +76,7 @@ async function requireAuth(options) {
|
|
|
76
76
|
if (!user || !tokens) {
|
|
77
77
|
throw new error_1.FirebaseError(AUTH_ERROR_MESSAGE);
|
|
78
78
|
}
|
|
79
|
-
|
|
79
|
+
(0, auth_1.setActiveAccount)(options, { user, tokens });
|
|
80
80
|
return user.email;
|
|
81
81
|
}
|
|
82
82
|
exports.requireAuth = requireAuth;
|