Skip to content

Commit

Permalink
Merge pull request #153 from makebrainwaves/jdpigeon-patch-1
Browse files Browse the repository at this point in the history
Finalize CI Secretes
  • Loading branch information
jdpigeon authored Mar 2, 2021
2 parents 732a05b + 65b5a8b commit 097b240
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "BrainWaves",
"productName": "BrainWaves",
"version": "0.15.0-rc2",
"version": "0.15.0",
"description": "EEG Desktop Application",
"main": "./main.prod.js",
"type": "module",
Expand Down
10 changes: 10 additions & 0 deletions configs/webpack.config.main.prod.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,23 @@ export default merge(baseConfig, {
*
* NODE_ENV should be production so that modules do not perform certain
* development checks
*
*/
new webpack.EnvironmentPlugin({
NODE_ENV: 'production',
DEBUG_PROD: false,
START_MINIMIZED: false,
E2E_BUILD: false,
}),
/**
* The keys for emotiv SDK usage are piped into prod builds here via
* env variables set by secrets in Github Actions
*/
new webpack.DefinePlugin({
CLIENT_ID: JSON.stringify(process.env.CLIENT_ID),
CLIENT_SECRET: JSON.stringify(process.env.CLIENT_SECRET),
LICENSE_ID: JSON.stringify(process.env.LICENSE_ID),
}),
],

/**
Expand Down
12 changes: 6 additions & 6 deletions keys.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// These values must be filled with the appropriate Emotiv credentials to be able to use the Cortex SDK
// We have our credentials stored in environement variables

const USERNAME = process.env.EMOTIV_USERNAME;
const PASSWORD = process.env.EMOTIV_PASSWORD;
const CLIENT_ID = process.env.EMOTIV_CLIENT_ID; // Created through Cortex Apps page on Emotiv.com
const CLIENT_SECRET = process.env.EMOTIV_CLIENT_SECRET; // Created through Cortex Apps page on Emotiv.com
const LICENSE_ID = process.env.EMOTIV_LICENSE_ID; // Visible on My Account page of Emotiv.com
const CLIENT_ID = process.env.CLIENT_ID; // Created through Cortex Apps page on Emotiv.com
const CLIENT_SECRET = process.env.CLIENT_SECRET; // Created through Cortex Apps page on Emotiv.com
const LICENSE_ID = process.env.LICENSE_ID; // Visible on My Account page of Emotiv.com

module.exports = { USERNAME, PASSWORD, CLIENT_ID, CLIENT_SECRET, LICENSE_ID };
const envVars = { CLIENT_ID, CLIENT_SECRET, LICENSE_ID };

module.exports = { CLIENT_ID, CLIENT_SECRET, LICENSE_ID };
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "brainwaves",
"productName": "BrainWaves",
"version": "0.14.2",
"version": "0.15.0",
"description": "EEG Experiment Desktop Application",
"scripts": {
"build": "concurrently \"yarn build-main\" \"yarn build-renderer\"",
Expand Down

0 comments on commit 097b240

Please sign in to comment.