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

env files #3864

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open
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
18 changes: 11 additions & 7 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ var qmLog = {
if(process.env.QUANTIMODO_CLIENT_SECRET){message = message.replace(process.env.QUANTIMODO_CLIENT_SECRET, 'HIDDEN');}
if(AWS_SECRET_ACCESS_KEY){message = message.replace(AWS_SECRET_ACCESS_KEY, 'HIDDEN');}
if(process.env.ENCRYPTION_SECRET){message = message.replace(process.env.ENCRYPTION_SECRET, 'HIDDEN');}
if(process.env.QUANTIMODO_ACCESS_TOKEN){message = message.replace(process.env.QUANTIMODO_ACCESS_TOKEN, 'HIDDEN');}
if(qmGulp.getQMAccessToken()){message = message.replace(qmGulp.getQMAccessToken(), 'HIDDEN');}
message = qmLog.obfuscateString(message);
return message;
},
Expand Down Expand Up @@ -744,14 +744,20 @@ var qmGulp = {
/** @namespace qm.getAppSettings().appStatus.buildStatus */
qmGulp.getBuildStatus()[convertFilePathToPropertyName(filePath)] = "READY";
return uploadToS3(filePath);
},
getQMAccessToken: function() {
if(process.env.QUANTIMODO_ACCESS_TOKEN){return process.env.QUANTIMODO_ACCESS_TOKEN;}
qmLog.info("Please add QUANTIMODO_ACCESS_TOKEN to .env file in root of project! "+
"Your token can be obtained at "+qmGulp.getAppHostName() + "/api/v2/account");
return null;
}
};
qmGulp.buildInfoHelper.setVersionNumbers();
var Quantimodo = require('quantimodo');
/** @namespace Quantimodo.ApiClient */
var defaultClient = Quantimodo.ApiClient.instance;
var quantimodo_oauth2 = defaultClient.authentications.quantimodo_oauth2;
quantimodo_oauth2.accessToken = process.env.QUANTIMODO_ACCESS_TOKEN;
quantimodo_oauth2.accessToken = qmGulp.getQMAccessToken();
console.log("process.platform is " + process.platform + " and process.env.OS is " + process.env.OS);
qmGit.outputCommitMessageAndBranch();
function setClientId(callback) {
Expand Down Expand Up @@ -1125,11 +1131,9 @@ function getRequestOptions(path) {
headers: {'User-Agent': 'Request-Promise', 'Content-Type': 'application/json'},
json: true // Automatically parses the JSON string in the response
};
if(process.env.QUANTIMODO_ACCESS_TOKEN){
options.qs.access_token = process.env.QUANTIMODO_ACCESS_TOKEN;
if(qmGulp.getQMAccessToken()){
options.qs.access_token = qmGulp.getQMAccessToken();
qmLog.info("Using QUANTIMODO_ACCESS_TOKEN: " + options.qs.access_token.substring(0,4)+'...');
} else {
qmLog.error("Please add your QUANTIMODO_ACCESS_TOKEN environmental variable from " + qmGulp.getAppHostName() + "/api/v2/account");
}
return options;
}
Expand Down Expand Up @@ -1192,7 +1196,7 @@ function downloadEncryptedFile(url, outputFileName) {
var decryptedFilename = getFileNameFromUrl(url).replace('.enc', '');
var downloadUrl = qmGulp.getAppHostName() + '/api/v2/download?client_id=' + QUANTIMODO_CLIENT_ID + '&filename=' + encodeURIComponent(url);
qmLog.info("Downloading " + downloadUrl + ' to ' + decryptedFilename);
return request(downloadUrl + '&accessToken=' + process.env.QUANTIMODO_ACCESS_TOKEN, defaultRequestOptions)
return request(downloadUrl + '&accessToken=' + qmGulp.getQMAccessToken(), defaultRequestOptions)
.pipe(fs.createWriteStream(outputFileName));
}
function unzipFile(pathToZipFile, pathToOutputFolder) {
Expand Down
16 changes: 16 additions & 0 deletions secrets/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copy me to /secrets/.env and never commit publicly. /secrets folder should be in .gitignore file to prevent this
ANALYTICS_PROVIDER=
ANALYTICS_TRACKING_ID=
APP_DEBUG=true
APP_ENV=local
APP_HOST_NAME=
APP_LOG_LEVEL=INFO
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=""
BUGSNAG_API_KEY=
GITHUB_ACCESS_TOKEN=
HEROKU_API_KEY=
# Get QUANTIMODO_ACCESS_TOKEN @ https://app.quantimo.do/api/v2/account
QUANTIMODO_ACCESS_TOKEN=
# Get QUANTIMODO_CLIENT_ID @ https://builder.quantimo.do
QUANTIMODO_CLIENT_ID=
Loading