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

feat(manager): enable servers with valid domains #1448

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Conversation

fortuna
Copy link
Collaborator

@fortuna fortuna commented Nov 14, 2023

This makes it easier to add servers when they have a valid domain, working on the browser.

@fortuna fortuna requested a review from a team as a code owner November 14, 2023 23:42
@fortuna fortuna changed the title feat(server_manager): enable servers with valid domains feat(manager): enable servers with valid domains Nov 14, 2023
@@ -927,8 +927,6 @@ export class AppRoot extends polymerElementWithLocalize {
const manualEntry = this.$.manualEntry as OutlineManualServerEntry;
if (clickedButtonIndex === 1) {
manualEntry.retryTapped();
} else {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No need to dismiss the add server screen when we dismiss the dialogue!

@@ -193,6 +193,8 @@ function main() {
// prevent window being garbage collected
let mainWindow: Electron.BrowserWindow;

app.userAgentFallback = `OutlineManager/${electron.app.getVersion()} ${app.userAgentFallback}`;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is to allow the use of ngrok without the interstitial of the free version. But I also think it's helpful to tell we are using the Outline Manager.

Copy link
Contributor

@daniellacosse daniellacosse left a comment

Choose a reason for hiding this comment

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

Sweet!

@@ -25,7 +25,7 @@ class ManualServer extends ShadowboxServer implements server.ManualServer {
private forgetCallback: Function
) {
super(id);
const fingerprint = hexToString(manualServerConfig.certSha256);
const fingerprint = hexToString(manualServerConfig.certSha256 || '');
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: prefer ??

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

@fortuna fortuna merged commit 50ad005 into master Nov 16, 2023
13 checks passed
@fortuna fortuna deleted the fortuna-nofp branch November 16, 2023 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants