Skip to content

feat: Move application server public key to config #3182

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.

Sign up for GitHub

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

Open
Zyreny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Move application server public key to config #3182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const webpackConfig = {

module.exports = Object.assign(
{
applicationServerPublicKey:
process.env.APPLICATION_SERVER_PUBLIC_KEY ||
'BHkStXEZjGMSdCHolgJAdmREB75lfi42OLNyRt4NRkLu_FEJYR-7Jv8hho1TSuYxTw2GqpYc3tLrotc55DfaNx0',
cookieSecret: process.env.COOKIE_SECRET || 'twreporter-cookie-secret',
host: process.env.HOST || 'localhost',
nodeEnv,
Expand Down
4 changes: 1 addition & 3 deletions src/components/web-push.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ const _ = {

const formURL = twreporterRedux.utils.formURL

// TODO move applicationServerPublicKey to config
const applicationServerPublicKey =
'BHkStXEZjGMSdCHolgJAdmREB75lfi42OLNyRt4NRkLu_FEJYR-7Jv8hho1TSuYxTw2GqpYc3tLrotc55DfaNx0'
const applicationServerPublicKey = process.env.APPLICATION_SERVER_PUBLIC_KEY

/**
* The application server's public key is base 64 URL safe encoded.
Expand Down
3 changes: 3 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ const webpackConfig = {
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(config.nodeEnv),
'process.env.RELEASE_BRANCH': JSON.stringify(config.releaseBranch),
'process.env.APPLICATION_SERVER_PUBLIC_KEY': JSON.stringify(
config.applicationServerPublicKey
),
}),

// This plugin will cause hashes to be based on the relative path of the module,
Expand Down