Skip to content

[No QA] Fix desktop for developers without .env file #7719

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

Merged
mountiny merged 1 commit into from
Feb 12, 2022
+1 −1
Merged

[No QA] Fix desktop for developers without .env file #7719

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
2 changes: 1 addition & 1 deletion desktop/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const mainWindow = (() => {
const path = require('path');
const devEnvConfig = dotenv.config({path: path.resolve(__dirname, '../.env')}).parsed;

if (devEnvConfig.USE_WEB_PROXY === 'true') {
if (devEnvConfig.USE_WEB_PROXY !== 'false') {
Comment on lines 184 to +186

@kidroca kidroca Feb 14, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, sorry you still have to have an .env file to make this work
When you don't have an .env file parsed - devEnvConfig is undefined and you get this error:

[Main] 14:10:46.010 › (node:8157) UnhandledPromiseRejectionWarning: TypeError: Cannot read properties of undefined (reading 'USE_WEB_PROXY')
[Main]     at /Users/kidroca/Desktop/Freelance/Expensify.cash/desktop/main.js:186:34

What the proxy script does is a bit more flexible and you don't need to import path

dotenv.config();

if (process.env.USE_WEB_PROXY !== 'false') ...

When you don't pass a path to dotenv it will use .env by default
If there is such a file the variables defined would be assigned to process.env

@roryabraham roryabraham Feb 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops ... I encountered this locally and had committed but not pushed the fix 😞

browserWindow.webContents.session.webRequest.onHeadersReceived(validDestinationFilters, (details, callback) => {
// eslint-disable-next-line no-param-reassign
details.responseHeaders['access-control-allow-origin'] = ['http://localhost:8080'];
Expand Down