Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support application default credentials. #417

Merged
merged 1 commit into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commands/logout.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = new Command('logout')
var tokens = configstore.get('tokens');
var currentToken = _.get(tokens, 'refresh_token');
var token = utils.getInheritedOption(options, 'token') || currentToken;
api.setToken(token);
api.setRefreshToken(token);
var next;
if (token) {
next = auth.logout(token);
Expand Down
26 changes: 16 additions & 10 deletions lib/api.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
'use strict';

var request = require('request');
var _ = require('lodash');
var querystring = require('querystring');
var FirebaseError = require('./error');
var request = require('request');
var RSVP = require('rsvp');
var _ = require('lodash');

var FirebaseError = require('./error');
var logger = require('./logger');
var utils = require('./utils');
var responseToError = require('./responseToError');
var refreshToken;
var commandScopes;
var scopes = require('./scopes');
var utils = require('./utils');

var CLI_VERSION = require('../package.json').version;

var accessToken;
var refreshToken;
var commandScopes;

var _request = function(options) {
logger.debug('>>> HTTP REQUEST',
options.method,
Expand Down Expand Up @@ -89,9 +93,12 @@ var api = {
rulesOrigin: utils.envOverride('FIREBASE_RULES_URL', 'https://firebaserules.googleapis.com'),
runtimeconfigOrigin: utils.envOverride('FIREBASE_RUNTIMECONFIG_URL', 'https://runtimeconfig.googleapis.com'),

setToken: function(token) {
setRefreshToken: function(token) {
refreshToken = token;
},
setAccessToken: function(token) {
accessToken = token;
},
setScopes: function(s) {
commandScopes = _.uniq(_.flatten([
scopes.EMAIL,
Expand All @@ -102,13 +109,12 @@ var api = {
logger.debug('> command requires scopes:', JSON.stringify(commandScopes));
},
getAccessToken: function() {
return require('./auth').getAccessToken(refreshToken, commandScopes);
return accessToken ? RSVP.resolve({access_token: accessToken}) : require('./auth').getAccessToken(refreshToken, commandScopes);
},
addRequestHeaders: function(reqOptions) {
// Runtime fetch of Auth singleton to prevent circular module dependencies
_.set(reqOptions, ['headers', 'User-Agent'], 'FirebaseCLI/' + CLI_VERSION);
var auth = require('../lib/auth');
return auth.getAccessToken(refreshToken, commandScopes).then(function(result) {
return api.getAccessToken().then(function(result) {
_.set(reqOptions, 'headers.authorization', 'Bearer ' + result.access_token);
return reqOptions;
});
Expand Down
41 changes: 33 additions & 8 deletions lib/requireAuth.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,33 @@
var _ = require('lodash');
var chalk = require('chalk');
var RSVP = require('rsvp');
var autoAuth = require('google-auto-auth');

var api = require('./api');
var configstore = require('./configstore');
var utils = require('./utils');
var FirebaseError = require('./error');
var logger = require('./logger');
var utils = require('./utils');

var AUTH_ERROR = new FirebaseError('Command requires authentication, please run ' + chalk.bold('firebase login'));

function _autoAuth(options, authScopes) {
return new RSVP.Promise(function(resolve, reject) {
logger.debug('> attempting to authenticate via app default credentials');
autoAuth({scopes: authScopes}).getToken(function(err, token) {
if (err) {
logger.debug('! auto-auth error:', err.message);
logger.debug('> no credentials could be found or automatically retrieved');
return reject(AUTH_ERROR);
}

logger.debug(token);
logger.debug('> retrieved access token via default credentials');
api.setAccessToken(token);
resolve();
});
});
}

module.exports = function(options, authScopes) {
var inScopes = authScopes;
Expand All @@ -29,25 +51,28 @@ module.exports = function(options, authScopes) {
} else if (user) {
logger.debug('> authorizing via signed-in user');
} else {
logger.debug('> no authorization credentials were supplied or found');
return _autoAuth(options, authScopes);
}

tokenOpt = tokenOpt || process.env.FIREBASE_TOKEN;

if (tokenOpt) {
api.setToken(tokenOpt);
api.setRefreshToken(tokenOpt);
return RSVP.resolve();
}


if (!user || !tokens) {
if (configstore.get('session')) {
return utils.reject('This version of Firebase CLI requires reauthentication.\n\nPlease run ' + chalk.bold('firebase login') + ' to regain access.');
}
return utils.reject('Command requires authentication, please run ' + chalk.bold('firebase login'));
return new RSVP.Promise(function(resolve, reject) {
if (configstore.get('session')) {
return reject(new FirebaseError('This version of Firebase CLI requires reauthentication.\n\nPlease run ' + chalk.bold('firebase login') + ' to regain access.'));
}
return reject(AUTH_ERROR);
});
}

options.user = user;
options.tokens = tokens;
api.setToken(tokens.refresh_token);
api.setRefreshToken(tokens.refresh_token);
return RSVP.resolve();
};
2 changes: 1 addition & 1 deletion scripts/test-functions-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var preTest = function() {
var dir = tmp.dirSync({prefix: 'cfgtest_'});
tmpDir = dir.name;
fs.copySync(projectDir, tmpDir);
api.setToken(configstore.get('tokens').refresh_token);
api.setRefreshToken(configstore.get('tokens').refresh_token);
api.setScopes(scopes.CLOUD_PLATFORM);
console.log('Done pretest prep.');
};
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-functions-deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var preTest = function() {
tmpDir = dir.name;
fs.copySync(projectDir, tmpDir);
execSync('npm install', {'cwd': tmpDir + '/functions'});
api.setToken(configstore.get('tokens').refresh_token);
api.setRefreshToken(configstore.get('tokens').refresh_token);
api.setScopes(scopes.CLOUD_PLATFORM);
var config = {
apiKey: 'AIzaSyCLgng7Qgzf-2UKRPLz--LtLLxUsMK8oco',
Expand Down