Skip to content

fix: use 'wss' protocol when ui is loaded via 'https' #2410

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
FabianKramm merged 1 commit into from
Nov 14, 2022
Merged

fix: use 'wss' protocol when ui is loaded via 'https' #2410

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
4 changes: 2 additions & 2 deletions ui/src/components/views/Commands/Commands/CommandsList/CommandsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import PlayIcon from 'images/play-icon.svg';
import PauseIcon from 'images/pause-blue-icon.svg';
import IconButton from 'components/basic/IconButton/IconButton';
import CodeSnippet from 'components/basic/CodeSnippet/CodeSnippet';
import { ApiHostname } from 'lib/rest';
import { ApiHostname, ApiWebsocketProtocol } from 'lib/rest';
import SimpleCodeLine from 'components/basic/CodeSnippet/SimpleCodeLine/SimpleCodeLine';

interface Props extends DevSpaceConfigContext {
Expand All @@ -26,7 +26,7 @@ export const getURLByName = (name: string) => {
return null;
}

return `ws://${ApiHostname()}/api/command?name=${name}`;
return `${ApiWebsocketProtocol()}://${ApiHostname()}/api/command?name=${name}`;
};

class CommandsList extends React.PureComponent<Props, State> {
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/views/Logs/TerminalCache/TerminalCache.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import InteractiveTerminal, { InteractiveTerminalProps } from 'components/advanc
import { V1PodList } from '@kubernetes/client-node';
import React from 'react';
import { SelectedLogs } from 'components/views/Logs/LogsList/LogsList';
import { ApiHostname } from '../../../../lib/rest';
import { ApiHostname, ApiWebsocketProtocol } from '../../../../lib/rest';
import AdvancedCodeLine from 'components/basic/CodeSnippet/AdvancedCodeLine/AdvancedCodeLine';
import styles from './TerminalCache.module.scss';
import withDevSpaceConfig, { DevSpaceConfigContext } from 'contexts/withDevSpaceConfig/withDevSpaceConfig';
Expand Down Expand Up @@ -58,7 +58,7 @@ class TerminalCache extends React.PureComponent<Props, State> {
this.cache.multiLog = {
multiple: selected.multiple,
props: {
url: `ws://${ApiHostname()}/api/logs-multiple?context=${this.props.devSpaceConfig.kubeContext}&namespace=${
url: `${ApiWebsocketProtocol()}://${ApiHostname()}/api/logs-multiple?context=${this.props.devSpaceConfig.kubeContext}&namespace=${
this.props.devSpaceConfig.kubeNamespace
}&imageSelector=${selected.multiple.join('&imageSelector=')}`,
interactive: false,
Expand All @@ -71,7 +71,7 @@ class TerminalCache extends React.PureComponent<Props, State> {
container: selected.container,
interactive: selected.interactive,
props: {
url: `ws://${ApiHostname()}/api/${selected.interactive ? 'enter' : 'logs'}?context=${
url: `${ApiWebsocketProtocol()}://${ApiHostname()}/api/${selected.interactive ? 'enter' : 'logs'}?context=${
this.props.devSpaceConfig.kubeContext
}&namespace=${this.props.devSpaceConfig.kubeNamespace}&name=${selected.pod}&container=${selected.container}`,
interactive: selected.interactive,
Expand Down
8 changes: 8 additions & 0 deletions ui/src/lib/rest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@ export const ApiHostname = () => {

return location.hostname + ':' + location.port;
};

export const ApiWebsocketProtocol = () => {
if (location.protocol === 'https:') {
return 'wss';
} else {
return 'ws';
}
}