neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No wss warn on 127.0.0.1 (#1597)

Browse Source
This commit is contained in:
Jaco Greeff 2019-09-09 08:21:51 +02:00 committed by GitHub
parent b7234027b8
commit f178674d7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/apps/src/overlays/Connecting.tsx
View File

@ -16,7 +16,7 @@ import BaseOverlay from './Base';
const isFirefox = typeof (window as any).InstallTrigger !== 'undefined';
const wsUrl = settings.apiUrl;
const isWs = wsUrl.startsWith('ws://');
const isWsRemote = wsUrl.includes('127.0.0.1');
const isWsLocal = wsUrl.includes('127.0.0.1');
const isHttps = window.location.protocol.startsWith('https:');
function ExtensionOverlay ({ className, isWaitingInjected, t }: ApiProps & Props): React.ReactElement<Props> | null {
@ -51,7 +51,7 @@ function ConnectOverlay ({ className, isApiConnected, t }: ApiProps & Props): Re
: undefined
}
{
isWs && isWsRemote && isHttps
isWs && !isWsLocal && isHttps
? <div>{t('You are connecting from a secure location to an insecure WebSocket ({{wsUrl}}). Due to browser mixed-content security policies this connection type is not allowed. Change the RPC service to a secure \'wss\' endpoint.', { replace: { wsUrl } })}</div>
: undefined
}