Skip to content

fix handling of hubHost #501

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −6
Open

fix handling of hubHost #501

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
9 changes: 4 additions & 5 deletions packages/collaboration/src/sharedlink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,11 @@ export async function showSharedLinkDialog({
serverOwner = PageConfig.getOption('hubServerUser');
serverName = PageConfig.getOption('hubServerName');
// Prepare the Hub API URL
const protocol = window.location.protocol;
const hostname =
PageConfig.getOption('hubHost') || window.location.hostname;
const port = window.location.port;
// hubHost is the full Origin (`proto://hostname:port`)
// or an empty string, making hubApiUrl an absolute path on the current origin
const hubHost = PageConfig.getOption('hubHost') || '';
const prefix = PageConfig.getOption('hubPrefix');
hubApiUrl = `${protocol}//${hostname}:${port}${prefix}api`;
hubApiUrl = `${hubHost}${prefix}api`;
// Check Hub version for share compatibility (>= 5.0)
const response = await fetch(hubApiUrl, {
// A GET request on base API url returns the Hub version
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/tests/hub-share.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test('should open JupyterHub sharing dialog', async ({ page }) => {
document.body.dataset['hubUser'] = 'jovyan';
document.body.dataset['hubServerUser'] = 'jovyan';
document.body.dataset['hubServerName'] = 'my-server';
document.body.dataset['hubHost'] = 'localhost';
document.body.dataset['hubHost'] = '';
document.body.dataset['hubPrefix'] = '/hub/';
});

Expand Down
Loading