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

migrate to Electron 2.x #237

Merged
merged 2 commits into from
Aug 28, 2018
Merged

migrate to Electron 2.x #237

merged 2 commits into from
Aug 28, 2018

Conversation

trevj
Copy link
Contributor

@trevj trevj commented Aug 24, 2018

Magic mode and advanced modes seem to work fine with Electron 2; it complained about our content security policy which turned out to be completely bogus so I updated it.

BTW, I tried electron-updater 3.x but ran into compile errors. I don't think it's ready for primetime yet.

@trevj trevj requested a review from alalamav August 24, 2018 19:19
Copy link
Contributor

@alalamav alalamav left a comment

Choose a reason for hiding this comment

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

👍

<script src="server_manager/web_app/main.js"></script>

<!-- TODO: Add Outline servers to connect-src on-demand (in addition to the DigitalOcean API). -->
<meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline' outline:; connect-src https:; frame-src https://s3.amazonaws.com/outline-vpn/">
Copy link
Contributor

@alalamav alalamav Aug 24, 2018

Choose a reason for hiding this comment

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

what about the other non-http protocols, i.e. macappstore://, ss://?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think they were ever relevant!

Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure? The invitation page links to macappstore:// for downloading the macOS client and ss:// for importing the server when the app is already installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

click The iframe-d invite? I just tested and:

  • Mac App Store opens without mapappstore:// in the CSP
  • ss:// link doesn't open with or without macappstore:// in the CSP (in other words, it's broken as-is - I just filed an issue)

@trevj trevj merged commit 9748082 into master Aug 28, 2018
@trevj trevj deleted the trevj-electron2 branch August 30, 2018 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants