update icons, fix validation

package.json

@@ -31,8 +31,8 @@
  ]
  },
  "build": {
- "productName": "PomeriumTcpConnector",
- "appId": "io.pomerium.PomeriumTcpConnector",
+ "productName": "Pomerium Desktop",
+ "appId": "io.pomerium.PomeriumDesktop",
  "files": [
  "dist/",
  "node_modules/",
@@ -95,13 +95,13 @@
  ],
  "publish": {
  "provider": "github",
- "owner": "pomerium-tcp-connector",
- "repo": "pomerium-tcp-connector"
+ "owner": "pomerium-desktop",
+ "repo": "https://github.com/pomerium/desktop-client"
  }
  },
  "repository": {
  "type": "git",
- "url": "git+https://github.com/pomerium/pomerium-tcp-connector.git"
+ "url": "git+https://github.com/pomerium/desktop-client.git"
  },
  "author": {
  "name": "Pomerium Inc",
@@ -117,15 +117,15 @@
  ],
  "license": "MIT",
  "bugs": {
- "url": "https://github.com/pomerium/pomerium-tcp-connector/issues"
+ "url": "https://github.com/pomerium/desktop-client/issues"
  },
  "keywords": [
  "zero trust",
  "network",
  "internal",
  "security"
  ],
- "homepage": "https://github.com/pomerium/pomerium-tcp-connector#readme",
+ "homepage": "https://github.com/pomerium/desktop-client#readme",
  "jest": {
  "testURL": "https://localhost/",
  "moduleNameMapper": {

src/components/TextField.tsx

@@ -18,12 +18,12 @@ const useStyles = makeStyles((theme: Theme) => ({
  backgroundColor: theme.palette.error.main,
  },
  '& .MuiOutlinedInput-notchedOutline': {
- borderWidth: '0px',
+ borderWidth: '1px',
+ borderColor: theme.palette.divider,
  },
  '& .MuiInputLabel-outlined:not(.MuiInputLabel-shrink)': {
  transform: 'translate(8px, 10px) scale(1)',
  },
- boxShadow: theme.shadows[1],
  borderRadius: '2px',
  '& .Mui-disabled': {
  background: '#cfcfcf',

src/pages/ConnectForm.tsx

@@ -1,25 +1,25 @@
 import {
- makeStyles,
  Button,
- Grid,
- Typography,
- FormGroup,
  FormControlLabel,
- Switch,
- ListItem,
+ FormGroup,
+ Grid,
  List,
+ ListItem,
+ makeStyles,
+ Switch,
+ Typography,
 } from '@material-ui/core';
 import { ipcRenderer } from 'electron';
 import React, { FC, useEffect, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 import { useParams } from 'react-router-dom';
 import Store from 'electron-store';
-import { isUrl, isIp } from '../utils/validators';
+import { isIp } from '../utils/validators';
 import {
  CONNECTION_CLOSED,
  CONNECTION_RESPONSE,
- DISCONNECT,
  ConnectionData,
+ DISCONNECT,
 } from '../utils/constants';
 import TextField from '../components/TextField';
 import { Theme } from '../utils/theme';
@@ -98,24 +98,20 @@ const ConnectForm: FC<Props> = () => {
  });
  setErrors({
  ...errors,
- ...{ destinationUrl: !isUrl(value) || !value.trim() },
+ ...{ destinationUrl: !value.trim() },
  });
  };
 
  const saveLocal = (value: string): void => {
  setConnectionData({ ...connectionData, ...{ localAddress: value.trim() } });
  setErrors({
  ...errors,
- ...{ localAddress: !isIp(value) },
+ ...{ localAddress: !isIp(value) && !!value },
  });
  };
 
  const savePomeriumUrl = (value: string): void => {
  setConnectionData({ ...connectionData, ...{ pomeriumUrl: value.trim() } });
- setErrors({
- ...errors,
- ...{ pomeriumUrl: !isUrl(value) },
- });
  };
 
  const saveDisableTLS = (): void => {
@@ -127,18 +123,10 @@ const ConnectForm: FC<Props> = () => {
 
  const saveCaFilePath = (value: string): void => {
  setConnectionData({ ...connectionData, ...{ caFilePath: value.trim() } });
- setErrors({
- ...errors,
- ...{ caFilePath: !!connectionData.caFileText },
- });
  };
 
  const saveCaFileText = (value: string): void => {
  setConnectionData({ ...connectionData, ...{ caFileText: value.trim() } });
- setErrors({
- ...errors,
- ...{ caFileText: !!connectionData.caFilePath },
- });
  };
 
  const disconnect = (channel_id: string): void => {
@@ -166,8 +154,7 @@ const ConnectForm: FC<Props> = () => {
  setConnected(true);
  const args: ConnectionData = { ...connectionData };
  if (!args.channelID) {
- const uuid = uuidv4();
- args.channelID = uuid;
+ args.channelID = uuidv4();
  }
  setConnectionData(args);
  ipcRenderer.send('connect', args);
@@ -195,7 +182,6 @@ const ConnectForm: FC<Props> = () => {
  <TextField
  fullWidth
  required
- error={errors.destinationUrl}
  label="Destination Url"
  value={connectionData.destinationUrl}
  onChange={(evt): void => saveDestination(evt.target.value)}