Merge pull request #69 from OpenFuturePlatform/SA-46_Get_rid_of_old_API_keys

Sa 46 get rid of old api keys

Author: borbuevbeksultan

docker-compose/open-api.yml

@@ -0,0 +1,18 @@
+version: '3.1'
+
+services:
+
+  open-api-postgres:
+    image: postgres
+    container_name: open-api-postgres
+    restart: always
+    ports:
+      - "5434:5432"
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root
+    volumes:
+      - open-api-postgres-data:/var/lib/postgres
+
+volumes:
+  open-api-postgres-data:

frontend/package.json

@@ -42,6 +42,7 @@
     "eject": "react-scripts eject"
   },
   "devDependencies": {
+    "http-proxy-middleware": "^2.0.2",
     "lodash": "^4.17.20"
   },
   "browserslist": {

frontend/src/App.js

@@ -4,7 +4,6 @@ import { fetchGlobalProperties } from './actions/global-properties';
 import { fetchUser } from './actions/index';
 import { connect } from 'react-redux';
 import Scaffolds from './scenes/Scaffolds';
-import Keys from './scenes/Keys';
 import Header from './components/Header';
 import GatewayApplication from "./scenes/GatewayApplication";
 import { Container } from 'semantic-ui-react';
@@ -39,7 +38,6 @@ class App extends Component {
     return (
       <Switch>
         <Route path="/scaffolds" component={Scaffolds} />
-        <Route path="/keys" component={Keys} />
         <Route path="/applications" component={GatewayApplication} />
         <Redirect from="*" to="/scaffolds" />
       </Switch>

frontend/src/actions/deploy-contract.js

@@ -21,8 +21,8 @@ export const deployEthereumContractByApi = formValues => async dispatch => {
   return scaffold.address;
 };
 
-export const compileEthereumContract = (openKey, properties) => async dispatch => {
-  return await dispatch(apiPost(getEthereumScaffoldDoCompile(), { openKey, properties }));
+export const compileEthereumContract = (properties) => async dispatch => {
+  return await dispatch(apiPost(getEthereumScaffoldDoCompile(), { properties }));
 };
 
 export const processDeploy = async (contract, bin, platformAddress, formValues) => {
@@ -44,7 +44,7 @@ export const deployEthereumContractByMetaMask = formValues => async (dispatch, g
   const {
     globalProperties: { platformAddress }
   } = getState();
-  const { abi, bin } = await dispatch(compileEthereumContract(formValues.openKey, formValues.properties));
+  const { abi, bin } = await dispatch(compileEthereumContract(formValues.properties));
   const contract = new web3.eth.Contract(JSON.parse(abi));
   const newContractInstance = await processDeploy(contract, bin, platformAddress, formValues);
   const address = newContractInstance.options.address;

frontend/src/actions/keys.js

@@ -30,9 +30,6 @@ class Header extends Component {
             <Dropdown.Item text='Open' as={Link} to={'/scaffolds/open'}/>
           </Dropdown.Menu>
         </Dropdown>
-        {/*<Link className="item" to={'/keys'}>
-          Key Management
-        </Link>*/}
         <Link className="item" to={'/applications'}>
           Applications
         </Link>

frontend/src/components/Header.js

@@ -17,12 +17,10 @@ import {MIN_BALANCE} from '../const/index';
 import {getMetaMaskErrorMessage} from '../selectors/getMetaMaskError';
 import {TemplateSelect} from '../components/TemplateSelect';
 import {WalletSelect} from '../components/WalletSelect';
-import {fetchKeys} from '../actions/keys';
 import {t} from '../utils/messageTexts';
 
 class EthereumScaffoldForm extends Component {
   componentDidMount() {
-    this.props.actions.fetchKeys();
     if (!this.props.byApiMethod) {
       this.props.actions.subscribeEthAccount();
       this.initDeveloperAddressValidation();
@@ -93,8 +91,8 @@ class EthereumScaffoldForm extends Component {
   };
 
   render() {
-    const { formValues, invalid, scaffoldFieldsErrors, openKeyOptions, byApiMethod } = this.props;
-    const fieldErrors = _.flatten(scaffoldFieldsErrors).length !== 0 ? true : false;
+    const { formValues, invalid, scaffoldFieldsErrors, byApiMethod } = this.props;
+    const fieldErrors = _.flatten(scaffoldFieldsErrors).length !== 0;
     const disableSubmit = invalid || fieldErrors;
     const developerAddressValidations = !byApiMethod ? [this.validateBalance] : [];
 
@@ -107,17 +105,6 @@ class EthereumScaffoldForm extends Component {
               <Grid.Column width={16} style={{ paddingTop: '10px' }}>
                 <TemplateSelect />
               </Grid.Column>
-              <Grid.Column width={16} style={{ paddingTop: '10px' }}>
-                <Field
-                  key={1}
-                  className="ui selection fluid dropdown"
-                  placeholder="Choose Developer API Key"
-                  component={DropdownField}
-                  options={openKeyOptions}
-                  type="text"
-                  name="openKey"
-                />
-              </Grid.Column>
               <Grid.Column width={16}>
                 <Field
                   key={2}
@@ -257,9 +244,7 @@ const getValues = getFormValues('scaffoldCreationForm');
 const mapStateToProps = state => {
   const formValues = getValues(state) || {};
   const initialValues = state.scaffoldFeilds;
-  const openKey = state.auth ? state.auth.openKeys : undefined;
   const scaffoldFieldsErrors = validateScaffoldProperties(formValues.properties || []);
-  const openKeyOptions = state.keys.filter(it => it.enabled).map(it => ({ text: it.value, value: it.value }));
   const ethAccount = state.ethAccount;
   const byApiMethod = state.auth.byApiMethod;
   const metaMaskError = getMetaMaskErrorMessage(state);
@@ -270,9 +255,7 @@ const mapStateToProps = state => {
     byApiMethod,
     ethAccount,
     formValues,
-    openKey,
-    scaffoldFieldsErrors,
-    openKeyOptions
+    scaffoldFieldsErrors
   };
 };
 
@@ -282,8 +265,7 @@ const mapDispatchToProps = dispatch => ({
       convertCurrencies,
       deployEthereumContract,
       subscribeEthAccount,
-      unsubscribeEthAccount,
-      fetchKeys
+      unsubscribeEthAccount
     },
     dispatch
   )

frontend/src/scenes/EthereumScaffoldForm.js

@@ -7,8 +7,6 @@ import {fetchGatewayApplicationDetails} from "../actions/gateways";
 
 import {GatewayApplicationWallet} from "../components/GatewayApplicationWallet";
 import {getGatewayApplicationWallet} from "../actions/gateway-wallet";
-import {KeyGenerate} from "../components/KeyGenerate";
-import {WalletGenerate} from "../components/GatewayApplicationWalletGenerate";
 import {GatewayKeyGenerate} from "../components/GatewayApplicationKeyGenerate";
 
 class GatewayApplicationSummary extends Component {

frontend/src/scenes/GatewayApplicationSummary.js

@@ -4,20 +4,14 @@ import {connect} from 'react-redux';
 import {Field, FieldArray, getFormValues, reduxForm} from 'redux-form';
 import {withRouter} from 'react-router-dom';
 import {Button, Grid} from 'semantic-ui-react';
-import {DropdownField} from 'react-semantic-redux-form';
 import {asyncValidate, validate, validateScaffoldProperties, warn} from '../utils/validation';
 import ScaffoldField from '../components-ui/inputs/Field';
 import {saveOpenScaffold} from '../actions/deploy-contract';
-import {fetchKeys} from '../actions/keys';
 import {TemplateSelect} from "../components/TemplateSelect";
 import ScaffoldPropertyFields from "../components-ui/inputs/PropertyFields";
 
 class OpenScaffoldForm extends Component {
 
-  componentDidMount() {
-    this.props.actions.fetchKeys();
-  }
-
   handleOnSubmit = async e => {
     const {actions, history, formValues} = this.props;
     e.preventDefault();
@@ -31,7 +25,7 @@ class OpenScaffoldForm extends Component {
   };
 
   render() {
-    const { invalid: disableSubmit,formValues, scaffoldFieldsErrors, openKeyOptions } = this.props;
+    const { invalid: disableSubmit,formValues, scaffoldFieldsErrors } = this.props;
 
     return (
       <form onSubmit={this.handleOnSubmit}>
@@ -40,17 +34,6 @@ class OpenScaffoldForm extends Component {
             <Grid.Column width={16} style={{ paddingTop: '10px' }}>
               <TemplateSelect />
             </Grid.Column>
-            <Grid.Column width={16} style={{paddingTop: '10px'}}>
-              <Field
-                key={1}
-                className="ui selection fluid dropdown"
-                placeholder="Choose Developer API Key"
-                component={DropdownField}
-                options={openKeyOptions}
-                type="text"
-                name="openKey"
-              />
-            </Grid.Column>
             <Grid.Column width={16}>
               <Field
                 key={2}
@@ -168,24 +151,19 @@ const getValues = getFormValues('openScaffoldCreationForm');
 const mapStateToProps = state => {
   const formValues = getValues(state) || {};
   const initialValues = state.scaffoldFeilds;
-  const openKey = state.auth ? state.auth.openKeys : undefined;
   const scaffoldFieldsErrors = validateScaffoldProperties(formValues.properties || []);
-  const openKeyOptions = state.keys.filter(it => it.enabled).map(it => ({text: it.value, value: it.value}));
 
   return {
     formValues,
     initialValues,
-    openKey,
     scaffoldFieldsErrors,
-    openKeyOptions
   };
 };
 
 const mapDispatchToProps = dispatch => ({
   actions: bindActionCreators(
     {
-      saveOpenScaffold: saveOpenScaffold,
-      fetchKeys
+      saveOpenScaffold: saveOpenScaffold
     },
     dispatch
   )